Commit Graph

115 Commits

Author SHA1 Message Date
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
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
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
Teejoon b49fe60133 Merge branch 'AssetSorting' of 1.drake.imon.nu:TacticalZ-assets into AssetSorting 2016-02-10 14:52:43 +01:00
Teejoon ee0e65686e FirstPerson animations:
Run
ShootRifle
ReloadSwitch
LeftRight
DownUP
2016-02-10 14:52:27 +01:00
viktorljung 6ae43521b0 Animated Assault 2016-02-10 00:14:28 +01:00
antc13 c2847a658e Spherical Bullet exported with the new format. 2016-02-09 19:38:58 +01:00
FakeShemp 2151ad934d Fix Error.mesh 2016-02-08 17:14:52 +01:00
FakeShemp b54a886f94 Fixed UVs 2016-02-08 17:11:54 +01:00
FakeShemp e1a59f633a Most lost models recreated 2016-02-08 16:41:02 +01:00
FakeShemp 77e9d6c541 Another delete 2016-02-08 16:00:06 +01:00
FakeShemp 67ebb6afeb Delete some crap objects 2016-02-08 15:56:22 +01:00
FakeShemp 81214b96af New exports 2016-02-08 15:50:52 +01:00
FakeShemp f783b28755 Everything is sorted but won't work because we need a new export of every file. 2016-02-04 11:00:10 +01:00
FakeShemp 49f69101db Delete unnecessaries 2016-02-03 12:56:52 +01:00
antc13 c4898d8281 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-02-02 15:44:24 +01:00
antc13 083dcc0d19 Fixed the Capture Point model. 2016-02-02 15:44:19 +01:00
Ayumiwii 60fadfe18d Assault weapon model 2016-02-02 14:36:55 +01:00
Ayumiwii 415bbd5409 AssaultWeapon model with
Red and blue team:
- Textures
- GlowMaps
- SpecularMap
- NormalMap
2016-02-02 11:58:07 +01:00
Ayumiwii 763d7c5c0d Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-02-02 10:15:10 +01:00
Ayumiwii 0c74bc9d81 AssaultWeapon with
Texture
NormalMap
SpecularMap
GlowMap
2016-02-02 10:14:58 +01:00
FakeShemp 01a73005d4 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-02-01 18:32:04 +01:00
FakeShemp d018c8e734 Add Defender guns. 2016-02-01 18:31:50 +01:00
antc13 785f6d8a90 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-01-27 18:18:59 +01:00
antc13 b118c1a931 Animated Assault with only some joints keyframed. Also added a hexagon for the jump effect. Assault Animation Names & Frames:
Hold Pos: 1-120
Run: 130-190
Walk: 200-260
Crouch: 270-390
Crouch Walk: 400-460
CoolPose1: 470-471
CoolPose2: 480-481
2016-01-27 18:18:52 +01:00
FakeShemp 9b2fa74a6d Fix the test spheres. 2016-01-27 15:17:12 +01:00
FakeShemp d0a3743c61 Add spec, norm and incd testing spheres 2016-01-27 14:44:27 +01:00