maqu14 8a24a16232 Merge branch 'master' of github.com:teamfisk/TacticalZ ...

# Conflicts:
#	resources/DefaultConfig.ini
#	resources/Schema/Entities/CP_Rocky2.xml

2016-03-14 02:51:09 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

Merge branch 'master' of github.com:teamfisk/TacticalZ

2016-03-14 02:51:09 +01:00

Setup

Executable name updated to "Axyz"

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

Shaders

Merge branch 'master' into Movement

2016-03-13 22:22:36 +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