Commit Graph

46 Commits

Author SHA1 Message Date
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
antc13 fcd4fbd5d8 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2015-12-11 14:28:24 +01:00
antc13 be45abc90d Magnus coola Capture Point! 2015-12-11 14:28:11 +01:00
viktorljung 1434cdcb21 Added Fonts folder and font 2015-12-11 11:06:49 +01:00
sippeangelo b37468222e Added Unit Cylinder 2015-12-10 10:13:56 +01:00
sippeangelo 8a7ecf53f7 Added Unit Cube 2015-12-09 15:25:54 +01:00
sippeangelo 5a207bbb3e Added Unit Raptor 2015-12-09 14:21:47 +01:00
viktorljung 4bd902b697 DummyScene.mtl fixed texture path 2015-12-03 16:42:43 +01:00
viktorljung f800ba07f1 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2015-12-03 16:34:51 +01:00
viktorljung 790be7617f Added ScreenQuad and fixed DummyScene.mtl 2015-12-03 16:32:05 +01:00
FakeShemp 04a7848494 Sphinx added 2015-12-02 15:38:30 +01:00
FakeShemp a08447ddb3 Add dummy scene which is totally sci-fi. 2015-12-02 12:09:59 +01:00
FakeShemp 6428e2528c Fix materials
PS fakka obj
2015-12-01 17:35:48 +01:00
FakeShemp 22cecd336a Fix size and file names of widgets 2015-12-01 17:28:16 +01:00
sippeangelo 0bcd7bc2b8 fixup! Added Core assets 2015-12-01 16:44:11 +01:00
sippeangelo 1edc2d9b73 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets 2015-12-01 13:42:42 +01:00
sippeangelo b30b944f6b Added Core assets 2015-12-01 13:42:08 +01:00
Ayumiwii 2cdc48b3eb rotate - / scale- / translate-widgets
1 unit long
triangulated
obj file
2015-11-26 17:36:40 +01:00
sippeangelo 6b30aa83cf gitattributes for some asset file types 2015-11-20 16:03:25 +01:00
sippeangelo 2aa3725df7 Initial directory structure 2015-11-20 14:07:11 +01:00