Commit Graph

182 Commits

Author SHA1 Message Date
FakeShemp 63fc80b4b9 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-02-11 20:40:17 +01:00
FakeShemp f251346b9f PickUpHolder textured
lotsa textures fixed
2016-02-11 20:40:10 +01:00
Ayumiwii 3a169e1f6a Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-02-11 20:12:30 +01:00
Ayumiwii 387c5e9db7 SciFiPillar2 with textures and glowmaps
- Red texture and glowmap
- Blue texture and glowmap
2016-02-11 20:12:24 +01:00
Teejoon 01df07998b Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-02-11 19:39:58 +01:00
Teejoon f4fcd04bc0 Highgroudn splatmap 2016-02-11 19:39:53 +01:00
FakeShemp 7fa7ae5124 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-02-11 19:05:11 +01:00
FakeShemp dbfc113ec3 New CylinderShot 2016-02-11 19:05:05 +01:00
Teejoon 105b22fc67 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-02-11 18:46:58 +01:00
Teejoon 3db55ccda0 Highground1 with Texture 2016-02-11 18:46:53 +01:00
Ayumiwii 18ec7494a9 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-02-11 17:00:39 +01:00
Ayumiwii 8d7b18ace1 SciFiPillar1 with textures
- Red texture and glowmap
- Blue texture and glowmap
2016-02-11 17:00:30 +01:00
antc13 66e2a73bdb Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-02-11 16:51:33 +01:00
antc13 82a18bbe7f Added Grid Walls 2016-02-11 16:51:27 +01:00
FakeShemp 238247fefd Shiny stone crystal in red and blue 2016-02-11 15:54:53 +01:00
Teejoon 0107c7dfdf Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-02-11 15:24:03 +01:00
Teejoon 5e5d8411ae Added more stones, medium and small. 2016-02-11 15:23:54 +01:00
FakeShemp e9dcf19b63 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-02-11 13:56:26 +01:00
FakeShemp ad67fa8216 WoodenBridge texture 2016-02-11 13:56:20 +01:00
antc13 e14d83beea Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-02-11 13:25:26 +01:00
antc13 002af8a902 Added Texture to the Big Stone. 2016-02-11 13:25:20 +01:00
Ayumiwii aa338955be Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-02-11 13:23:08 +01:00
Ayumiwii e4067df954 Changed to correct filepath 2016-02-11 13:23:00 +01:00
Jace 3e9ceccd37 Removed old AssaultWeapon 2016-02-11 12:50:13 +01:00
Ayumiwii 80cdb2f94f Capturepoint with models and textures
- Blue
- Red
- Neutral
2016-02-11 12:42:22 +01:00
antc13 6efc95a9ce Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-02-11 12:25:17 +01:00
antc13 db9cd49115 Special Root and Special Wall meshes added. Big Walls also got a texture now. 2016-02-11 12:25:11 +01:00
Tleety 8ffd0a99b9 UnitHexagons 2016-02-11 11:32:20 +01:00
Tleety 2d6d71eb10 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-02-11 11:27:46 +01:00
Tleety 8b93c1f440 Some new Crosshairs 2016-02-11 11:27:35 +01:00
FakeShemp 4bfd1890e1 temp ammo pickup 2016-02-11 10:41:44 +01:00
FakeShemp ea0cf59b5b Temp health pickup 2016-02-11 00:21:31 +01:00
antc13 c56f6380ab Changed size of Wooden Bridge 2016-02-10 22:31:50 +01:00
antc13 b2f381812d Merge branch 'AssetSorting' 2016-02-10 22:07:42 +01:00
antc13 9b91575cbb Changed Cylinder Shot Texture 2016-02-10 22:05:05 +01:00
antc13 bc37423e1e Fixed Corrupted Png File. 2016-02-10 21:58:17 +01:00
antc13 1d8be05011 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-02-10 21:22:25 +01:00
antc13 8a01407262 Added CylinderShot texture 2016-02-10 21:22:17 +01:00
Teejoon 77bab8c0f5 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-02-10 21:21:00 +01:00
Teejoon fcddb62a17 Blue Assault weapon fix 2016-02-10 21:20:53 +01:00
antc13 c690e1fb53 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets
# Conflicts:
#	Models/Effects/CylinderShot.mesh
#	Models/Effects/CylinderShot.mtrl
2016-02-10 21:18:28 +01:00
antc13 41d49ed7d4 New Cylinder/Sphere Shot 2016-02-10 21:14:44 +01:00
Teejoon 172b3ad527 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-02-10 21:08:44 +01:00
Teejoon 5e2a361a70 New first person animation and assault weapon weapon for both team got material with texture now 2016-02-10 21:08:35 +01:00
viktorljung 45cbc3abae Fixed weapon joint rotation and weapon origins 2016-02-10 20:41:52 +01:00
Teejoon 0580eeae80 new assault FirstPerson animations 2016-02-10 17:31:26 +01:00
antc13 e0ad8b8d45 Merge branch 'AssetSorting' of 1.drake.imon.nu:TacticalZ-assets into AssetSorting 2016-02-10 15:39:09 +01:00
antc13 63a3cc2b2c Added High Ground Models and Resized some models. 2016-02-10 15:39:02 +01:00
viktorljung 1c510a53d3 Merge remote-tracking branch 'origin/AssetSorting' 2016-02-10 14:53:50 +01:00
Teejoon b49fe60133 Merge branch 'AssetSorting' of 1.drake.imon.nu:TacticalZ-assets into AssetSorting 2016-02-10 14:52:43 +01:00