BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
483 Commits 15 Branches 0 Tags
11b792c85a17fcd17b2cfbeebb0d22708772562f
Commit Graph

3 Commits

Author SHA1 Message Date
viktorljung a85a703991 animations! 2015-10-20 11:02:03 +02:00
Jace d472e2ae88 Added ignore rule for .orig files, since nobody seem to be able to look at what they commit... 2015-09-28 21:56:11 +02:00
viktorljung 96511c63b1 Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	include/Core/Engine.h
	include/Physics/PhysicsSystem.h
	src/game/Game/LevelSystem.cpp
	src/game/Physics/PhysicsSystem.cpp
 2015-09-25 05:16:32 +02:00