Commit Graph

8 Commits

Author SHA1 Message Date
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
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
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