Commit Graph

86 Commits

Author SHA1 Message Date
Jace 7c18d0c778 Merge branch 'master' into gui 2014-05-06 18:08:32 +02:00
Jace c73da364f4 Derpy skybox un-derped 2014-05-06 18:08:13 +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 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
Jace 0e068be77b Basic input binding and command publishing system 2014-05-05 09:17:58 +02:00
Jace 5e7537b903 Input events moved from InputSystem to new InputManager 2014-05-05 07:16:45 +02:00
Jace 330a212830 Rectangle comparison fixed 2014-05-05 07:15:47 +02:00
Jace 9e8c3161e0 WIP Frame 2014-04-29 13:58:37 +02:00
Jace d0211ef8d6 Encapsulated Renderer WIDTH and HEIGHT variables. 2014-04-29 13:58:27 +02:00
Jace 57d29d0db7 Started implementation of events for InputSystem and SoundSystem 2014-04-28 19:55:31 +02:00
Jace 6ba50c2d1e Fixed GetComponent bug which would create invalid components if the entity didn't have the requested component 2014-04-28 16:16:03 +02:00
Jace 5870a4d7bf Working event system! 2014-04-28 09:28:18 +02:00
Jace 22138a36aa MessageRelay renamed to EventRelay 2014-04-28 06:03:45 +02:00
Jace 7da030d8cd Bloody .orig files! 2014-04-25 00:23:49 +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 824b31ff6b FreeSteering fixed 2014-04-24 20:09:46 +02:00
ViktorLjung 613610d5b1 Fixed camera view matrix. 2014-04-24 19:49:14 +02:00
Jace 0fbce570ff Extended Model to support specular and normal maps 2014-04-24 02:36:31 +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
ViktorLjung c1cb4da684 Fixed quaternion relative rotations! 2014-04-24 00:03:22 +02:00
ViktorLjung e95d78aba6 Fixed quaternion relative rotations! 2014-04-24 00:02:06 +02:00
Jace 3412fa42f7 Jeep entity setup. 2014-04-23 23:25:41 +02:00
Jace de1290bf67 Added a few debug messages to ResourceManager.
No longer warns about hot-loading when a resource which causes a load chain is preloaded.
2014-04-23 17:58:11 +02:00
Jace 530b16e31b Extended OBJ loader to parse specular and normal maps 2014-04-23 17:56:04 +02:00
Jace dfd9425473 WIP Frame 2014-04-23 02:19:17 +02:00
Jace ee34b15cf1 Rectangle class. 2014-04-23 01:36:03 +02:00
Jace 1e2f7fdd5c Skeleton MessageRelay 2014-04-22 19:15:02 +02:00
ViktorLjung eb6cc266a3 Vehicle component based, wheel rotation and position not working. 2014-04-22 19:14:35 +02:00
ViktorLjung f0b2f2a659 Barebones entity component commit events
Conflicts:
	src/GameWorld.cpp
2014-04-22 17:18:54 +02:00
ViktorLjung 4481c95681 VehicleSetup componentbased. 2014-04-22 17:14:29 +02:00
Jace 84d6911744 Barebones entity component commit events 2014-04-22 15:42:40 +02:00
Jace d2f3adb07e Vehicle keyboard steering!
Steering: Direction keys
Handbrake: Right control
2014-04-22 01:46:29 +02:00
Jace 4e5038a163 Fixed vehicle steering bug.
"The distance between the axles must be non zero"
Weird Havok coordinate system for specifying hardpoints was different to our coordinate system. Resulted in wheel axels without any separation!
2014-04-22 01:45:36 +02:00
ViktorLjung aa64b7074c Vehicle working, ready for entity-component implementation. 2014-04-17 00:47:53 +02:00
Tleety b1edefcf26 La till lite ljus och annan skit. Började på defucked rendering och det gick ju jävligt bra fucktiskt. 2014-04-17 00:05:19 +02:00
ViktorLjung fe263784ae Visual studio crap stuff 2014-04-16 14:46:41 +02:00
ViktorLjung e8aa3bf890 Fixed timestep, forgot header declaration. 2014-04-16 14:40:42 +02:00
ViktorLjung 0338a06836 Fixed timestep. 2014-04-16 14:38:26 +02:00
ViktorLjung 069d079594 Car physics not working, yet! 2014-04-16 01:33:05 +02:00
Jace cf6e16222a Boost and Havok environment variables changed to be version specific 2014-04-16 01:17:37 +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 1697627f69 Missing libs 2014-04-15 23:34:23 +02:00
Jace 062242ab8e Refactored existing systems to register their own components and resource types. 2014-04-13 17:15:46 +02:00
Jace e4e5068727 Resource manager refactoring 2014-04-13 03:42:12 +02:00
ViktorLjung 84484b3703 Box and Sphere Rigidbodies working 2014-04-13 02:20:50 +02:00
Jace 14feb3659b Initial work for pre-caching resources in render system 2014-04-13 01:25:21 +02:00