Commit Graph

19 Commits

Author SHA1 Message Date
Tleety 74035fae26 Merge remote-tracking branch 'origin/master' into deferred_rendering 2014-05-30 19:55:04 +02:00
Tleety bb58b546d3 Auto from 194.47.155.239 2014-05-30 19:54:56 +02:00
Tleety 5de9bdcff8 Merge remote-tracking branch 'origin/master' into deferred_rendering 2014-05-30 19:28:49 +02:00
Jace 440f77a495 Merge branch 'master' of shard.imon.nu:Assets 2014-05-30 19:00:07 +02:00
Jace 13005d5104 That's not how you spell "Vehicle" 2014-05-30 18:59:50 +02:00
Stiffly 1bf0d79572 Explosion particles 2014-05-30 18:42:04 +02:00
Jace 32313e551c Renamed vehicle selection textures to make more sense 2014-05-30 18:32:43 +02:00
Jace 8615559387 Textures folder cleaned up 2014-05-30 18:04:13 +02:00
Jace 52988594b0 Merge branch 'master' of shard.imon.nu:Assets 2014-05-30 17:57:16 +02:00
Jace 74bc5c079b Auto from 194.47.155.242 2014-05-30 17:56:05 +02:00
Jace fe035e74bd Crosshair 2014-05-30 01:01:32 +02:00
Tleety 20edf7934a Added a rock texture 2014-05-29 23:58:20 +02:00
Tleety 2612b43929 ErrorTextures 2014-05-28 22:07:27 +02:00
Tleety 62d8e73c68 FETT MED TEXTURES O SKIT 2014-05-28 17:34:43 +02:00
Jace 11f0702783 HUD damage hurt thingy 2014-05-27 06:41:54 +02:00
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