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

105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stiffly b19afd00bc Merge branch 'master' of shard.imon.nu:Assets 2014-05-27 00:50:31 +02:00
Stiffly 5a05d5ab3f Auto from 194.47.150.113 2014-05-27 00:50:04 +02:00
Stiffly 183121a220 Merge remote-tracking branch 'origin/master' 2014-05-27 00:41:02 +02:00
Stiffly 2991401c31 Added Sounds 2014-05-27 00:34:30 +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 8514fb17f3 music 2014-05-19 00:49:27 +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
Tleety cdee701579 Ändrat texture till Grass från den fula viktor gjorde 2014-05-17 18:01:38 +02:00
Jace 5b022ccb9b Mysteriously missing texture coordinates are back 2014-05-16 22:40:16 +02:00
ViktorLjung 9a3fcc2418 container fix 2014-05-15 19:28:37 +02:00
Jace b8126c295f Auto from 192.168.1.1 2014-05-14 18:33:08 +02:00
Jace be4ed71cfc TEST 2014-05-14 18:12:48 +02:00
Jace 3c20f81205 Removed btsync crap from repo index 2014-05-14 18:10:29 +02:00
Jace 00d5b9ec6e Some ignore rules 2014-05-14 18:08:03 +02:00
Jace ae70cbc79e Revert "Auto from 192.168.1.1" 
This reverts commit d2976d20f1.
 2014-05-14 17:59:58 +02:00
Jace d2976d20f1 Auto from 192.168.1.1 2014-05-14 17:56:38 +02:00
Jace f5b26ea9ef Treat everything binary 2014-05-14 17:56:46 +02:00
Jace bc9f8fdf4b Auto from 192.168.1.2 2014-05-14 17:32:06 +02:00
Jace 83c16f19d7 BtSync wasn't enabled. Here's a bunch of missing stuff. 2014-05-14 16:39:54 +02:00
Jace 7402235423 Where da fak is Dust.png 2014-05-14 16:30:21 +02:00
Jace 782e3b974f Revert "Auto from 194.47.155.242" 
This reverts commit 82321a7ce3.
 2014-05-13 05:05:13 +02:00
Jace 0a617d58c7 Demo stuff 2014-05-13 05:03:18 +02:00
Jace 82321a7ce3 Auto from 194.47.155.242 2014-05-13 03:36:50 +02:00
ViktorLjung 15ac02523a Fixed tank collisions 2014-05-13 03:31:31 +02:00
ViktorLjung ce18c5662a Revert "Auto from 194.47.150.113" 
This reverts commit 1a97afe186.
 2014-05-13 03:31:15 +02:00
Jace 92cbd23417 Auto from 194.47.155.248 2014-05-13 01:56:23 +02:00
Stiffly 908d0eb803 Merge shard.imon.nu:Assets 2014-05-13 01:54:59 +02:00
Jace 1a97afe186 Auto from 194.47.150.113 2014-05-13 01:54:59 +02:00
ViktorLjung 05b3d22b01 Stuff 2014-05-13 01:49:19 +02:00
ViktorLjung 8b02ce0823 Revert "Auto from 194.47.155.248" 
This reverts commit 8f27403fd4.
 2014-05-13 01:49:04 +02:00
Jace 8f27403fd4 Auto from 194.47.155.248 2014-05-12 22:41:02 +02:00
Stiffly e2b54e6212 Dust particle 2014-05-12 15:43:56 +02:00
ViktorLjung 8b6c48b26b Merge branch 'master' of shard.imon.nu:Assets 2014-05-11 01:51:21 +02:00