369 Commits

Author SHA1 Message Date
Jace d7685a31af Revert "New defender animations"
This reverts commit 8ca6eba0f3.
2016-03-07 19:42:02 +01:00
Jace a598f88f8a Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets
# Conflicts:
#	Models/Characters/Defender/FirstPersonDefenderBlue.anim
2016-03-07 19:39:36 +01:00
Teejoon 8ca6eba0f3 New defender animations 2016-03-07 19:37:56 +01:00
Jace 0f9208a305 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Models/Characters/Assault/FirstPersonAssaultBlue.anim
#	Models/Characters/Assault/FirstPersonAssaultRed.anim
2016-03-07 17:56:53 +01:00
Teejoon 3a7f782958 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-03-07 17:51:34 +01:00
Teejoon 4094726d76 Assault animations 2016-03-07 17:51:16 +01:00
FakeShemp b5076d66df Colored arrows in blue, red and green 2016-03-07 17:13:28 +01:00
FakeShemp b8ea7acf1d Jag vet inte ens vad det här är 2016-03-07 16:17:06 +01:00
FakeShemp 52ea74c5d5 reflection map on defender gun 2016-03-07 13:50:35 +01:00
FakeShemp 91d2d8d381 Reflection map on pickup holder 2016-03-07 13:14:27 +01:00
FakeShemp 809a2c082d Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-03-07 13:01:03 +01:00
FakeShemp 0e95ebc2f2 Reflection map on pickups 2016-03-07 13:00:57 +01:00
Tleety 0ae736570b Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-03-07 10:48:11 +01:00
Tleety 56ad6a0241 Some health hud things 2016-03-07 10:48:00 +01:00
FakeShemp 3018f4ed9e Add missing textures and re-texture ShinyCrystalStone. 2016-03-07 10:34:25 +01:00
FakeShemp ae64f20ffc Add some reflection maps to specular alphas 2016-03-04 09:05:12 +01:00
Jace 6451a3f5a5 Merge remote-tracking branch 'origin/master' 2016-03-04 08:56:43 +01:00
Jace 819f9d1c8f MODELS YES 2016-03-04 08:54:38 +01:00
Ayumiwii 093cd1b104 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-03-04 08:32:47 +01:00
Ayumiwii c93a86f5c9 Secondary weapon models with blue and red textures 2016-03-04 08:32:36 +01:00
Jocke d3be164b69 Added new ability, boost, and class icons. 2016-03-04 08:22:08 +01:00
antc13 5d7614549b Added Textures to the highgounds. Need some tweaking, but probably better than candyland. 2016-03-04 04:18:27 +01:00
Jace 4205e92755 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-03-04 02:41:56 +01:00
Jace e68492b348 Added defender first person model 2016-03-04 02:41:30 +01:00
FakeShemp 071cec14c1 A possibility for a new CP beam 2016-03-04 01:33:20 +01:00
FakeShemp caca1db4fb Some hanging bushes for use on geometry edges. 2016-03-03 20:59:16 +01:00
stiffly c82b5716d9 Renamed the majority of the sound files to follow the code rules. Also added ShotgunFire.wav and AssaultWeaponFire.wav. 2016-03-03 17:28:21 +01:00
Jace b6dc528bd3 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-03-03 16:16:13 +01:00
Jace 50922bbc2b Gradient weapon tracer ray, tintable. 2016-03-03 16:15:25 +01:00
maqu14 7a6d70787b Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-03-03 13:26:58 +01:00
maqu14 93b4bab194 Added assets and modified the map. 2016-03-03 13:26:39 +01:00
Jace b8baf48e5e Shotgun sounds 2016-03-03 03:42:39 +01:00
viktorljung 4e2b71f13a Textured classes 2016-03-02 17:04:41 +01:00
FakeShemp 72530423ad Special arrow by Simon's request. 2016-03-01 22:34:09 +01:00
FakeShemp e2801bed3e fix arrows 2016-03-01 22:24:50 +01:00
FakeShemp 449da32615 A few arrows for your choice. 2016-03-01 22:05:44 +01:00
antc13 022890f8f5 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-03-01 14:44:50 +01:00
antc13 bb28bb63da Modified the highground. 2016-03-01 14:44:36 +01:00
FakeShemp 1d09801cf4 Fix 4k defender weapon texture 2016-02-29 16:25:50 +01:00
stiffly d72b3b4b47 Petter's updated ambient music 2016-02-29 16:06:51 +01:00
stiffly cea183a06a Added drum sound 2016-02-26 16:43:21 +01:00
Teejoon 651f65a98d Arrow thecture for indicating players :D 2016-02-24 17:32:30 +01:00
Tleety 10a611659d Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-02-24 14:21:31 +01:00
Tleety 0f31a332c9 Some random cubemaps 2016-02-24 14:21:21 +01:00
stiffly 00329bcf3e Yes! 2016-02-24 14:17:55 +01:00
Tleety 89b4070731 New cubemap 2016-02-23 17:17:13 +01:00
Tleety ba8e04f12b Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-02-23 16:00:05 +01:00
Tleety 6e7e1fc9b1 Some cubemap test images 2016-02-23 15:59:52 +01:00
antc13 0964372b1d Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-02-22 18:24:33 +01:00
antc13 f4bcdf41f9 New Map WIP. 2016-02-22 18:24:28 +01:00