Sam Mario Svensson
|
573a0109e3
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
Conflicts:
Code/Game/GameLogic/GameLogicStates.h
Code/Game/GameLogic/JumpPad.cpp
Code/Game/GameLogic/JumpPad.h
|
2014-02-12 15:03:40 +01:00 |
|
Sam Mario Svensson
|
64b2d688bd
|
Försök till merge men det är cp
|
2014-02-12 14:48:58 +01:00 |
Erik Persson
|
6cbec3e2ac
|
GL - jumppad testing
|
2014-02-12 14:45:10 +01:00 |
lindaandersson
|
e8536cc5d4
|
GL - removed before collision event, sending look and right dir to server
|
2014-02-12 13:11:35 +01:00 |
|
Erik Persson
|
4ad86ae83b
|
GL - Added jumppad(implemented but not tested)
|
2014-02-04 16:24:48 +01:00 |