 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
|
7ee60047a7
|
Pynt!
|
2014-06-05 03:52:10 +02:00 |
|
|
Jace
|
63d925a838
|
Auto from 194.47.155.242
|
2014-06-04 16:58:40 +02:00 |
|
|
ViktorLjung
|
cb920fb0de
|
Auto from 194.47.155.248
|
2014-06-04 15:40:55 +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 |
|
|
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
|
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 |
|
|
Tleety
|
d5c5a86713
|
Fixat en till skybox.
|
2014-05-31 23:12:57 +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
|
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 |
|
|
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 |
|