Commit Graph

6 Commits

Author SHA1 Message Date
Jace a711ea7db8 Fancy sounds 2014-03-13 16:28:39 +01:00
ViktorLjung be04c07333 :3 2014-03-13 02:16:51 +01:00
ViktorLjung 2e85efd826 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
Conflicts:
	Escape-the-Dawn/GameWorld.cpp
	Escape-the-Dawn/plane.obj
2014-03-13 02:02:41 +01:00
Tobias Dahl bb6cc1a23e Ghettomerge 2014-03-11 22:32:49 +01:00
Jace fb471aae51 Revamped model loading interface. 2014-03-11 13:27:01 +01:00
Adam 00cff91a73 soundsystem strular 2014-03-10 03:46:41 +01:00