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

65 Commits

Author SHA1 Message Date
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
Stiffly 5a05d5ab3f Auto from 194.47.150.113 2014-05-27 00:50:04 +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
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
ViktorLjung e30529722e Z inverted 2014-05-20 00:19:58 +02:00
ViktorLjung 418c01cfe0 Auto from 194.47.155.248 2014-05-19 23:32:54 +02:00
Stiffly 91953c063a Merge remote-tracking branch 'origin/master' 
Conflicts:
	Models/Tank/Fix/Barrel.mtl
	Models/Tank/Fix/Barrel.obj
	Models/Tank/Fix/Chassi.mtl
	Models/Tank/Fix/Chassi.obj
	Models/Tank/Fix/ChassiCollision.mtl
	Models/Tank/Fix/ChassiCollision.obj
	Models/Tank/Fix/Top.mtl
	Models/Tank/Fix/Top.obj
	Models/Tank/Fix/Wheel.mtl
	Models/Tank/Fix/Wheel.obj
	Models/Tank/Fix/WheelPhysics.mtl
	Models/Tank/Fix/WheelPhysics.obj
 2014-05-19 00:48:50 +02:00
ViktorLjung 9d3f71bee6 Fixed tank physicswheel texture 2014-05-19 00:06:31 +02:00
ViktorLjung 0a8ad2bc62 Merge remote-tracking branch 'origin/master' 
Conflicts:
	Models/Container/Container.OBJ
	Models/Container/Container.mtl
 2014-05-18 23:58:52 +02:00
Stiffly 5f71cf5174 Viktor fix 2014-05-18 20:45:44 +02:00