BTH/fishtanks-assets
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
88 Commits 3 Branches 0 Tags
5de9bdcff878ab06a589101cf718fb74c3344e14
Commit Graph

88 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tleety 5de9bdcff8 Merge remote-tracking branch 'origin/master' into deferred_rendering 2014-05-30 19:28:49 +02:00
Tleety b6631a391e Auto from 194.47.155.239 2014-05-30 19:28:22 +02:00
ViktorLjung e077e4412b Merge branch 'master' of shard.imon.nu:Assets 2014-05-30 19:05:27 +02:00
ViktorLjung 919a3e4ba8 GateRampCollision fixed 2014-05-30 19:05:14 +02:00
Jace 1576768232 Merge branch 'master' of shard.imon.nu:Assets 2014-05-30 19:00:18 +02:00
Jace f648b58673 Auto from 194.47.155.242 2014-05-30 19:00:25 +02:00
Jace 4df4338acf Auto from 194.47.155.242 2014-05-30 19:00:21 +02:00
Jace 440f77a495 Merge branch 'master' of shard.imon.nu:Assets 2014-05-30 19:00:07 +02:00
Jace b5ab290dd0 Auto from 194.47.155.242 2014-05-30 19:00:04 +02:00
Jace 13005d5104 That's not how you spell "Vehicle" 2014-05-30 18:59:50 +02:00
ViktorLjung 8e4988fc2b Merge branch 'master' of shard.imon.nu:Assets 2014-05-30 18:43:43 +02:00
Stiffly 1bf0d79572 Explosion particles 2014-05-30 18:42:04 +02:00
ViktorLjung 5c8b8d1feb Gate RampCollision 2014-05-30 18:40:55 +02:00
Jace 64fe151fb4 Merge branch 'master' of shard.imon.nu:Assets 2014-05-30 18:40:48 +02:00
Jace d69f90ec79 Viktors testScene tillbaka. IGEN. 2014-05-30 18:40:37 +02:00
Stiffly c57ceddcff Auto from 194.47.150.113 2014-05-30 18:39:05 +02:00
Jace 4f4bba362e Merge branch 'master' of shard.imon.nu:Assets 2014-05-30 18:33:02 +02:00
Jace cdca9b2f37 Auto from 194.47.155.242 2014-05-30 18:33:00 +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 066c47ecd7 Merge branch 'deferred_rendering' of shard.imon.nu:Assets into deferred_rendering 2014-05-28 22:07:40 +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
ViktorLjung 7328a18d1a Auto from 194.47.155.248 2014-05-28 15:57:52 +02:00
ViktorLjung bc811a1b39 Terrain Shit 2014-05-27 09:10:33 +02:00
Jace 72b93d5750 Viktors test scene tillbax 2014-05-27 06:44:57 +02:00
Jace 11f0702783 HUD damage hurt thingy 2014-05-27 06:41:54 +02:00
Stiffly c8d0acbfac Auto from 194.47.150.113 2014-05-27 06:39:01 +02:00
Stiffly b19afd00bc Merge branch 'master' of shard.imon.nu:Assets 2014-05-27 00:50:31 +02:00
Stiffly 5a05d5ab3f Auto from 194.47.150.113 2014-05-27 00:50:04 +02:00
Stiffly 183121a220 Merge remote-tracking branch 'origin/master' 2014-05-27 00:41:02 +02:00
Stiffly 2991401c31 Added Sounds 2014-05-27 00:34:30 +02:00
Jace a7b710f708 Auto from 194.47.155.242 2014-05-26 19:31:45 +02:00
ViktorLjung c231d531a7 Merge branch 'master' of shard.imon.nu:Assets 2014-05-25 22:53:40 +02:00
ViktorLjung 5de8a338bf Auto from 194.47.155.248 2014-05-25 22:53:36 +02:00
Jace 4172f6d26d Auto from 192.168.1.1 2014-05-23 23:51:21 +02:00
ViktorLjung fe5e9c263f Tank wheel 2014-05-23 21:45:20 +02:00
Tleety 11db88fb3d FETT MED TEXTURES O SKIT 2014-05-22 15:48:57 +02:00
ViktorLjung b84caf1259 Auto from 194.47.155.248 2014-05-21 13:09:31 +02:00
Jace 05e49e0e4d Red rocket red rocket 2014-05-20 04:18:43 +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
ViktorLjung 6cc38589ed Merge remote-tracking branch 'origin/master' 2014-05-20 01:43:33 +02:00
ViktorLjung d7eb4a494f Test scene! 2014-05-20 01:42:33 +02:00
Stiffly 66e2abf429 Merge branch 'master' of shard.imon.nu:Assets 2014-05-20 00:37:19 +02:00
Stiffly 79f1e6a727 SURE 2014-05-20 00:36:00 +02:00