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

116 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jace b6372d44b8 Merge branch 'master' into gui 2014-05-11 01:46:12 +02:00
Jace 41177581c6 WIP Render Queue 2014-05-11 01:46:02 +02:00
Jace 6e6a115ac3 Assets now as Git submodule! 2014-05-10 19:21:46 +02:00
Stiffly 1a365bf069 Billboarding on sprites 2014-05-07 21:34:19 +02: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 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
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
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
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
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
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
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
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
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