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

58 Commits

Author SHA1 Message Date
Jace 428ad2bae0 Fixez 2014-06-05 16:45:15 +02:00
ViktorLjung d3dca03f47 fix 2014-06-05 06:56:42 +02:00
ViktorLjung 97994f9af7 Collisions 2014-06-05 06:42:19 +02:00
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
ViktorLjung f9f20535ba Jeep and tank tuning 2014-06-04 05:47:17 +02:00
ViktorLjung 486922a7c5 Tank tuning 2014-06-03 18:59:41 +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
ViktorLjung d64be64ba4 Garage working, ready for vehicle swap implementation 2014-06-01 03:07:47 +02:00
ViktorLjung a1149394bb Gate working 2014-05-29 21:25:30 +02:00
Jace f813f8d2ca What is this I don't even *falls asleep* 2014-05-27 10:25: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
ViktorLjung 9a984dbb10 Broken 2014-05-26 01:03:25 +02:00
Stiffly 072e4d4dbb OnComponentCreated nu eventbaserat 2014-05-25 04:01:40 +02:00
ViktorLjung dff888f82d Merge remote-tracking branch 'origin/master' into havok 2014-05-24 18:35:26 +02:00
ViktorLjung a674295a83 Collisionfilters 2014-05-22 22:05:06 +02:00
Jace 4102756e33 Beautifully broken 2014-05-22 22:04:54 +02:00
ViktorLjung 6137adf604 Rockets deleted properly 2014-05-21 18:30:16 +02:00
ViktorLjung 7e5cf8efaa Fuckhack 2014-05-20 03:41:10 +02:00
ViktorLjung 7f77db97a0 Convert functions working in debug 2014-05-19 19:59:17 +02:00
ViktorLjung 02243becee Recoil while firing, clamp inputs, merge Helicopter 2014-05-18 23:54:01 +02:00
ViktorLjung 85e5d7461c Merge remote-tracking branch 'origin/vehicle-helicopter' into havok 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj
 2014-05-18 21:09:08 +02:00
ViktorLjung fd0bb18bd3 tank stuff 2014-05-18 21:07:03 +02:00
ViktorLjung 4d15d3e02c Collision callbacks 2014-05-17 18:06:56 +02:00
Jace 16d51c64c5 Meh-ish helicopter physics 2014-05-17 03:49:53 +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
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
ViktorLjung dc32316bd7 Fixing suspension and car collision shape 2014-04-29 14:21:14 +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 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 eb6cc266a3 Vehicle component based, wheel rotation and position not working. 2014-04-22 19:14:35 +02:00
Jace d2f3adb07e Vehicle keyboard steering! 
Steering: Direction keys
Handbrake: Right control
 2014-04-22 01:46:29 +02:00
ViktorLjung e8aa3bf890 Fixed timestep, forgot header declaration. 2014-04-16 14:40:42 +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
ViktorLjung 84484b3703 Box and Sphere Rigidbodies working 2014-04-13 02:20:50 +02:00
ViktorLjung f6090679b7 Havok includes and libs working, ready for implementation. 2014-04-12 23:53:14 +02:00
ViktorLjung 41db395f61 Still trying to get it working. 2014-04-12 20:53:35 +02:00
ViktorLjung 04fff4a27b Changed toolset to vs11, for future Havok implementation. 2014-04-12 01:59:55 +02:00