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

Browse Source

# Conflicts:
#	resources/Schema/Entities/NewMap.xml

...

This commit is contained in:

sippeangelo

2016-02-12 02:11:11 +01:00

parent 71533b52ae 9f8b0f7aa9

commit b9ea314232

20 changed files with 2409 additions and 683 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

resources/Schema/Entities/NewMap.xml

+1812 -654

File diff suppressed because it is too large Load Diff