Commit Graph

4 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
Stiffly e2b54e6212 Dust particle 2014-05-12 15:43:56 +02:00
Jace c22f02b790 194.47.155.242 2014-05-10 18:27:46 +02:00