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

112 Commits

Author SHA1 Message Date
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
Jace 56e6545f0f Direct damage and VulnerableToSplash flag on Health component 2014-06-04 23:54:52 +02:00
Jace 2d716e2998 Merge branch 'master' into havok 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-04 22:01:25 +02:00
ViktorLjung 1b20204897 Player/Team specific triggers 2014-06-04 18:12:58 +02:00
Jace 5f1feffe0d Main menu finished 2014-06-04 16:59:30 +02:00
ViktorLjung 94178098ea Merge remote-tracking branch 'origin/master' into havok 
Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-04 05:48:48 +02:00
ViktorLjung f9f20535ba Jeep and tank tuning 2014-06-04 05:47:17 +02:00
Stiffly 2833b8df36 Merge branch 'master' into Sound+Particles 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-03 20:39:44 +02:00
Jace e15474c3d4 Fixed filters 2014-06-03 19:09:10 +02:00
Jace aeb29cde8b Merge branch 'deffered_rendering' 
Conflicts:
	assets
	src/Components/Physics.h
	src/GameWorld.cpp
	src/GameWorld.h
	src/Systems/PhysicsSystem.cpp
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-03 18:46:49 +02:00
Jace 7f328332c4 Merge branch 'master' into particles 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-03 17:19:53 +02:00
Jace 4596fffb91 Vehicle spawning 2014-06-03 03:55:34 +02:00
Stiffly e7eca74b03 Merge branch 'particles' into Sound+Particles 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-02 22:59:58 +02:00
Tleety 179c5c1feb Merge remote-tracking branch 'origin/particles' into deffered_rendering 
Conflicts:
	assets
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-02 20:20:36 +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
Tleety 00268f027a Walls are now destroyable! 2014-06-02 18:21:39 +02:00
Stiffly 349fab54a4 Merge remote-tracking branch 'origin/master' into particles 
Conflicts:
	src/GUI/GameFrame.h
	src/GUI/TextureFrame.h
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-06-02 17:37:25 +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
ViktorLjung d64be64ba4 Garage working, ready for vehicle swap implementation 2014-06-01 03:07:47 +02:00
Stiffly 804b0cac60 Now uses now sorts and renders sprites by depth. 
Merge remote-tracking branch 'origin/deffered_rendering' into particles

Conflicts:
	assets
	src/GameWorld.cpp
 2014-05-31 23:40:21 +02:00
Tleety 6e78307249 Merge remote-tracking branch 'origin/master' into deffered_rendering 
Conflicts:
	src/GUI/GameFrame.h
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-31 17:16:29 +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
Stiffly bf77fba963 Omg dem filter merge skillz 
Merge remote-tracking branch 'origin/deffered_rendering' into particles

Conflicts:
	src/GameWorld.cpp
	src/Systems/ParticleSystem.cpp
	src/Systems/ParticleSystem.h
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-30 19:11:52 +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
Tleety cc84f04542 Transparent objects working. 2014-05-29 23:59:36 +02:00
ViktorLjung a1149394bb Gate working 2014-05-29 21:25:30 +02:00
Stiffly 4012edfd43 Added Stop Sound event. 2014-05-29 18:22:45 +02:00
Jace 0db4ebea95 WIP WheelPair 2014-05-29 17:45:27 +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
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
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 6cb802c845 Removed OpenAL. Added FMOD dll to batch file. 2014-05-27 08:48:48 +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 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
Tleety 2db52ded2f Direction light working. 
Cleaned up some code in Renderer.cpp
 2014-05-27 03:09:52 +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
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 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
ViktorLjung a674295a83 Collisionfilters 2014-05-22 22:05:06 +02:00
ViktorLjung 6137adf604 Rockets deleted properly 2014-05-21 18:30:16 +02:00
Stiffly fe6e21a2d1 FMOD library only linked for release configuration 2014-05-21 17:43:55 +02:00
ViktorLjung 7e5cf8efaa Fuckhack 2014-05-20 03:41:10 +02:00