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

47 Commits

Author SHA1 Message Date
Tleety 260c1295ec WIP on deffered_rendering: a459a1c Skybox bugfix 2014-05-31 17:12:31 +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
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
ViktorLjung c37df5c178 Damage and Spashdamage working, phantomShapes not really working 2014-05-27 07:04:29 +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 6137adf604 Rockets deleted properly 2014-05-21 18:30:16 +02:00
ViktorLjung 609687d6b4 MULTIPLAYER 2014-05-20 01:43:59 +02:00
ViktorLjung ff58f881ae Merge branch 'havok' into gui 
Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-19 22:06:04 +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
Jace 539196cd45 Viewport stuff 2014-05-19 00:55:58 +02:00
Jace 16d51c64c5 Meh-ish helicopter physics 2014-05-17 03:49:53 +02:00
Jace f180abcd63 Input System improved to allow for multiple inputs for same bind 
Did not work properly between keyboard and controller before.
 2014-05-17 00:53:51 +02:00
ViktorLjung ab58cbc08d Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-13 03:36:09 +02:00
ViktorLjung ce5b62cf6d Shots fired! （ ﾟДﾟ） 2014-05-13 03:32:58 +02:00
Jace d259811795 Xbox360 controller support 2014-05-13 02:24:42 +02:00
ViktorLjung 74d3269e35 Merge remote-tracking branch 'origin/particles' into havok 
Conflicts:
	src/Components/Vehicle.h
 2014-05-13 01:57:28 +02:00
ViktorLjung b9231e4d46 Shots need more work 2014-05-13 01:50:58 +02:00
ViktorLjung 38482431a1 Tank tower and barrel steering working 2014-05-12 22:33:53 +02:00
Stiffly 457ee84903 Merge remote-tracking branch 'origin/havok' into particles 
Conflicts:
	src/Components/Vehicle.h
 2014-05-12 15:43:41 +02:00
ViktorLjung 2aa51c3e90 Tank sterring event-based 2014-05-12 14:04:55 +02:00
ViktorLjung c8a77d5c3d Merge remote-tracking branch 'origin/master' into havok 
Conflicts:
	assets
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-12 14:03:02 +02:00
Stiffly e0b5b72454 Merge remote-tracking branch 'origin/master' into particles 
Conflicts:
	src/Components/Physics.h
	src/GameWorld.cpp
	src/World.cpp
	src/World.h
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-12 13:55:48 +02:00
ViktorLjung ea69a9345d PhysicsSystem redesigned, more work is needed. 2014-05-07 22:29:03 +02:00
Jace 0e2a373053 Merge remote-tracking branch 'origin/master' into gui 
Conflicts:
	src/GameWorld.cpp
	src/Systems/FreeSteeringSystem.cpp
	src/Systems/PhysicsSystem.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-06 18:05:31 +02:00
Jace 8c8edd0e8e WIP InputController for easier command handling in systems 2014-05-06 14:33:02 +02:00
Jace 57d29d0db7 Started implementation of events for InputSystem and SoundSystem 2014-04-28 19:55:31 +02:00
Jace f02954a62c Box and Sphere components renamed to BoxShape and SphereShape 2014-04-25 01:05:53 +02:00
Jace 0b7c383e8a Merge branch 'havok' 
Conflicts:
	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
	src/Systems/PhysicsSystem.h
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-04-24 23:11:16 +02:00
ViktorLjung 4481c95681 VehicleSetup componentbased. 2014-04-22 17:14:29 +02:00
Stiffly 55221cca12 Implemented Spawn and Remove function for particles. Also added a Particle component. 2014-04-22 16:52:14 +02:00
Stiffly 2efb5405eb Merge branch 'master' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance 
Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-04-22 11:08:10 +02:00
ViktorLjung 069d079594 Car physics not working, yet! 2014-04-16 01:33:05 +02:00
Jace 62abb3f964 Merge branch 'havok' 
Conflicts:
	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
	src/Systems/RenderSystem.cpp
	src/Systems/RenderSystem.h
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-04-16 00:38:30 +02:00
ViktorLjung 84484b3703 Box and Sphere Rigidbodies working 2014-04-13 02:20:50 +02:00
Jace d13c19d654 Removed unused components 2014-04-12 18:36:06 +02:00
ViktorLjung 04fff4a27b Changed toolset to vs11, for future Havok implementation. 2014-04-12 01:59:55 +02:00
ViktorLjung d7e65ff118 Vehicle kind of working. 2014-04-12 00:36:37 +02:00
Jace 4c081d0e1c Indentation style changed to Allman 
Using Artistic Style (http://astyle.sourceforge.net/)
Options:
--style=allman
--indent=tab
--keep-one-line-blocks
--align-pointer=type
--align-reference=name
 2014-04-11 20:59:42 +02:00
Jace d7fa9eb70f Sound! 2014-04-10 07:39:44 +02:00
ViktorLjung 4a6f0cad32 Constraints working, I think... :D 2014-04-07 00:09:09 +02:00
ViktorLjung a880e7f3e6 CompoundShape works, i.e parent child physics :) 
Center of mass is still bugged.
 2014-04-06 19:00:58 +02:00
ViktorLjung 1d0747076f Physics!!!!!1111oneoneonetwo 2014-04-06 03:39:50 +02:00
Jace ad2862bf84 A gray tank! :D 2014-04-05 21:20:49 +02:00
Jace a7985b1686 Adapted Escape the Dawn engine. 2014-04-05 21:20:48 +02:00