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

93 Commits

Author SHA1 Message Date
ViktorLjung 4d15d3e02c Collision callbacks 2014-05-17 18:06:56 +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
ViktorLjung 92e9fd1049 fixup! Fixed relative transform rotations (For real this time?) 2014-05-12 22:24:53 +02:00
Stiffly 19a2879104 Emitter childed to a wheel. BUG FIXED: Billboarding calculation. 2014-05-12 22:21:27 +02:00
ViktorLjung ddc41b88a7 Fixed relative transform rotations (For real this time?) 2014-05-12 22:15:21 +02:00
Stiffly 5d48ea7e2a not reversed input for Camera... 2014-05-12 22:05:56 +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 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
Stiffly 1a365bf069 Billboarding on sprites 2014-05-07 21:34:19 +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
Stiffly 398b157b89 Rendering sprites 2014-05-06 13:52:34 +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
Stiffly 262d259681 Orientation interpolation complete (v.length() != glm::length(v), the latter is correct) 2014-05-01 02:00:10 +02:00
Stiffly fa9a610353 Almost correct Orientation calculation... 2014-04-29 14:21:52 +02:00
ViktorLjung dc32316bd7 Fixing suspension and car collision shape 2014-04-29 14:21:14 +02:00
Jace d0211ef8d6 Encapsulated Renderer WIDTH and HEIGHT variables. 2014-04-29 13:58:27 +02:00
Stiffly a13e9d32ec Generalized interpolation functions. (orientation spectrum not working properly (quaterions...)) 2014-04-29 11:51:57 +02:00
ViktorLjung f471d7732f Vehicle tuning 2014-04-29 03:47:09 +02:00
Stiffly 0feb983277 Made Interpolation functions look nicer 2014-04-28 19:56:18 +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
Stiffly 68761c9291 Angular velocity support 2014-04-28 19:12:51 +02:00
Stiffly ea4b7b005e Now use the CloneEntity() function to spawn new particles. 2014-04-28 17:56:05 +02:00
Jace 5e1355f3fe Optimizations 
(cherry picked from commit 7e32946173)
 2014-04-28 16:24:17 +02:00
Jace 7e32946173 Optimizations 2014-04-28 04:00:53 +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
Stiffly 28ac8980f2 tested and fixed scale and velocity interpolation. Fix: could not go from lesser value to larger. Added methods for interpolation. 2014-04-27 03:20:14 +02:00
Stiffly 023f49b0ec Implemented support for spread angle for particle emitter. 2014-04-27 00:17:21 +02:00
Stiffly 956e7cab7b BUG FIX: Iterator not increased incorrectly -> No longer a particle stuck in emitter. 2014-04-25 04:32:15 +02:00
Jace f02954a62c Box and Sphere components renamed to BoxShape and SphereShape 2014-04-25 01:05:53 +02:00
Stiffly 166a9f48f1 Added support for multiple emitters. (ParticleEmitter component now friend class to ParticleSystem) 2014-04-25 00:24:13 +02:00
Jace 7da030d8cd Bloody .orig files! 2014-04-25 00:23:49 +02:00
ViktorLjung be90953f22 Rigidbody position not updating in debug FIXED 2014-04-24 23:29:28 +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