Merge branch 'master' into Movement

Browse Source

# Conflicts:
#	include/Engine/Network/Client.h
#	resources/DefaultConfig.ini
#	resources/Schema/Entities/OverwatchCamera.xml
#	resources/Schema/Types/Entity.xsd

...

This commit is contained in:

sippeangelo

2016-03-13 22:22:36 +01:00

parent d587c9a692 77bb7a0f5c

commit a715f7fe86

47 changed files with 13403 additions and 10818 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/CP_Rocky2.xml

+10216 -10071

File diff suppressed because it is too large Load Diff

resources/Schema/Entities/OverwatchCamera.xml

+2629 -336

File diff suppressed because it is too large Load Diff