BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
335 Commits 15 Branches 0 Tags
2833b8df3637a3eea4cf4465e4e1ebeda2388bf9
Commit Graph

335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 ecbcee0fbf Deleted fmodex.dll file from incorrect path 2014-05-21 17:45:19 +02:00
Stiffly fe6e21a2d1 FMOD library only linked for release configuration 2014-05-21 17:43:55 +02:00
Stiffly 462af02a6b Added logic for 3D sound 2014-05-21 17:14:07 +02:00
Tleety dbad1ee7f5 Work done on light and shadows. 2014-05-21 16:51:05 +02:00
Jace 6d3aa5d394 Red rocket 2014-05-20 04:34:44 +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
Tleety e414087816 Some work done on lights and normals and other buggs/fixes 2014-05-20 03:33:42 +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
Tleety 82d5953c97 Specular maps working. 2014-05-19 21:36:28 +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
Jace 3023391358 Merge remote-tracking branch 'origin/deffered_rendering' into gui 
Conflicts:
	assets
	src/GameWorld.cpp
 2014-05-19 03:15:40 +02:00
Tleety 7455f4b865 NormalMaps Working and started work on specular maps. 2014-05-19 01:01:46 +02:00
ViktorLjung 998ee3cfab Brakes working 2014-05-19 00:58:48 +02:00
Jace 539196cd45 Viewport stuff 2014-05-19 00:55:58 +02:00
Stiffly 73afc8dad4 added wubs to the game, also FMOD 2014-05-19 00:49:57 +02:00
ViktorLjung f14a83caa8 Assets 2014-05-18 23:59:18 +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