Commit Graph

84 Commits

Author SHA1 Message Date
4132787ef8 Final commit 2022-05-18 00:21:35 +07:00
ebddcadc38 Merge with karavan/nav/1 2022-05-17 22:08:20 +07:00
e976a3fbff Fixes? and side channels. 2022-05-17 19:09:50 +07:00
b5aff44f79 Merge remote-tracking branch 'origin/lisin/character/2' into lisin/character/2
# Conflicts:
#	Assets/Prefabs/PlayerPrefab/Player.prefab
#	Assets/Scenes/Greatest_map_ever/Greatest_map_ever.unity
#	Assets/Scripts/Weapons/Shooting.cs
2022-05-17 00:25:31 +07:00
229c4490c4 Finally bots can die. Player to. And another fixes. 2022-05-17 00:21:53 +07:00
01cc2e4812 fixed sound and particle syst 2022-05-16 23:54:16 +07:00
767e39d3bb fixed sounds and particle system 2022-05-16 23:51:10 +07:00
f6431a3fc4 fixed sounds 2022-05-16 22:17:27 +07:00
ef26022a99 changed fire effects and added fire sound 2022-05-16 20:34:49 +07:00
06fdfc077c Fixed many things. 2022-05-16 17:59:47 +07:00
150efde055 Almost Final Version 2022-05-16 01:13:50 +07:00
bb6aea8720 ... 2022-05-15 18:24:43 +07:00
abf262095f Added things 2022-05-13 13:29:38 +07:00
85518c4f3f latest change 2022-05-13 13:29:03 +07:00
141098d600 Adding new mountain model 2022-05-12 04:18:25 +07:00
5e8bc9610d FantasticMap#1_fixNavmesh 2022-05-12 03:53:22 +07:00
62ae65633e Fantastic map#1 2022-05-12 03:36:24 +07:00
457c30c4a8 super karta 2022-05-09 23:27:25 +07:00
3ed89a8c10 Merge remote-tracking branch 'origin/krazerleo/core/1' into krazerleo/core/1
# Conflicts:
#	Assets/Resources/BillingMode.json.meta
#	Assets/Scenes/AnimationTestScene.unity.meta
#	ProjectSettings/ProjectVersion.txt
2022-05-09 21:34:46 +07:00
d617ddabe7 Added Animations. Changed inspector view for navpoints. A lot of fixes. Changed project structure. 2022-05-09 21:31:33 +07:00
183de6485f Merge branch 'krazerleo/core/1' of https://gitea.gavt45.ru/gav/real-shooter into krazerleo/core/1
# Conflicts:
#	ProjectSettings/ProjectVersion.txt
2022-05-07 23:22:19 +07:00
12d27d36ce _ 2022-05-07 23:17:08 +07:00
6aa872c92f Runtime bot behavior instantiation 2022-05-07 23:08:32 +07:00
4250777a36 Merge branch 'main' into krazerleo/core/1 2022-05-07 23:01:34 +07:00
aa7b50554b Added project version 2022-05-07 23:00:24 +07:00
fa6b5f602e Added test NB 2022-05-07 22:58:25 +07:00
8cce356b8e MVP work with ml-agents python library 2022-05-07 22:56:07 +07:00
8083501783 Merge branch 'krazerleo/core/1' of https://gitea.gavt45.ru/gav/real-shooter into krazerleo/core/1 2022-05-07 22:02:42 +07:00
f9a3b06ec3 files add 2022-05-07 22:02:15 +07:00
e7d2315040 Merge branch 'krazerleo/core/1' of https://gitea.gavt45.ru/gav/real-shooter into krazerleo/core/1 2022-05-07 22:00:46 +07:00
87568c4077 added scene 2022-05-07 22:00:19 +07:00
4962a4b5da Merge branch 'krazerleo/core/1' of https://gitea.gavt45.ru/gav/real-shooter into krazerleo/core/1 2022-05-07 21:53:09 +07:00
3908334f65 Finally fixed 2022-05-07 21:45:28 +07:00
b8e8e74ab4 Fixes in Map Manager 2022-05-05 20:45:26 +07:00
2caf658d19 "update unresolved conflicts" 2022-05-05 18:11:57 +07:00
ba1b350c62 resolved merge conflicts 2022-05-05 16:49:21 +07:00
6514599f22 Merge branch 'krazerleo/core/1' of https://gitea.gavt45.ru/gav/real-shooter into krazerleo/core/1 2022-05-05 16:30:27 +07:00
f3fe5ea4cd commit 665 2022-05-05 16:26:23 +07:00
cfb7b71a8a Fixed merge errors 2022-05-05 15:37:51 +07:00
1cf5776a1b Merge branch 'krazerleo/core/1' of https://gitea.gavt45.ru/gav/real-shooter into krazerleo/core/1 2022-05-05 11:48:32 +07:00
351fa8ee12 test 1 2022-05-05 01:10:04 +07:00
690f1e2536 test 2022-05-05 01:08:58 +07:00
e689927b73 dadwa 2022-05-05 00:55:51 +07:00
3420d14cdc merge 2022-05-04 23:57:38 +07:00
c8af0e5284 to new git 2022-05-04 23:50:07 +07:00
c6532205ae 123 2022-04-26 16:29:46 +07:00
290f5515b7 update scripts 2022-04-25 16:23:25 +07:00
4c60131e99 Covers upgrade 2022-04-19 22:09:01 +07:00
1e4f90c0ed Removed useless temporary files 2022-04-19 19:31:15 +07:00
28863de9df Merge branch 'krazerleo/core/1' 2022-04-19 19:29:10 +07:00