Merge branch 'actor_instancing' into develop

Browse source

# Conflicts:
#	sql/gamedata_actor_class.sql

...

This commit is contained in:

Filip Maj 2016-06-12 18:52:30 -04:00

parent fec348136e 957a8d89bb

commit a4ea5f024b

16 changed files with 9132 additions and 8135 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

16038

sql/gamedata_actor_class.sql

View file

File diff suppressed because it is too large Load diff