 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 |
|
|
FakeShemp
|
a4c0b448e5
|
Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets
|
2015-12-17 11:32:49 +01:00 |
|
|
FakeShemp
|
f3973c1255
|
Update widgets
Translation now has an origin-thingie for beautifulness
Capture point will return very soon
|
2015-12-17 11:32:40 +01:00 |
|
|
viktorljung
|
6b5749627c
|
Fixed camera orientation and origin
|
2015-12-17 11:13:02 +01:00 |
|
|
FakeShemp
|
408e785533
|
New camera
|
2015-12-15 16:27:54 +01:00 |
|
|
FakeShemp
|
e8ecc6004f
|
Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets
# Conflicts:
# Models/RotationWidgetX.mtl
# Models/RotationWidgetX.obj
# Models/RotationWidgetY.obj
# Models/RotationWidgetZ.obj
|
2015-12-15 15:48:35 +01:00 |
|
|
FakeShemp
|
a12e5a26ed
|
Rotation widget is separated and fatter
Add plane widget for scale/translation
|
2015-12-15 15:36:25 +01:00 |
|
|
viktorljung
|
008f727821
|
Placeholder camera model
|
2015-12-15 15:28:28 +01:00 |
|
|
viktorljung
|
c5f674349a
|
Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets
|
2015-12-14 19:06:19 +01:00 |
|
|
viktorljung
|
d174822bdc
|
Transparency fix
|
2015-12-14 19:06:11 +01:00 |
|
|
Jace
|
1cdd9f6dd3
|
Separated editor widgets into axes
|
2015-12-14 17:35:24 +01:00 |
|
|
Jace
|
95823e122a
|
Added DroidSans font
|
2015-12-14 14:53:09 +01:00 |
|
|
Jace
|
b96f52bd7f
|
Removed arial
|
2015-12-14 14:51:07 +01:00 |
|
|
Jace
|
b39ac5b5f0
|
Revert "Added comic sans font"
This reverts commit e35e9889fe.
|
2015-12-14 14:50:38 +01:00 |
|
|
Jace
|
3986d3ebfc
|
Fixed capturepoint texture
|
2015-12-14 13:17:46 +01:00 |
|
|
Jace
|
5874ddf376
|
Added Error model
|
2015-12-13 20:01:41 +01:00 |
|
|
viktorljung
|
fa95bf4383
|
Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets
|
2015-12-11 14:53:07 +01:00 |
|
|
viktorljung
|
e35e9889fe
|
Added comic sans font
|
2015-12-11 14:52:59 +01:00 |
|
 antc13
|
56305dcca6
|
Fixed Magnus minor mistakes.. again.
|
2015-12-11 14:37:28 +01:00 |
|
|
antc13
|
62ed314c0c
|
Fixed Magnus minor mistakes.
|
2015-12-11 14:35:13 +01:00 |
|