Merge branch 'develop' into develop

This commit is contained in:
Florian Küpper authored and GitHub committed 2017-11-25 22:55:40 +01:00
commit 06782e66df
26 files changed
+279 -219

No files matched your search

+1
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<ID>600352d6-d975-4945-9758-e6b379972a12</ID>
<PlayerName>Guest 1</PlayerName>
<Difficulty>TR_CONFIG_EASY</Difficulty>
<UserRole>TR_USERROLE_GUEST</UserRole>
+1
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<ID>abeb987f-bf44-4d6d-b922-e5deb608a1ab</ID>
<PlayerName>Guest 2</PlayerName>
<Difficulty>TR_CONFIG_EASY</Difficulty>
<UserRole>TR_USERROLE_GUEST</UserRole>
+1
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<ID>fd433fc4-60c0-4521-87ef-53aa7d252337</ID>
<PlayerName>Guest 3</PlayerName>
<Difficulty>TR_CONFIG_EASY</Difficulty>
<UserRole>TR_USERROLE_GUEST</UserRole>