Commits · 44aeacae699c0dcb7f9229a29f1546e13cd71ce9 · gamejam-gpn15 / dyingIsMainstream

05 Jun, 2015 40 commits
- xml level editor can now handle children for prefabs. Also, added level. · 44aeacae
  Alisa Jung authored Jun 05, 2015
```
For each prefab, each child has to have its unique name.
```
  44aeacae
- Fix loading of levels in editor · 769aa1ef
  Philipp Adolf authored Jun 05, 2015
  
  769aa1ef
- Add second level · 76e2d64b
  Philipp Adolf authored Jun 05, 2015
  
  76e2d64b
- Load random level instead of first · 8a191cbf
  Philipp Adolf authored Jun 05, 2015
  
  8a191cbf
- Allow querying level count in loader · df91e3b8
  Philipp Adolf authored Jun 05, 2015
  
  df91e3b8
- added option to fast load levels with key 0 to 9. · 28ad94b1
  Tim Reiter authored Jun 05, 2015
  
  28ad94b1
- addded 3 and 4 players support. · dfb43f00
  Tim Reiter authored Jun 05, 2015
  
  dfb43f00
- Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · e01b1daa
  Tim Reiter authored Jun 05, 2015
```
Conflicts:
	Assets/Scripts/PlayerControl.cs
```
  e01b1daa
- fixed "getting stuck in a wall" bug. · 3f8d4410
  Tim Reiter authored Jun 05, 2015
  
  3f8d4410
- Remove unused field in DeserializedLevelsLoader · 66550528
  Philipp Adolf authored Jun 05, 2015
  
  66550528
- Remove unused fields in PlayerController · a5328612
  Philipp Adolf authored Jun 05, 2015
  
  a5328612
- Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · a8cee5b3
  Tim Reiter authored Jun 05, 2015
  
  a8cee5b3
- fixed gamepad input bug. · 20933192
  Tim Reiter authored Jun 05, 2015
  
  20933192
- Fix null reference in PlayerHealth · 6a9ec918
  Philipp Adolf authored Jun 05, 2015
  
  6a9ec918
- Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · 7d9c2dd3
  Tim Reiter authored Jun 05, 2015
```
Conflicts:
	Assets/Scripts/PlayerControl.cs
	Assets/game.unity
```
  7d9c2dd3
- Added Startmenu, added GamepadInput. · e860e653
  Tim Reiter authored Jun 05, 2015
  
  e860e653
- Randomly spawn players on map · cb5cf6e8
  Philipp Adolf authored Jun 05, 2015
```
Place Start_Position objects on the map, players are spawned at a
randomly choosen one.
```
  cb5cf6e8
- Initialize PlayerHealth from PlayerControl · 50c74286
  Philipp Adolf authored Jun 05, 2015
  
  50c74286
- Move player initialization into new method · f2431858
  Philipp Adolf authored Jun 05, 2015
  
  f2431858
- Make pushing other players work again · 6f542fd8
  Philipp Adolf authored Jun 05, 2015
```
Also change push force of player prefabs to 5
```
  6f542fd8
- Change velocity to Vector2 · 068d5b57
  Philipp Adolf authored Jun 05, 2015
  
  068d5b57
- Only allow a single dash in the air · da640815
  Philipp Adolf authored Jun 05, 2015
  
  da640815
- Simplify movement code · 26ecec69
  Philipp Adolf authored Jun 05, 2015
  
  26ecec69
- Fix indentation · 9a05dc67
  Philipp Adolf authored Jun 05, 2015
  
  9a05dc67
- Make vertical dashing less effective · 807feb00
  Philipp Adolf authored Jun 05, 2015
  
  807feb00
- Replace levels · ec5c6aac
  Philipp Adolf authored Jun 05, 2015
  
  ec5c6aac
- Modify camera · 8db30c4f
  Philipp Adolf authored Jun 05, 2015
```
Camera is now at (0, 0, -10) and uses a scale of 5.
```
  8db30c4f
- Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · c70aa22f
  Tim Reiter authored Jun 05, 2015
  
  c70aa22f
- CharacterController2D deleted, own move system implemented in PlayerControl. · 5ee91849
  Tim Reiter authored Jun 05, 2015
  
  5ee91849
- Ignore XmlItemsToExport.xml · 32aed244
  Philipp Adolf authored Jun 05, 2015
  
  32aed244
- Use wildcards in gitignore · 275264aa
  Philipp Adolf authored Jun 05, 2015
  
  275264aa
- Fix indentation of LevelManagement · 9bb2988c
  Philipp Adolf authored Jun 05, 2015
  
  9bb2988c
- Replace tabs with spaces in level management · 9b187eac
  Philipp Adolf authored Jun 05, 2015
  
  9b187eac
- forgot to change prefab. · 46dad222
  Tim Reiter authored Jun 05, 2015
  
  46dad222
- Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · 10dc8fd6
  Tim Reiter authored Jun 05, 2015
  
  10dc8fd6
- Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream · 39efc318
  Tim Reiter authored Jun 05, 2015
```
Conflicts:
	Assets/game.unity
```
  39efc318
- Merge branch 'arbitrary-dash' · 0b9dca7e
  Philipp Adolf authored Jun 05, 2015
  
  0b9dca7e
- Allow dashing in arbitrary directions · 9c625f66
  Philipp Adolf authored Jun 05, 2015
  
  9c625f66
- Add up and down keys · c3cb9d31
  Philipp Adolf authored Jun 05, 2015
  
  c3cb9d31
- Store key codes in array indexed by enum · 6fcab720
  Philipp Adolf authored Jun 05, 2015
  
  6fcab720