 ViktorLjung
|
a001cad9bc
|
Merge branch 'master' into havok
Conflicts:
src/GameWorld.cpp
src/Systems/GameStateSystem.cpp
src/Systems/TankSteeringSystem.cpp
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-06-05 06:04:32 +02:00 |
|
|
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 |
|
 Stiffly
|
09971b2d77
|
Publishes some bgm sounds
|
2014-06-05 03:14:45 +02:00 |
|
 Jace
|
8b2fc86159
|
Main menu hidden for your debugging pleasure
|
2014-06-04 17:06:08 +02:00 |
|
|
Jace
|
5f1feffe0d
|
Main menu finished
|
2014-06-04 16:59:30 +02:00 |
|
|
Jace
|
0addc672b4
|
Multiple vehicle selection
|
2014-06-03 20:36:35 +02:00 |
|
|
Jace
|
0ad3d8ed76
|
Fixed vehicle selection hiding on selection
|
2014-06-03 03:55:35 +02:00 |
|
|
Jace
|
4596fffb91
|
Vehicle spawning
|
2014-06-03 03:55:34 +02:00 |
|
|
Jace
|
46f377c94c
|
Interface input revised
|
2014-06-03 03:55:34 +02:00 |
|
|
Jace
|
94fc516a69
|
Cleanup
|
2014-06-02 17:01:07 +02:00 |
|
|
Jace
|
27bfbd2025
|
Fixed free cam viewport toggle bug
|
2014-06-02 17:00:45 +02:00 |
|
|
Jace
|
72420d4248
|
WIP Fullscreen Stuff (UI not scaling properly yet)
|
2014-06-01 03:05:42 +02:00 |
|
|
Jace
|
a6906886f5
|
Vehicle selection!
|
2014-05-31 03:45:37 +02:00 |
|
|
Jace
|
235a03ab4c
|
Tank wheel pair!
|
2014-05-30 01:04:09 +02:00 |
|
|
Jace
|
ef0ff5a99b
|
WIP Awesometastic debugging
|
2014-05-28 22:05:17 +02:00 |
|
|
Jace
|
cc42b94000
|
Viewports fixed. Damage HUD. Free steering fixed.
|
2014-05-28 20:22:38 +02:00 |
|
|
Jace
|
f813f8d2ca
|
What is this I don't even *falls asleep*
|
2014-05-27 10:25:52 +02:00 |
|
|
Jace
|
d4b28a2228
|
Semi-working world rendering
|
2014-05-27 06:45:26 +02:00 |
|
|
Jace
|
22442708cc
|
One hell of a GUI interface (minus graphical)
"how does this even work lol"
|
2014-05-26 03:33:11 +02:00 |
|