Commit Graph

88 Commits

Author SHA1 Message Date
stiffly e85e1471cd Some sounds 2016-02-01 14:30:45 +01:00
FakeShemp d0a3743c61 Add spec, norm and incd testing spheres 2016-01-27 14:44:27 +01:00
Tleety 240508b5b3 New grey standard texture 2016-01-27 14:27:15 +01:00
Tleety bf5fd580e0 Changed name on the white texture 2016-01-27 13:55:00 +01:00
maqu14 e4dc9529f2 re:bullet 2016-01-25 01:32:33 +01:00
maqu14 1260c6dce7 bullet 2016-01-25 00:55:25 +01:00
maqu14 e50a163024 new crosshair 2016-01-25 00:40:46 +01:00
maqu14 6defce1172 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-01-24 23:53:57 +01:00
maqu14 e13aff5ee0 crosshair 2016-01-24 23:53:43 +01:00
antc13 7577819337 Fixed Assault Running Animation. 2016-01-24 23:17:27 +01:00
Ayumiwii 6073a2beca Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-01-24 23:06:07 +01:00
Ayumiwii 0119549173 Assault weapon with Glow 2016-01-24 23:05:59 +01:00
FakeShemp 39d2fd43fd Add tank weapon prototype 2016-01-24 22:03:02 +01:00
Ayumiwii d29a95b21c Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-01-24 21:50:09 +01:00
Ayumiwii 22f346b3df AssaultWeapon Geometry and material 2016-01-24 21:49:39 +01:00
antc13 5f3ab8b35d Assault class mesh:
AssaultAnimated

With 5 Animation clips:
Run
Hold Pos
Walk
Crouch
Crouch Walk
2016-01-24 20:47:34 +01:00
antc13 068fbb2d20 Changed all models to our custom format .mesh 2016-01-24 16:11:04 +01:00
FakeShemp 10bc7bac34 Fix diffuse colors for log and bush. 2016-01-23 13:51:39 +01:00
Jace e8174f630f Headlezz 2016-01-23 00:40:29 +01:00
FakeShemp f7e349a316 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-01-22 16:30:10 +01:00
FakeShemp 73a43d9c24 Fix bush, log and NeutralNormalMap.png 2016-01-22 16:30:03 +01:00
Jace 2a800ea92b Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-01-22 13:59:19 +01:00
Jace 19e27bd518 Testing obstacle course for triangle collisions 2016-01-22 13:57:56 +01:00
FakeShemp f5a88476db Add Log 2016-01-22 11:33:05 +01:00
viktorljung e203f7f66d Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-01-21 16:35:26 +01:00
viktorljung 762cca2eac Added UnitHexagon 2016-01-21 16:35:17 +01:00
Tleety cf2ac2a570 Merge remote-tracking branch 'origin/master' 2016-01-21 14:52:51 +01:00
Tleety 2d838ad0ad Some new textures for glowmap error handling and testing. 2016-01-21 14:52:24 +01:00
FakeShemp 8552b7d080 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-01-20 11:04:59 +01:00
FakeShemp 37af9a40cf Add 300 tris bush.
It's not final  yet but is good enough for the pitch.
2016-01-20 11:04:47 +01:00
viktorljung b6592dbb02 Fixed DirectionalLightWidget origin 2016-01-19 17:27:57 +01:00
Tleety 6ffb46e155 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Models/Hourglasses/Hourglass1.mtl
2016-01-19 16:10:44 +01:00
Tleety 187bc62969 Added directional light widget
Added Olivias secondary gun
Fixed some errors in Hourglass1
2016-01-19 16:09:15 +01:00
Jace e794bef3a7 Renamed icons correctly 2016-01-18 22:52:24 +01:00
Jace 9284c647f8 Flipped icons to their correct orientation 2016-01-18 22:50:53 +01:00
Jace 957d1bc544 Updated widget icons 2016-01-18 22:47:04 +01:00
Jace a94f30fee0 Added play and pause icons 2016-01-18 22:46:43 +01:00
Jace a1bb17dbe0 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-01-18 21:20:06 +01:00
Jace 098ab98871 Added editor icons 2016-01-18 21:19:44 +01:00
Ayumiwii f222f5e692 NO FUN ALLOWED
We should support 8-bit PNGs though, for maximum compression

P.S. OBJ is shitty format
2016-01-18 14:18:12 +01:00
FakeShemp 2fca918162 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-01-15 16:23:11 +01:00
FakeShemp 9a2bfbde1e Shitty hourglass 2016-01-15 16:23:00 +01:00
maqu14 a3c92ac876 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2016-01-15 10:36:50 +01:00
maqu14 293e42a504 Map version one 2016-01-15 10:33:46 +01:00
Jace a0d1615e51 Deleted wrongly named "Assualt" 2016-01-14 17:03:05 +01:00
maqu14 44d92bae07 name and size "fixed" 2016-01-14 16:55:48 +01:00
maqu14 bf51a19874 Assualt and naked "girl" mesh. 2016-01-11 10:31:11 +01:00
stiffly 6cbf2365d4 Test sound 2016-01-07 15:19:38 +01:00
FakeShemp c8e631f449 Fakely double-sided planes 2015-12-17 13:12:58 +01:00
FakeShemp 673d4a4e4c Fixed capitalization (Andreas pls) 2015-12-17 11:35:17 +01:00