Commit Graph

3 Commits

Author SHA1 Message Date
Tleety 836ffcb9de Merge branch 'master' of shard.imon.nu:Assets
Conflicts:
	Models/Placeholders/PhysicsTest/Cube.mtl
	Models/TestScene3/testScene.mtl
	Models/TestScene3/testScene.obj
2014-05-20 03:33:05 +02:00
Tleety 07100ef6eb Neutral normal and specular maps 2014-05-20 03:30:39 +02:00
ViktorLjung d7eb4a494f Test scene! 2014-05-20 01:42:33 +02:00