BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
362 Commits 15 Branches 0 Tags
93c4805a2297e2e167fdbadb6d16fc0f8193bd90
Commit Graph

206 Commits

Author SHA1 Message Date
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
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 571edbc214 ... even more event-based 2014-05-27 07:09:22 +02:00
ViktorLjung c37df5c178 Damage and Spashdamage working, phantomShapes not really working 2014-05-27 07:04:29 +02:00
Stiffly 4b2f324d60 Merge remote-tracking branch 'origin/master' into particles 
Conflicts:
	src/GameWorld.cpp
	src/Systems/ParticleSystem.cpp
 2014-05-27 06:55:44 +02:00
Jace d4b28a2228 Semi-working world rendering 2014-05-27 06:45:26 +02:00
Stiffly 7e995fc8b7 Fixed bug. Sound not longer always in origin. 2014-05-27 06:05:47 +02:00
Stiffly 62adbdb2c8 Added more Error checks 2014-05-27 04:41:51 +02:00
Stiffly 3b96be2162 Fixed playsound event. Added remove sounds OnComponentsRemove only when stopped playing. 2014-05-27 00:36:54 +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
ViktorLjung 9a984dbb10 Broken 2014-05-26 01:03:25 +02:00
Stiffly e3e0d549f5 Använder Eventbaserade OnComponentCreated funktionen 2014-05-25 04:02:08 +02:00
Stiffly 072e4d4dbb OnComponentCreated nu eventbaserat 2014-05-25 04:01:40 +02:00
Stiffly ad902cb511 Merge remote-tracking branch 'origin/master' into FMOD 
Conflicts:
	src/GameWorld.cpp
	src/Systems/SoundSystem.h
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-25 01:42:26 +02:00
Stiffly 3a638a356c Some new logic, m_Channels and m_Sounds added. Sound is really low... 2014-05-25 01:34:57 +02:00
ViktorLjung dff888f82d Merge remote-tracking branch 'origin/master' into havok 2014-05-24 18:35:26 +02:00
ViktorLjung a674295a83 Collisionfilters 2014-05-22 22:05:06 +02:00
Jace 4102756e33 Beautifully broken 2014-05-22 22:04:54 +02:00
ViktorLjung 6137adf604 Rockets deleted properly 2014-05-21 18:30:16 +02:00
Stiffly 462af02a6b Added logic for 3D sound 2014-05-21 17:14:07 +02:00
ViktorLjung 7e5cf8efaa Fuckhack 2014-05-20 03:41:10 +02:00
ViktorLjung fe400e9af8 Merge remote-tracking branch 'origin/particles' 
Conflicts:
	src/GameWorld.cpp
	src/Systems/ParticleSystem.cpp
 2014-05-20 03:40:44 +02:00
ViktorLjung 609687d6b4 MULTIPLAYER 2014-05-20 01:43:59 +02:00
Stiffly 65acae410d Added Explosion function to particles 2014-05-20 00:38:30 +02:00
Stiffly d06702a7e0 Added Listener component 2014-05-19 22:13:52 +02:00
ViktorLjung ff58f881ae Merge branch 'havok' into gui 
Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-19 22:06:04 +02:00
ViktorLjung ec74d700be fix 2014-05-19 21:57:13 +02:00
Jace 40718407ac Merge remote-tracking branch 'origin/master' into gui 
Conflicts:
	src/GameWorld.cpp
	src/InputManager.cpp
	src/Systems/RenderSystem.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-19 21:51:25 +02:00
ViktorLjung 7f77db97a0 Convert functions working in debug 2014-05-19 19:59:17 +02:00
Jace bd7ba73bca Split screen working 2014-05-19 17:20:43 +02:00
Jace e07a0a2b1a More viewport stuff 2014-05-19 04:29:30 +02:00
ViktorLjung 998ee3cfab Brakes working 2014-05-19 00:58:48 +02:00
Stiffly 73afc8dad4 added wubs to the game, also FMOD 2014-05-19 00:49:57 +02:00
ViktorLjung 02243becee Recoil while firing, clamp inputs, merge Helicopter 2014-05-18 23:54:01 +02:00
ViktorLjung 85e5d7461c Merge remote-tracking branch 'origin/vehicle-helicopter' into havok 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj
 2014-05-18 21:09:08 +02:00