Stiffly
1a1b94477e
Merge remote-tracking branch 'origin/master' into water
...
Conflicts:
include/Core/Engine.h
include/Physics/PhysicsSystem.h
include/Sound/SoundSystem.h
src/game/Physics/PhysicsSystem.cpp
src/game/Sound/SoundSystem.cpp
PS:min teori i förra commiten var sann
2015-10-07 18:34:36 +02:00
Stiffly
db2d6ad6e4
Eventbaserade partiklar. Fick nån krasch i physicssystem efter ett tags spelande, men det hoppas jag löser sig när jag mergar in Viktors senaste fysikfixar :3
2015-10-07 17:22:45 +02:00
viktorljung
71fe786b04
even more bug fixes
2015-10-07 15:45:50 +02:00
Stiffly
8b12c1036d
Partycles.
2015-10-06 21:42:54 +02:00
Stiffly
ca810743b2
Angle and spread on particle system. Need to make them not collide.
2015-10-06 13:38:40 +02:00
tleety
773c6665bd
Particles working, still need some more variables implanted though
2015-10-02 16:35:21 +02:00
tleety
52dec86925
Particle system up and running, but with bugged rendering
2015-10-01 14:14:51 +02:00