merge master into this branch

Browse Source

# Conflicts:
#	core/src/netwerkprog/game/util/game/Character.java
#	core/src/netwerkprog/game/util/game/Faction.java

...

This commit is contained in:

Sem van der Hoeven

2020-05-27 23:04:04 +02:00

parent cc4297d86d

commit 6c1e073348

15 changed files with 151 additions and 72 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

BIN

core/assets/ScifiCritters4.PNG Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB