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

71 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stiffly 1bf0d79572 Explosion particles 2014-05-30 18:42:04 +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 4f4bba362e Merge branch 'master' of shard.imon.nu:Assets 2014-05-30 18:33:02 +02:00
Jace cdca9b2f37 Auto from 194.47.155.242 2014-05-30 18:33:00 +02:00
Jace 32313e551c Renamed vehicle selection textures to make more sense 2014-05-30 18:32:43 +02:00
Jace 8615559387 Textures folder cleaned up 2014-05-30 18:04:13 +02:00
Jace 52988594b0 Merge branch 'master' of shard.imon.nu:Assets 2014-05-30 17:57:16 +02:00
Jace 74bc5c079b Auto from 194.47.155.242 2014-05-30 17:56:05 +02:00
Jace fe035e74bd Crosshair 2014-05-30 01:01:32 +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
Jace 11f0702783 HUD damage hurt thingy 2014-05-27 06:41:54 +02:00
Stiffly c8d0acbfac Auto from 194.47.150.113 2014-05-27 06:39:01 +02:00
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