Commits · e41ebd2d6d65b41785f01ce937dcfdfcdb8cccca · gamejam-gpn15 / dyingIsMainstream

04 Jun, 2015 40 commits
- Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · e41ebd2d
  Tim Reiter authored Jun 05, 2015
  
  e41ebd2d
- Merge · 05b46512
  Tim Reiter authored Jun 05, 2015
  
  05b46512
- Remove commented out code · 25fa1ed5
  Philipp Adolf authored Jun 05, 2015
  
  25fa1ed5
- Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · c18dcf06
  Tim Reiter authored Jun 05, 2015
  
  c18dcf06
- added turret button · 158637e4
  Tim Reiter authored Jun 05, 2015
  
  158637e4
- Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · c73f6fd0
  Alisa Jung authored Jun 05, 2015
  
  c73f6fd0
- added shield · 164aff47
  Alisa Jung authored Jun 05, 2015
```
Prefab:
Scale 0.18
Sprite Renderer for shield.png
Box Collider 2D --> Trigger
add Shield Script
```
  164aff47
- Do not require a new key press to jump · 2d3f3dcc
  Philipp Adolf authored Jun 05, 2015
  
  2d3f3dcc
- Improve dashes · fc4c13e0
  Philipp Adolf authored Jun 05, 2015
  
  fc4c13e0
- Make traps respawn after some time · 3f2a02af
  Philipp Adolf authored Jun 04, 2015
  
  3f2a02af
- Delete 'Spikes' script · 69c3571b
  Philipp Adolf authored Jun 04, 2015
  
  69c3571b
- Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · 661dc800
  Alisa Jung authored Jun 05, 2015
  
  661dc800
- added game state tracking: · cfcb801a
  Alisa Jung authored Jun 05, 2015
```
if all (except one) players are dead: TimeScale is set to 0, ranking is logged.
```
  cfcb801a
- fixed portable fire prefab. · a756f861
  Tim Reiter authored Jun 05, 2015
  
  a756f861
- Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · bbf6e82b
  Tim Reiter authored Jun 05, 2015
  
  bbf6e82b
- added turret. · 7053b042
  Tim Reiter authored Jun 05, 2015
  
  7053b042
- added fire · 99feb492
  Alisa Jung authored Jun 05, 2015
```
playerHealth now in float
```
  99feb492
- Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · f5910d4e
  Tim Reiter authored Jun 04, 2015
```
Conflicts:
	Assets/Prefabs/Player.prefab
	Assets/Scripts/PlayerControl.cs
	Assets/game.unity
```
  f5910d4e
- in arbeit: den anderen player wegschubsen. · e8f95484
  Tim Reiter authored Jun 04, 2015
  
  e8f95484
- Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · ca2eb01f
  Alisa Jung authored Jun 04, 2015
```
Conflicts:
	Assets/Prefabs/Player.prefab
	Assets/Prefabs/Trap.prefab
	Assets/Scripts/PlayerControl.cs
```
  ca2eb01f
- added powerups and bullets · 7bdbf578
  Alisa Jung authored Jun 04, 2015
  
  7bdbf578
- added second healthbar. · 9d58515b
  Tim Reiter authored Jun 04, 2015
  
  9d58515b
- Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · 388fe66c
  Tim Reiter authored Jun 04, 2015
  
  388fe66c
- players are now colliding. · a5074f8d
  Tim Reiter authored Jun 04, 2015
  
  a5074f8d
- Make player dash with 'down' key · b98dc720
  Philipp Adolf authored Jun 04, 2015
  
  b98dc720
- healthbar implemented (for player one) · d9140ec0
  Tim Reiter authored Jun 04, 2015
  
  d9140ec0
- Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · b03c8955
  Tim Reiter authored Jun 04, 2015
  
  b03c8955
- created a healthbar · a1c03d46
  Tim Reiter authored Jun 04, 2015
  
  a1c03d46
- Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · 10e1d148
  Alisa Jung authored Jun 04, 2015
  
  10e1d148
- added trap · e8a6f296
  Alisa Jung authored Jun 04, 2015
  
  e8a6f296
- added support for two players. · 840d7973
  Tim Reiter authored Jun 04, 2015
  
  840d7973
- Merge · 903a70ed
  Tim Reiter authored Jun 04, 2015
  
  903a70ed
- Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · 9b84ba56
  Tim Reiter authored Jun 04, 2015
  
  9b84ba56
- updated size to fullscreen resolution. · c5084ce9
  Tim Reiter authored Jun 04, 2015
  
  c5084ce9
- added player prefab · 39e9d223
  Alisa Jung authored Jun 04, 2015
  
  39e9d223
- Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · 66973817
  Tim Reiter authored Jun 04, 2015
  
  66973817
- player control working :) · d9334fea
  Tim Reiter authored Jun 04, 2015
  
  d9334fea
- Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · 4d6397f8
  Alisa Jung authored Jun 04, 2015
  
  4d6397f8
- bullets gemacht · 236844f5
  Alisa Jung authored Jun 04, 2015
  
  236844f5
- Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · 76dcdfb3
  Tim Reiter authored Jun 04, 2015
  
  76dcdfb3