BTH/fishtanks-assets
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
151 Commits 3 Branches 0 Tags
81248e7395b22d0010cad9d714cc02caacf1e056
Commit Graph

151 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jace 81248e7395 Fixed sign texture 2014-06-05 15:13:03 +02:00
ViktorLjung c44c64df2b stuff 2014-06-05 06:41:46 +02:00
Tleety 8ab7df0d7f Merge branch 'master' of shard.imon.nu:Assets 2014-06-05 05:20:32 +02:00
Tleety 1239626cb4 Merge branch 'deferred_rendering' 2014-06-05 04:56:41 +02:00
Jace 5d9a060c49 Merge branch 'master' of shard.imon.nu:Assets 2014-06-05 03:52:20 +02:00
Jace 7ee60047a7 Pynt! 2014-06-05 03:52:10 +02:00
Stiffly 5357a0c4e1 renamed 2014-06-05 03:14:01 +02:00
Stiffly d013629690 Merge branch 'master' of shard.imon.nu:Assets 2014-06-04 18:14:23 +02:00
Stiffly 81400d6523 Vehicle engine sounds 2014-06-04 18:14:10 +02:00
ViktorLjung 79d4926c50 Auto from 194.47.155.248 2014-06-04 18:13:12 +02:00
Jace 26839b66e2 Merge branch 'master' of shard.imon.nu:Assets 2014-06-04 16:59:06 +02:00
Jace 63d925a838 Auto from 194.47.155.242 2014-06-04 16:58:40 +02:00
Jace d4fbbd9622 Main menu textures 2014-06-04 16:58:30 +02:00
ViktorLjung cb920fb0de Auto from 194.47.155.248 2014-06-04 15:40:55 +02:00
Stiffly cfda101f67 Added sounds from Return Fire 2014-06-04 15:20:07 +02:00
Jace 0ae7308ce2 BUY NOW! 2014-06-04 15:11:10 +02:00
Jace f3c28b5e59 Bridge material fixed 2014-06-04 14:04:55 +02:00
Jace 2249178a97 Merge branch 'master' of shard.imon.nu:Assets 2014-06-04 13:16:53 +02:00
Jace b21273f6e8 Walls 2014-06-04 13:16:35 +02:00
ViktorLjung e09ebf5a29 More bridges 2014-06-04 05:34:29 +02:00
ViktorLjung c2ee1b0198 Bridges 2014-06-04 05:19:59 +02:00
ViktorLjung fa4272b3f7 Merge branch 'master' of shard.imon.nu:Assets 
Conflicts:
	Models/TerrainFiveIstles/Bridges/MiddleBridge.mtl
 2014-06-04 05:13:06 +02:00
ViktorLjung c5edf6bf49 More terrain and roads 2014-06-04 05:12:17 +02:00
Jace 637f866e2d Proper bridge texture paths 2014-06-04 05:11:47 +02:00
Stiffly a6e3f120fd Splashez 2014-06-04 03:25:14 +02:00
Stiffly 78ba667b37 Merge branch 'master' of shard.imon.nu:Assets 2014-06-04 01:22:39 +02:00
Stiffly 2875fb4180 Muzzle Flash 2014-06-04 01:22:27 +02:00
ViktorLjung cc30e5fb5c Bridges and blender file 2014-06-04 00:51:23 +02:00
ViktorLjung 588da9ca0d Merge branch 'master' of shard.imon.nu:Assets 
Conflicts:
	Models/TerrainFiveIstles/Roads/MiddleRoad.mtl
	Models/TerrainFiveIstles/Roads/MiddleRoad.obj
 2014-06-03 22:01:07 +02:00
ViktorLjung 0ef4db1cb1 Islands and roads fixed 2014-06-03 21:59:27 +02:00
Stiffly d95c84dd10 Cutted tankshot sound 2014-06-03 21:54:39 +02:00
Stiffly c61526f5fc Boom sound 2014-06-03 19:45:29 +02:00
Jace 75977fd865 Merge branch 'master' of shard.imon.nu:Assets 2014-06-03 18:45:42 +02:00
Jace fda01f8e64 Auto from 194.47.155.242 2014-06-03 18:45:28 +02:00
Jace 13d43eefc2 MiddleRoad wasn't triangulated -.- 2014-06-03 18:45:19 +02:00
ViktorLjung 9cf180b0d9 Auto from 194.47.155.248 2014-06-03 18:34:57 +02:00
Jace 055e6ce7b1 Auto from 194.47.155.242 2014-06-03 18:09:01 +02:00
Jace e0d6fd1363 Auto from 194.47.155.242 2014-06-03 18:06:51 +02:00
Jace 698f99421e Auto from 194.47.155.242 2014-06-03 18:00:46 +02:00
Jace 3c4d81137f Lost in transition 2014-06-03 01:12:27 +02:00
Tleety 8198d220e4 Auto from 194.47.155.239 2014-06-02 22:18:23 +02:00
Tleety 664f55cd71 Merge remote-tracking branch 'origin/master' into deferred_rendering 2014-06-02 20:18:44 +02:00
Tleety c5043a9c36 Auto from 194.47.155.239 2014-06-02 18:20:44 +02:00
Jace 2350389aaa Auto from 194.47.155.242 2014-06-02 17:53:05 +02:00
Stiffly 827c9d2959 Auto from 194.47.150.113 2014-06-02 16:26:45 +02:00
Tleety f3e5fdaabe Auto from 194.47.155.239 2014-06-02 13:48:17 +02:00
ViktorLjung 4a7b5c236d Merge branch 'master' of shard.imon.nu:Assets 2014-06-01 03:05:51 +02:00
ViktorLjung 31b680c57e Fixes and stuff 2014-06-01 03:05:28 +02:00
Tleety 50ee6f805f Changed the origin of tree collosion mesh 2014-06-01 03:00:14 +02:00
Stiffly bd746269ff explosion blast 2014-06-01 01:15:25 +02:00