Commit graph

55 commits

Author SHA1 Message Date
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
bb74be08de
Merge pull request #3 from dnutiu/bombs-and-explosions
Bombs and explostions
2019-06-02 17:17:08 +03:00
3452d9661f Merge bombs-and-explosions to master 2019-06-02 17:15:46 +03:00
60ea5045c7 Remove and ignore editor specific files 2019-06-02 17:01:18 +03:00
Andrei Gavra
991baca38a Remove prefab null check 2019-06-02 15:26:24 +03:00
Andrei Gavra
b0b02ee8c5 Stop being retarded 2019-06-02 14:33:06 +03:00
Andrei Gavra
cd4add6d90 Add ifdefs for platforms 2019-06-02 14:23:03 +03:00
d686fba7c3 Add LevelManager + devSprites 2019-06-02 14:13:10 +03:00
Andrei Gavra
16184dfd31 Bombs and explostions 2019-06-02 13:00:00 +03:00
6842e4bbe2 Fix world position 2019-06-02 12:47:34 +03:00
6012dacf00
Merge pull request #2 from dnutiu/world-setup
World setup
2019-06-01 21:05:37 +03:00
658bbc7b5d Implement respawn position 2019-06-01 21:04:37 +03:00
a585a649d2 Add Cinemachine and camera confine 2019-06-01 12:38:23 +03:00
c0bf0442ec Setting up the World 2019-06-01 12:22:05 +03:00
2d625d3e3e Fix code hiding 2019-05-29 19:44:36 +03:00
8e193a5e8e Upload PlayerController meta 2019-05-29 19:41:57 +03:00
c9fab7c6e0
Merge pull request #1 from dnutiu/fix-player
Rename Player to PlayerController and move rigidbody to base class
2019-05-29 19:40:18 +03:00
f7cfaa087a Add meta files 2019-05-29 19:39:26 +03:00