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

34 Commits

Author SHA1 Message Date
Stiffly 756107363e Some pretty darn cool explosions 2014-06-01 01:15:53 +02:00
Stiffly cea2faaaf8 Removed unnecessary info messages 2014-05-31 23:14:13 +02:00
Stiffly a31e3faa1f Linear fade added to particles 2014-05-31 22:15:00 +02:00
Stiffly 28c3cf5e16 Optimized ParticleSystem. Still can't see particles though D: 2014-05-30 22:19:03 +02:00
Stiffly bf77fba963 Omg dem filter merge skillz 
Merge remote-tracking branch 'origin/deffered_rendering' into particles

Conflicts:
	src/GameWorld.cpp
	src/Systems/ParticleSystem.cpp
	src/Systems/ParticleSystem.h
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-05-30 19:11:52 +02:00
Stiffly 571edbc214 ... even more event-based 2014-05-27 07:09:22 +02:00
Stiffly 4b2f324d60 Merge remote-tracking branch 'origin/master' into particles 
Conflicts:
	src/GameWorld.cpp
	src/Systems/ParticleSystem.cpp
 2014-05-27 06:55:44 +02:00
ViktorLjung fe400e9af8 Merge remote-tracking branch 'origin/particles' 
Conflicts:
	src/GameWorld.cpp
	src/Systems/ParticleSystem.cpp
 2014-05-20 03:40:44 +02:00
Stiffly 65acae410d Added Explosion function to particles 2014-05-20 00:38:30 +02:00
Stiffly 1a52b1d04c finlir 2014-05-18 20:32:10 +02:00
Jace 542ad075ea ECS improved to make it less annoying to use 
AddComponent<Components::Transform>(entity, "Transform")
is now
AddComponent<Components::Transform>(entity)
etc.
 2014-05-17 17:46:17 +02:00
Stiffly 19a2879104 Emitter childed to a wheel. BUG FIXED: Billboarding calculation. 2014-05-12 22:21:27 +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
Stiffly 1a365bf069 Billboarding on sprites 2014-05-07 21:34:19 +02:00
Stiffly 398b157b89 Rendering sprites 2014-05-06 13:52:34 +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
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
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 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
Stiffly b07605594d Fixed loop, can't miss particles. (tried to add physics to particles) 2014-04-24 00:44:26 +02:00
Stiffly 5997ee2320 Added models and temporary "fly everywhere" direction to particles 2014-04-24 00:00:29 +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
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
Stiffly 55221cca12 Implemented Spawn and Remove function for particles. Also added a Particle component. 2014-04-22 16:52:14 +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
Stiffly 5e402af093 Added ParticleSystem skeleton plus basic temporary implementation. 2014-04-17 00:08:27 +02:00