Teejoon 003f5b14a5 Merge remote-tracking branch 'origin/master' into DDS ...

Conflicts:
	assets

2016-03-14 06:10:30 +01:00

..

Licenses

Fixes for #34 (Licenses)

2016-01-15 17:20:11 +01:00

Schema

Merge remote-tracking branch 'origin/master' into DDS

2016-03-14 06:10:30 +01:00

Setup

Executable name updated to "Axyz"

2016-03-14 01:53:20 +01:00

Shaders

Fixed DDS after merge

2016-03-14 06:09:06 +01:00

Axyz.ico

Added files for setup creation

2016-03-14 00:45:09 +01:00

DefaultConfig.ini

New map, Some new assets

2016-03-14 02:50:24 +01:00

DefaultInput.ini

New map, Some new assets

2016-03-14 02:50:24 +01:00

TacticalZ.rc

Added executable icon to CMakeLists

2016-03-14 01:42:14 +01:00