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

75 Commits

Author SHA1 Message Date
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 bd7ba73bca Split screen working 2014-05-19 17:20:43 +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
ViktorLjung 02243becee Recoil while firing, clamp inputs, merge Helicopter 2014-05-18 23:54:01 +02:00
ViktorLjung fd0bb18bd3 tank stuff 2014-05-18 21:07:03 +02:00
Jace a36d6c554a Merge branch 'master' into havok 
Conflicts:
	assets
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-17 21:23:46 +02:00
ViktorLjung a8ecacab11 tank steering 2014-05-17 18:45:54 +02:00
ViktorLjung 4d15d3e02c Collision callbacks 2014-05-17 18:06:56 +02:00
Jace 542ad075ea ECS improved to make it less annoying to use 
AddComponent<Components::Transform>(entity, "Transform")
is now
AddComponent<Components::Transform>(entity)
etc.
 2014-05-17 17:46:17 +02:00
Jace add27aa8f4 Back to working order 2014-05-17 01:21:40 +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
Jace bafa8d0a5d Merge remote-tracking branch 'origin/deffered_rendering' 
Conflicts:
	assets
	src/Components/PointLight.h
	src/GameWorld.cpp
	src/Renderer.cpp
	src/Renderer.h
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-13 04:07:24 +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
Stiffly df13663ca8 Two emitters and following camera 2014-05-13 01:56:00 +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 19a2879104 Emitter childed to a wheel. BUG FIXED: Billboarding calculation. 2014-05-12 22:21:27 +02:00
Tleety 4639a6e4c3 Working shadows, however ugly they are. 2014-05-12 18:03:39 +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
ViktorLjung d7e5630f1b Tank with 8 wheels 2014-05-11 01:52:00 +02:00
Tleety 22d855a521 Fixed attenuation for lights. 2014-05-11 00:02:34 +02:00
Tleety c1c30b0019 Fixed lights and added a bad gamma correction 2014-05-10 19:51:48 +02:00
Tleety 1268b3d8fd Removed Unused code in renderer 2014-05-10 17:44:55 +02:00
Jace 62ca923821 Defucked defucked rendering 2014-05-07 22:34:38 +02:00
ViktorLjung ea69a9345d PhysicsSystem redesigned, more work is needed. 2014-05-07 22:29:03 +02:00
Tleety b1b60bce61 WIP 2014-05-07 14:23:01 +00: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 a232559bb1 FreeSteeringSystem converted to take input commands 2014-05-06 17:07:38 +02:00
Jace 8c8edd0e8e WIP InputController for easier command handling in systems 2014-05-06 14:33:02 +02:00
ViktorLjung dc32316bd7 Fixing suspension and car collision shape 2014-04-29 14:21:14 +02:00
ViktorLjung f471d7732f Vehicle tuning 2014-04-29 03:47:09 +02:00
Jace 57d29d0db7 Started implementation of events for InputSystem and SoundSystem 2014-04-28 19:55:31 +02:00
ViktorLjung ed1df6dc60 Proper rotation of child physics objects 2014-04-28 19:51:13 +02:00
ViktorLjung 00d27f0058 Physics now running on multiple threads 2014-04-28 02:06:08 +02:00
ViktorLjung 5f3b03fa6d Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok 
Conflicts:
	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-04-27 08:13:57 +02:00
ViktorLjung 720cf3aa87 Added support for HkpExtendedMeshShape. 2014-04-27 08:08:00 +02:00
Jace f02954a62c Box and Sphere components renamed to BoxShape and SphereShape 2014-04-25 01:05:53 +02:00
Jace 0567aab8c6 Merge branch 'havok' 2014-04-24 23:12:41 +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 8facd9dc9a Rigidbody physics fixed. 2014-04-24 23:10:59 +02:00
ViktorLjung 6ccb196b3b Jeep physics 2014-04-24 01:20:13 +02:00
ViktorLjung afbe58e4f3 Wheels now turning and spinning properly. 2014-04-24 00:11:49 +02:00
Jace 3412fa42f7 Jeep entity setup. 2014-04-23 23:25:41 +02:00
ViktorLjung eb6cc266a3 Vehicle component based, wheel rotation and position not working. 2014-04-22 19:14:35 +02:00