Commit Graph

241 Commits

Author SHA1 Message Date
Jace d00ff3c2ed Assets now as Git submodule!
(cherry picked from commit 6e6a115ac3)
2014-05-10 19:44:29 +02:00
Jace 4c0b465c7f Assets now as Git submodule!
(cherry picked from commit 6e6a115ac3)
2014-05-10 19:39:29 +02:00
Jace 6e6a115ac3 Assets now as Git submodule! 2014-05-10 19:21:46 +02:00
Tleety 6e3ba0f077 Merge remote-tracking branch 'origin/master' into deffered_rendering 2014-05-10 17:45:01 +02:00
Tleety 1268b3d8fd Removed Unused code in renderer 2014-05-10 17:44:55 +02:00
Jace 62ca923821 Defucked defucked rendering 2014-05-07 22:34:38 +02:00
ViktorLjung 5393113dee Merge branch 'havok' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance into havok
Conflicts:
	src/GameWorld.cpp
2014-05-07 22:33:35 +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
Tleety b1b60bce61 WIP 2014-05-07 14:23:01 +00:00
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
Stiffly 398b157b89 Rendering sprites 2014-05-06 13:52:34 +02:00
Jace 469b53c14d Updated model paths 2014-05-06 04:46:22 +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
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 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
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
Stiffly d917be0135 Default values for ParticleEmitter.h 2014-04-28 17:55:51 +02:00
Jace 5e1355f3fe Optimizations
(cherry picked from commit 7e32946173)
2014-04-28 16:24:17 +02:00
Stiffly 0b8a3230c3 Fixed GetComponent bug which would create invalid components if the entity didn't have the requested component 2014-04-28 16:18:08 +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 55059c05fe Debugging Optimizations
Removed Basic Runtime Checks flag /RTC1
Added Maximize Speed flag /O2
Changed Debug Information Format flag /ZI -> /Zi
Added Enable Intrinsic Functions flag /Oi
2014-04-28 04:56:37 +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
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