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

52 Commits

Author SHA1 Message Date
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
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
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 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
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
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 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
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
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
Jace 3470a80f40 Revert "Indentation style changed to Horstmann" 
This reverts commit f2259f712d.

Conflicts:

	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
 2014-04-12 01:48:15 +02:00
ViktorLjung d7e65ff118 Vehicle kind of working. 2014-04-12 00:36:37 +02:00
Jace f2259f712d Indentation style changed to Horstmann 2014-04-11 21:53:05 +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 a774d0ca07 Some terrain and invisible lights... 2014-04-05 21:20:50 +02:00