Commit Graph

7 Commits

Author SHA1 Message Date
ViktorLjung d6a0cdca58 Missing powerup.obj 2014-03-13 20:59:45 +01:00
ViktorLjung 3a57a18b4f Kameran följer spelaren :3 2014-03-13 20:51:47 +01:00
ViktorLjung 01f2ebfa20 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
Conflicts:
	Escape-the-Dawn/Systems/LevelGenerationSystem.cpp
	Escape-the-Dawn/Systems/PlayerSystem.cpp
2014-03-13 19:36:03 +01:00
ViktorLjung 80eb38f373 Missing .OBJ files 2014-03-13 02:23:03 +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
ViktorLjung 5629312960 Mer LevelGeneration 2014-03-13 00:30:01 +01:00
ViktorLjung 56ccc31e57 Stuff :3 2014-03-12 22:41:53 +01:00