Commit graph

72 commits

Author SHA1 Message Date
20d888dbc4
Merge pull request #25 from dnutiu/player-improv
Player improv
2019-06-15 18:28:28 +03:00
8e237a9dc4 Add Playe BlendTree animations 2019-06-15 18:24:56 +03:00
001eca70c5 Refactor Ammo code 2019-06-15 13:48:25 +03:00
2c746e252f Import new snow tiles, repain the scene and re-organize tiles folder 2019-06-15 13:34:30 +03:00
2e10cc44ec Improve Player Movement 2019-06-15 13:14:55 +03:00
c813d46662
Merge pull request #22 from dnutiu/debug-helper
Debug helper
2019-06-13 16:22:53 +03:00
cc4d38dd35 Fix bomb scale 2019-06-12 23:30:21 +03:00
0da7155279 Move all calls from Debug to DebugHelper 2019-06-12 23:27:32 +03:00
ec3ca2dd9d Change player colider size 2019-06-12 23:27:19 +03:00
72f067ebed Add plugins 2019-06-12 23:21:20 +03:00
4ecf6ce7ef Fix Scene pos and prefabs 2019-06-12 23:13:13 +03:00
5aad8b9b8b
Merge pull request #20 from dnutiu/fix-bombs-animations-and-raycast
Fix animation and raycast
2019-06-12 11:48:28 +03:00
583d009313
Merge branch 'master' into fix-bombs-animations-and-raycast 2019-06-12 11:47:50 +03:00
Andrei Gavra
86f54991b7 Fix animation and raycast 2019-06-11 22:17:23 +03:00
1167746499
Merge pull request #19 from dnutiu/wall-interaction
Wall interaction
2019-06-11 22:16:34 +03:00
1c55c754e1 Implement transparent walls when player is near 2019-06-11 21:49:16 +03:00
9d544f7687 Implement DebugHelper class 2019-06-11 20:19:18 +03:00
263c53245e Implement destructible wall interaction 2019-06-11 20:01:43 +03:00
a80f36e33f Add wall/floor material to RigidBodies 2019-06-11 19:33:16 +03:00
61e9b3712a Update .gitignore 2019-06-11 19:28:42 +03:00
Juravski
b97beda779
Merge pull request #15 from dnutiu/bomb-manager
Improve bomb usage
2019-06-10 23:44:58 +03:00
Andrei Gavra
82d42989f5 Fucked up animations on bombs 2019-06-10 23:42:57 +03:00
Andrei Gavra
f03fa7f8a0 Move bombsspawner in ammo package 2019-06-10 17:46:01 +03:00
Andrei Gavra
1273981a38 Improve bomb usage 2019-06-10 17:28:33 +03:00
Juravski
9251f1e84b
Merge pull request #13 from dnutiu/wall-sprites
Wall sprites
2019-06-10 15:25:50 +03:00
00e2abf8e3 Reformat Bomb Code 2019-06-09 23:33:48 +03:00
c7eff9ff61 Import Sprites for Walls 2019-06-09 23:28:05 +03:00
adeeebe884 Update gitignore 2019-06-09 19:17:45 +03:00
ac22074b99
Merge pull request #11 from dnutiu/fix-bombs
Fix bombs
2019-06-09 19:15:18 +03:00
62bee02357 Finish Merge 2019-06-09 19:14:13 +03:00
Andrei Gavra
beb91cd49d Final fix 2019-06-09 17:03:03 +03:00
Andrei Gavra
17e905c98f Fix bomb placement 2019-06-09 16:55:19 +03:00
Andrei Gavra
500294de4a remove cog bullet 2019-06-08 16:01:04 +03:00
Andrei Gavra
ff641ddf97 Change bomb! 2019-06-08 15:32:37 +03:00
Andrei Gavra
3e77c9a8c6 almost fixing bombs 2019-06-08 15:25:09 +03:00
afa6c0ab6f
Merge pull request #9 from dnutiu/game-manager
Game manager
2019-06-08 14:50:42 +03:00
4100f25567 Add additional logging on exit & update spawn 2019-06-05 22:24:19 +03:00
9533269c96 Implement GameManager 2019-06-05 22:16:11 +03:00
eba68ece09
Merge pull request #8 from dnutiu/update-player-sprite
Update Player Sprites
2019-06-04 20:49:16 +03:00
473ad3a3f9
Merge pull request #7 from dnutiu/destoryable-walls
Implement Destructible Wall & Fix deathzone bug
2019-06-04 20:48:44 +03:00
68ed6a0bfa Rename MockPlayer animation ctrl to PlayerAnimator ctrl 2019-06-04 20:46:31 +03:00
3480d2762a Update Player Sprites 2019-06-04 20:43:50 +03:00
f75d7e8fee Implement Destructible Wall & Fix deathzone bug 2019-06-04 20:20:53 +03:00
184e44f0e8 Move HandleMovement in FixedUpdate 2019-06-02 18:52:14 +03:00
6802fc868e Make Extensions/ShuffleList generic 2019-06-02 18:09:42 +03:00
295f16e499 Fix startzone tile generation 2019-06-02 18:01:59 +03:00
37ed3df4e6 PostMerge fixes 2019-06-02 17:59:09 +03:00
82655286d7
Merge pull request #4 from dnutiu/world-generation-managers
World generation managers
2019-06-02 17:50:04 +03:00
a38f45a875 Merge world generation 2019-06-02 17:48:37 +03:00
f5e7e78323 Remove transform from playercontroller 2019-06-02 17:40:06 +03:00