BTH/fishtanks-assets
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
126 Commits 3 Branches 0 Tags
81400d65237e24fc39489e3c408fa9f7dead2229
Commit Graph

85 Commits

Author SHA1 Message Date
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
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
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 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
Jace 7cfd17fb7b Merge branch 'master' of shard.imon.nu:Assets 2014-05-31 21:01:27 +02:00
Jace 2ecad1fab1 CLARE != CLEAR 2014-05-31 21:01:05 +02:00
ViktorLjung 0f0dc5d839 Merge branch 'master' of shard.imon.nu:Assets 2014-05-31 03:54:46 +02:00
ViktorLjung a25c0fa490 Gate fix 2014-05-31 03:51:56 +02:00
Tleety d5991da346 Auto from 194.47.155.239 2014-05-31 01:10:49 +02:00
Jace 9ad6aab00d Auto from 194.47.155.242 2014-05-30 20:21:39 +02:00
Tleety bb58b546d3 Auto from 194.47.155.239 2014-05-30 19:54:56 +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 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 b5ab290dd0 Auto from 194.47.155.242 2014-05-30 19:00:04 +02:00
ViktorLjung 8e4988fc2b Merge branch 'master' of shard.imon.nu:Assets 2014-05-30 18:43:43 +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 cdca9b2f37 Auto from 194.47.155.242 2014-05-30 18:33:00 +02:00
Jace 74bc5c079b Auto from 194.47.155.242 2014-05-30 17:56:05 +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
Stiffly c8d0acbfac Auto from 194.47.150.113 2014-05-27 06:39:01 +02:00