 ViktorLjung
|
e4a59cec61
|
Merge remote-tracking branch 'origin/master' into havok
Conflicts:
src/GameWorld.cpp
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-06-05 06:01:49 +02:00 |
|
|
ViktorLjung
|
1b20204897
|
Player/Team specific triggers
|
2014-06-04 18:12:58 +02:00 |
|
 Stiffly
|
98399c3995
|
Merge branch 'FMOD'
Conflicts:
src/GameWorld.cpp
src/Renderer.cpp
src/Systems/PhysicsSystem.cpp
src/Systems/PhysicsSystem.h
src/Systems/SoundSystem.cpp
src/Systems/SoundSystem.h
vs11/Returngeance/Returngeance.vcxproj
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-06-02 20:16:08 +02:00 |
|
|
ViktorLjung
|
d64be64ba4
|
Garage working, ready for vehicle swap implementation
|
2014-06-01 03:07:47 +02:00 |
|
|
ViktorLjung
|
a142d368a7
|
Movement/rotation queue fixed and Simon force push
|
2014-05-31 03:55:23 +02:00 |
|
|
ViktorLjung
|
a1149394bb
|
Gate working
|
2014-05-29 21:25:30 +02:00 |
|
 Jace
|
f813f8d2ca
|
What is this I don't even *falls asleep*
|
2014-05-27 10:25:52 +02:00 |
|
|
ViktorLjung
|
f775864ed2
|
Fishy
|
2014-05-27 09:10:59 +02:00 |
|
|
ViktorLjung
|
c37df5c178
|
Damage and Spashdamage working, phantomShapes not really working
|
2014-05-27 07:04:29 +02:00 |
|