 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
|
68abdbb4e0
|
SpawnVehicle event
|
2014-06-03 03:55:34 +02:00 |
|
|
Jace
|
c55b9333a9
|
MKLINK made a corrupt FMOD DLL for some reason. Switching to COPY.
|
2014-06-03 03:53:47 +02:00 |
|
|
Jace
|
826f390d28
|
Merge remote-tracking branch 'origin/FMOD'
|
2014-06-02 23:03:47 +02:00 |
|
 Stiffly
|
f5b50ba66e
|
Missing FMOD libs
|
2014-06-02 23:00:37 +02:00 |
|
|
Jace
|
78cf4a0223
|
Multiple binds per input
|
2014-06-02 22:38:11 +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
|
2f2154ffe1
|
Kind of retarded tank
|
2014-06-02 17:50:46 +02:00 |
|
|
ViktorLjung
|
0144640a9b
|
Merge remote-tracking branch 'origin/master' into havok
Conflicts:
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-06-02 17:26:10 +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 |
|
|
Stiffly
|
4ac67a22ac
|
Removed temporary debug code
|
2014-06-02 16:25:00 +02:00 |
|
|
Jace
|
61fab09ceb
|
UI scaling properly
|
2014-06-02 16:10:52 +02:00 |
|
|
ViktorLjung
|
d64be64ba4
|
Garage working, ready for vehicle swap implementation
|
2014-06-01 03:07:47 +02:00 |
|
|
Jace
|
72420d4248
|
WIP Fullscreen Stuff (UI not scaling properly yet)
|
2014-06-01 03:05:42 +02:00 |
|
|
ViktorLjung
|
a142d368a7
|
Movement/rotation queue fixed and Simon force push
|
2014-05-31 03:55:23 +02:00 |
|
|
Jace
|
a6906886f5
|
Vehicle selection!
|
2014-05-31 03:45:37 +02:00 |
|
|
ViktorLjung
|
c489547294
|
Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok
Conflicts:
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-05-30 19:05:52 +02:00 |
|
|
Jace
|
55db057e50
|
Texture error checking and removed redundant caching
|
2014-05-30 18:51:11 +02:00 |
|
|
ViktorLjung
|
aeaadcba0f
|
Gate fixed
|
2014-05-30 18:44:53 +02:00 |
|
|
Jace
|
235a03ab4c
|
Tank wheel pair!
|
2014-05-30 01:04:09 +02:00 |
|
|
Jace
|
701ca06a65
|
Crosshair
|
2014-05-30 01:03:59 +02:00 |
|
|
Jace
|
04a2642f85
|
Tank shell inheriting velocity
|
2014-05-30 01:00:22 +02:00 |
|
|
Stiffly
|
128ff7ae4b
|
I'm coming at you like a dark horse
|
2014-05-29 21:40:51 +02:00 |
|
|
ViktorLjung
|
a1149394bb
|
Gate working
|
2014-05-29 21:25:30 +02:00 |
|
|
Stiffly
|
2ec484c906
|
Uses an enumerator to seperate 3D and 2D sound instead of the path name.
|
2014-05-29 21:25:21 +02:00 |
|
|
Stiffly
|
03d6594f9a
|
Loads BGM and SFX sounds differently depending on path to sound file.
|
2014-05-29 19:10:22 +02:00 |
|
|
Stiffly
|
4012edfd43
|
Added Stop Sound event.
|
2014-05-29 18:22:45 +02:00 |
|
|
Jace
|
2a28423cd5
|
Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok
Conflicts:
src/GameWorld.cpp
|
2014-05-29 17:46:30 +02:00 |
|
|
Jace
|
0db4ebea95
|
WIP WheelPair
|
2014-05-29 17:45:27 +02:00 |
|
|
ViktorLjung
|
04b15fe92a
|
Velocity now updating in transformcomponent
|
2014-05-29 17:45:26 +02:00 |
|
|
ViktorLjung
|
b8ec7e1dbd
|
Gate half done
|
2014-05-29 17:40:48 +02:00 |
|
|
ViktorLjung
|
fd188fded6
|
Velocity now updating in transformcomponent
|
2014-05-28 22:09:54 +02:00 |
|
|
Stiffly
|
1b2f930afa
|
Separated PlaySound into PlaySFX and PlayBGM.
|
2014-05-28 22:06:26 +02:00 |
|
|
Jace
|
ef0ff5a99b
|
WIP Awesometastic debugging
|
2014-05-28 22:05:17 +02:00 |
|
|
ViktorLjung
|
651e62ba94
|
Camera on tank barrel
|
2014-05-28 20:40:15 +02:00 |
|
|
ViktorLjung
|
75e8ae0265
|
Merge remote-tracking branch 'origin/gui' into havok
|
2014-05-28 20:29:28 +02:00 |
|
|
ViktorLjung
|
133473b00e
|
Tanksteering improved
|
2014-05-28 20:28:48 +02:00 |
|
|
Jace
|
cc42b94000
|
Viewports fixed. Damage HUD. Free steering fixed.
|
2014-05-28 20:22:38 +02:00 |
|
|
Stiffly
|
1a043ab411
|
Using ResourceManager for cached laoding of sounds.
|
2014-05-28 19:56:28 +02:00 |
|
|
Jace
|
f813f8d2ca
|
What is this I don't even *falls asleep*
|
2014-05-27 10:25:52 +02:00 |
|
|
Jace
|
f31b2b7ddb
|
Merge branch 'render_queue'
Conflicts:
src/GameWorld.cpp
src/Renderer.cpp
src/Shaders/Fragment.glsl
src/Systems/PhysicsSystem.h
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-05-27 09:35:52 +02:00 |
|
|
ViktorLjung
|
f775864ed2
|
Fishy
|
2014-05-27 09:10:59 +02:00 |
|
|
Stiffly
|
599e0c9bf0
|
Removed temporary event publishing code for PlaySound.
|
2014-05-27 08:53:12 +02:00 |
|
|
Stiffly
|
6cb802c845
|
Removed OpenAL. Added FMOD dll to batch file.
|
2014-05-27 08:48:48 +02:00 |
|
|
Jace
|
7b622d530b
|
No shadows and no skybox.
|
2014-05-27 08:35:39 +02:00 |
|
|
Jace
|
98167a806d
|
Merge remote-tracking branch 'origin/deffered_rendering' into render_queue
Conflicts:
src/Renderer.cpp
src/Renderer.h
|
2014-05-27 07:10:50 +02:00 |
|
|
ViktorLjung
|
c37df5c178
|
Damage and Spashdamage working, phantomShapes not really working
|
2014-05-27 07:04:29 +02:00 |
|