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

352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ViktorLjung cb6b0a58d8 Resource manager OBJ vs Model conflict fixed 2014-04-27 08:07:18 +02:00
Stiffly 04962155e3 Merge branch 'particles' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into particles 2014-04-27 07:49:19 +02:00
Jace 04cafc53e2 Implemented entity cloning 2014-04-27 07:48:16 +02:00
Tleety 4389f2db4c Fixed being able to switch between Quad view and normal view. 2014-04-27 04:59:11 +02:00
Tleety a199e777bc Working Debug mode 2014-04-27 03:59:41 +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
Tleety 90e929131f Merge remote-tracking branch 'origin/master' into deffered_rendering 
Conflicts:
	src/GameWorld.cpp
	src/Shaders/Fragment.glsl
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-04-27 02:51:04 +02:00
Tleety 87cac66cd8 Basic working deferred rendering 2014-04-27 02:44:04 +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
Tleety 9c329145c4 Deferred rendering base mostly complete. 2014-04-25 04:09:42 +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 c4e127b154 Added VehicleSetup to Physics filter. 2014-04-24 23:30:46 +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
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
Stiffly b07605594d Fixed loop, can't miss particles. (tried to add physics to particles) 2014-04-24 00:44:26 +02:00
ViktorLjung afbe58e4f3 Wheels now turning and spinning properly. 2014-04-24 00:11:49 +02:00
Tleety 6d75336496 Started on deferred rendering framework. 2014-04-24 00:11:16 +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
Stiffly 5997ee2320 Added models and temporary "fly everywhere" direction to particles 2014-04-24 00:00:29 +02:00
Jace 3412fa42f7 Jeep entity setup. 2014-04-23 23:25:41 +02:00
Stiffly 07bc49e3c1 Bug fix: fixed time to correct resolution, seconds. 2014-04-23 22:46:19 +02:00
Stiffly 100f8f5be4 Bug fix: checked for particles not created 2014-04-23 21:33:43 +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
Stiffly bdac6fa9f9 Added velocity interpolation 2014-04-22 18:58:41 +02:00
Stiffly 78d4dbf8c2 Added scale and color interpolation 2014-04-22 17:59:55 +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
Stiffly 55221cca12 Implemented Spawn and Remove function for particles. Also added a Particle component. 2014-04-22 16:52:14 +02:00
Jace 84d6911744 Barebones entity component commit events 2014-04-22 15:42:40 +02:00
Stiffly 2efb5405eb Merge branch 'master' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance 
Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-04-22 11:08:10 +02:00
Jace d2f3adb07e Vehicle keyboard steering! 
Steering: Direction keys
Handbrake: Right control
 2014-04-22 01:46:29 +02:00