Commit Graph

5 Commits

Author SHA1 Message Date
Stiffly 2545cef90f temporary particles for demo. trails for bricks, and on brick hit. 2015-10-08 21:41:01 +02:00
Stiffly 143bff2d9e Added two new particle sprites. 2015-10-08 18:19:15 +02:00
Stiffly bb314898ba Fixing vs build fail 2015-10-08 12:12:21 +02:00
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