Merge branch 'story1266_3d_model_factory' into NewUI_merge

Browse Source

...

This commit is contained in:

Michael Rausch

2017-09-11 23:45:31 +12:00

parent aa098569f3 0197de6fe3

commit d223d393fa

8 changed files with 466 additions and 108 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

src/main/resources/meshes/ocean.dae

+107

File diff suppressed because one or more lines are too long

src/main/resources/meshes/player_identifier.dae

+147

File diff suppressed because one or more lines are too long