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

..

Apartment

BtSync wasn't enabled. Here's a bunch of missing stuff.

2014-05-14 16:39:54 +02:00

Barrel

BtSync wasn't enabled. Here's a bunch of missing stuff.

2014-05-14 16:39:54 +02:00

Bench

BtSync wasn't enabled. Here's a bunch of missing stuff.

2014-05-14 16:39:54 +02:00

Bridge

BtSync wasn't enabled. Here's a bunch of missing stuff.

2014-05-14 16:39:54 +02:00

Car

SURE

2014-05-20 00:36:00 +02:00

cardboardBox

BtSync wasn't enabled. Here's a bunch of missing stuff.

2014-05-14 16:39:54 +02:00

Container

container fix

2014-05-15 19:28:37 +02:00

Flag

BtSync wasn't enabled. Here's a bunch of missing stuff.

2014-05-14 16:39:54 +02:00

Heli

BtSync wasn't enabled. Here's a bunch of missing stuff.

2014-05-14 16:39:54 +02:00

HRSV

BtSync wasn't enabled. Here's a bunch of missing stuff.

2014-05-14 16:39:54 +02:00

Jeep

BtSync wasn't enabled. Here's a bunch of missing stuff.

2014-05-14 16:39:54 +02:00

Junkpile

BtSync wasn't enabled. Here's a bunch of missing stuff.

2014-05-14 16:39:54 +02:00

LightPole

BtSync wasn't enabled. Here's a bunch of missing stuff.

2014-05-14 16:39:54 +02:00

Placeholders

Merge branch 'master' of shard.imon.nu:Assets

2014-05-20 03:33:05 +02:00

Road

BtSync wasn't enabled. Here's a bunch of missing stuff.

2014-05-14 16:39:54 +02:00

RoadSign

BtSync wasn't enabled. Here's a bunch of missing stuff.

2014-05-14 16:39:54 +02:00

SpawnRamp

BtSync wasn't enabled. Here's a bunch of missing stuff.

2014-05-14 16:39:54 +02:00

Stone

BtSync wasn't enabled. Here's a bunch of missing stuff.

2014-05-14 16:39:54 +02:00

Stone2

BtSync wasn't enabled. Here's a bunch of missing stuff.

2014-05-14 16:39:54 +02:00

Tank

Z inverted

2014-05-20 00:19:58 +02:00

TestScene

BtSync wasn't enabled. Here's a bunch of missing stuff.

2014-05-14 16:39:54 +02:00

TestScene2

BtSync wasn't enabled. Here's a bunch of missing stuff.

2014-05-14 16:39:54 +02:00

TestScene3

Merge branch 'master' of shard.imon.nu:Assets

2014-05-20 03:33:05 +02:00

Tree

BtSync wasn't enabled. Here's a bunch of missing stuff.

2014-05-14 16:39:54 +02:00

Wall

BtSync wasn't enabled. Here's a bunch of missing stuff.

2014-05-14 16:39:54 +02:00