BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
364 Commits 15 Branches 0 Tags
9ed2f0403604c5ace534efb7fdca248cd419d4b2
Commit Graph

364 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tleety eb37cc2296 Fixed blendmaps 
Merge remote-tracking branch 'origin/gui' into deffered_rendering

Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-28 22:08:50 +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
Tleety 761b8e21e1 Added blendmap component 
Added renderque for models with a blendmap component
Added shaders for blendmaps
 2014-05-28 20:24:31 +02:00
Jace cc42b94000 Viewports fixed. Damage HUD. Free steering fixed. 2014-05-28 20:22:38 +02:00
Tleety a5f4c9daa0 Fixed so OBJ-loader now loads map_Bump options correctly. 2014-05-28 20:05:28 +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
Stiffly 571edbc214 ... even more event-based 2014-05-27 07:09:22 +02:00
Stiffly 5d53472286 CreateExplosion now Event-based (not tested) 2014-05-27 07:08:39 +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
Tleety 2db52ded2f Direction light working. 
Cleaned up some code in Renderer.cpp
 2014-05-27 03:09:52 +02:00
Stiffly 3b96be2162 Fixed playsound event. Added remove sounds OnComponentsRemove only when stopped playing. 2014-05-27 00:36:54 +02:00
Stiffly f4cd50b741 Fixed a Playsound event logic. Temporarily 2014-05-26 21:43:08 +02:00
Jace 74239300bd Merge commit 'e3aab96a750d6e5d6f8ff42ffdb5a23a47ab929d' into render_queue 
Conflicts:
	assets
	src/GameWorld.cpp
	src/Renderer.cpp
	src/Renderer.h
	src/Systems/RenderSystem.cpp
 2014-05-26 04:21:08 +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
Tleety 7d82c43df9 Started work on blend maps 2014-05-26 01:08:10 +02:00
ViktorLjung a0ee235473 Wrong assets 2014-05-26 01:04:31 +02:00
ViktorLjung 9a984dbb10 Broken 2014-05-26 01:03:25 +02:00
Jace 07c74ff9f5 I'll create a GUI interface using Visual Basic, see if I can track an IP address 2014-05-25 04:12:28 +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
Tleety e3aab96a75 Fixed forward rendering for transparensy 2014-05-25 01:52:57 +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
Jace 2fbcad4dbf Layer in render queue? 2014-05-24 20:32:54 +02:00
ViktorLjung dff888f82d Merge remote-tracking branch 'origin/master' into havok 2014-05-24 18:35:26 +02:00
ViktorLjung 60b8ad6799 Assets 2014-05-24 18:35:11 +02:00
Jace 1bf5a8464e Merge branch 'events' 2014-05-23 23:42:00 +02:00
Jace e48df894cf Better events 2014-05-23 23:41:34 +02:00
Tleety a9f2911e41 Shadows working, and looking totaly not shit. 
Improved location of the shadowmap to always be infront of the camera.
 2014-05-23 22:42:11 +02:00