BTH/escape-the-dawn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
f76c0b336f87a259a7eabf3c532fc885f155a605
escape-the-dawn/Escape-the-Dawn/Models
T
History
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
..
obstacle_cube_1.mtl
Mer LevelGeneration
2014-03-13 00:30:01 +01:00
obstacle_cube_1.obj
Missing .OBJ files
2014-03-13 02:23:03 +01:00
obstacle_mountain_1.mtl
Stuff :3
2014-03-12 22:41:53 +01:00
obstacle_mountain_1.obj
Missing .OBJ files
2014-03-13 02:23:03 +01:00
obstacle_mountain_2.mtl
Mer LevelGeneration
2014-03-13 00:30:01 +01:00
obstacle_mountain_2.obj
Missing .OBJ files
2014-03-13 02:23:03 +01:00
ObstacleTexture.png
Stuff :3
2014-03-12 22:41:53 +01:00
plane.mtl
Stuff :3
2014-03-12 22:41:53 +01:00
plane.obj
Missing .OBJ files
2014-03-13 02:23:03 +01:00
powerup.mtl
Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
2014-03-13 19:36:03 +01:00
powerupTexture.png
Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
2014-03-13 19:36:03 +01:00
ship.mtl
Stuff :3
2014-03-12 22:41:53 +01:00
ship.obj
Missing .OBJ files
2014-03-13 02:23:03 +01:00
shiptexture.png
Stuff :3
2014-03-12 22:41:53 +01:00
sphere.mtl
Stuff :3
2014-03-12 22:41:53 +01:00
sphere.obj
Missing .OBJ files
2014-03-13 02:23:03 +01:00
texture.png
Stuff :3
2014-03-12 22:41:53 +01:00