diff --git a/Assets/Images/ScreenCapture_1024x500.png b/Assets/Images/ScreenCapture_1024x500.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ae2a0012471c35132949d360c28c882f5f884d0
--- /dev/null
+++ b/Assets/Images/ScreenCapture_1024x500.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8762353a977cdc02121201b5aa826b0186fd62085c30abe9077e3fbf4eb402e1
+size 263498
diff --git a/Assets/Images/frameit_logo_512x512.png b/Assets/Images/frameit_logo_512x512.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ca5ce9e48e20274ed2f5311a4995438f35f0d84
--- /dev/null
+++ b/Assets/Images/frameit_logo_512x512.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b17fddfb76263d3e21bd0d3ec140b0e3f2e93eb71557b0b59af18aa953e7bbba
+size 27179
diff --git a/Assets/Plugins/Android.meta b/Assets/Plugins/Android.meta
new file mode 100644
index 0000000000000000000000000000000000000000..835fbb275f25594a917d01137527c60129ef3536
--- /dev/null
+++ b/Assets/Plugins/Android.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5d0237ee59c2e834b9d5b82bffccb56e
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/baseProjectTemplate.gradle.DISABLED b/Assets/Plugins/Android/baseProjectTemplate.gradle.DISABLED
new file mode 100644
index 0000000000000000000000000000000000000000..adeed3f7267359f3583f806cc8df273c4c55d253
--- /dev/null
+++ b/Assets/Plugins/Android/baseProjectTemplate.gradle.DISABLED
@@ -0,0 +1,30 @@
+allprojects {
+ buildscript {
+ repositories {**ARTIFACTORYREPOSITORY**
+ google()
+ jcenter()
+ }
+
+ dependencies {
+ // If you are changing the Android Gradle Plugin version, make sure it is compatible with the Gradle version preinstalled with Unity
+ // See which Gradle version is preinstalled with Unity here https://docs.unity3d.com/Manual/android-gradle-overview.html
+ // See official Gradle and Android Gradle Plugin compatibility table here https://developer.android.com/studio/releases/gradle-plugin#updating-gradle
+ // To specify a custom Gradle version in Unity, go do "Preferences > External Tools", uncheck "Gradle Installed with Unity (recommended)" and specify a path to a custom Gradle version
+ // [edited] classpath 'com.android.tools.build:gradle:4.0.1'
+ classpath 'com.android.tools.build:gradle:3.4.0'
+ **BUILD_SCRIPT_DEPS**
+ }
+ }
+
+ repositories {**ARTIFACTORYREPOSITORY**
+ google()
+ jcenter()
+ flatDir {
+ dirs "${project(':unityLibrary').projectDir}/libs"
+ }
+ }
+}
+
+task clean(type: Delete) {
+ delete rootProject.buildDir
+}
diff --git a/Assets/Plugins/Android/baseProjectTemplate.gradle.DISABLED.meta b/Assets/Plugins/Android/baseProjectTemplate.gradle.DISABLED.meta
new file mode 100644
index 0000000000000000000000000000000000000000..1d01647d6494a3cd938d4aa436339a0cbabb2f0e
--- /dev/null
+++ b/Assets/Plugins/Android/baseProjectTemplate.gradle.DISABLED.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 86ffec3d773ea6b48a838f365bfdff16
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network_Backup.json b/Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network_Backup.json
new file mode 100644
index 0000000000000000000000000000000000000000..a261a61d1aa689cf1841dc450358b5d2b641d5ab
--- /dev/null
+++ b/Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network_Backup.json
@@ -0,0 +1,19 @@
+{
+ "lastIP": "",
+ "newIP": "",
+ "IPslot1": "uframeit.informatik.uni-erlangen.de:8085",
+ "IPslot2": "uframeit.informatik.uni-erlangen.de:8086",
+ "IPslot3": "",
+ "selecIP": "",
+ "ControlMode": "Keyboard",
+ "TouchMode": 1,
+ "TAvisibility": 1.0,
+ "autoOSrecognition": true,
+ "Opsys": "Windows",
+ "FrameITUIversion": 2,
+ "InputManagerVersion": 1,
+ "colliderScale_all": 1.200000047683716,
+ "cursorSize": 0.03125,
+ "camRotatingSensitivity": 2.0,
+ "MouseKeepingInWindow": true
+}
\ No newline at end of file
diff --git a/Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network_Backup.json.meta b/Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network_Backup.json.meta
new file mode 100644
index 0000000000000000000000000000000000000000..ca8a78ddfc56ec9b1c2afbed317d71b501deb92f
--- /dev/null
+++ b/Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network_Backup.json.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3315a92b25ce53341976adc3f09d173e
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Packages/manifest.json b/Packages/manifest.json
index 0d0dc7b1a6edd8effdb55a9879db91c526e4ce66..f0bfe0c0e169c6f1ca29e6b2d78cbf3f14e279ac 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -12,7 +12,7 @@
"com.unity.inputsystem": "1.3.0",
"com.unity.nuget.newtonsoft-json": "3.0.2",
"com.unity.probuilder": "5.0.3",
- "com.unity.purchasing": "4.1.5",
+ "com.unity.purchasing": "4.4.1",
"com.unity.test-framework": "1.1.31",
"com.unity.jobs": "0.51.0-preview.32",
"com.unity.multiplayer-hlapi": "1.0.8",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index bbecfaf07e1f289504c3c18a452ca7e4cb43d5ed..50884e714cb47775eec698efb8523ee3f653ee03 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -160,7 +160,7 @@
"url": "https://packages.unity.com"
},
"com.unity.purchasing": {
- "version": "4.1.5",
+ "version": "4.4.1",
"depth": 0,
"source": "registry",
"dependencies": {
@@ -169,7 +169,18 @@
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
- "com.unity.services.core": "1.0.1"
+ "com.unity.services.core": "1.3.1",
+ "com.unity.services.analytics": "4.0.1"
+ },
+ "url": "https://packages.unity.com"
+ },
+ "com.unity.services.analytics": {
+ "version": "4.0.1",
+ "depth": 1,
+ "source": "registry",
+ "dependencies": {
+ "com.unity.ugui": "1.0.0",
+ "com.unity.services.core": "1.4.0"
},
"url": "https://packages.unity.com"
},
diff --git a/ProjectSettings/BurstAotSettings_Android.json b/ProjectSettings/BurstAotSettings_Android.json
new file mode 100644
index 0000000000000000000000000000000000000000..771d37b73d4522914996afdb6b138e3338c5f368
--- /dev/null
+++ b/ProjectSettings/BurstAotSettings_Android.json
@@ -0,0 +1,14 @@
+{
+ "MonoBehaviour": {
+ "Version": 4,
+ "EnableBurstCompilation": true,
+ "EnableOptimisations": true,
+ "EnableSafetyChecks": false,
+ "EnableDebugInAllBuilds": false,
+ "CpuMinTargetX32": 0,
+ "CpuMaxTargetX32": 0,
+ "CpuMinTargetX64": 0,
+ "CpuMaxTargetX64": 0,
+ "OptimizeFor": 0
+ }
+}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 463e25abbe28dea578582e6a77cf800d7f19b363..0935ef1fae807faac9b619b7f19fb11d4980c7b3 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -3,7 +3,7 @@
--- !u!129 &1
PlayerSettings:
m_ObjectHideFlags: 0
- serializedVersion: 22
+ serializedVersion: 23
productGUID: 87aa1c7cf531f1049a41ae8f56438901
AndroidProfiler: 0
AndroidFilterTouchesWhenObscured: 0
@@ -149,11 +149,13 @@ PlayerSettings:
enable360StereoCapture: 0
isWsaHolographicRemotingEnabled: 0
enableFrameTimingStats: 0
+ enableOpenGLProfilerGPURecorders: 1
useHDRDisplay: 0
D3DHDRBitDepth: 0
m_ColorGamuts: 00000000
targetPixelDensity: 30
resolutionScalingMode: 0
+ resetResolutionOnWindowResize: 0
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier:
@@ -164,8 +166,8 @@ PlayerSettings:
iPhone: 0
tvOS: 0
overrideDefaultApplicationIdentifier: 0
- AndroidBundleVersionCode: 1
- AndroidMinSdkVersion: 19
+ AndroidBundleVersionCode: 4
+ AndroidMinSdkVersion: 22
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 1
aotOptions:
@@ -221,6 +223,7 @@ PlayerSettings:
iOSLaunchScreeniPadCustomStoryboardPath:
iOSDeviceRequirements: []
iOSURLSchemes: []
+ macOSURLSchemes: []
iOSBackgroundModes: 0
iOSMetalForceHardShadows: 0
metalEditorSupport: 1
@@ -247,19 +250,19 @@ PlayerSettings:
useCustomBaseGradleTemplate: 0
useCustomGradlePropertiesTemplate: 0
useCustomProguardFile: 0
- AndroidTargetArchitectures: 1
+ AndroidTargetArchitectures: 3
AndroidTargetDevices: 0
AndroidSplashScreenScale: 0
androidSplashScreen: {fileID: 0}
- AndroidKeystoreName:
- AndroidKeyaliasName:
+ AndroidKeystoreName: C:/Users/o-s-r/Documents/fau/Projekt_KI/KEYS/user.keystore
+ AndroidKeyaliasName: uploadkey
AndroidBuildApkPerCpuArchitecture: 0
AndroidTVCompatibility: 1
AndroidIsGame: 1
AndroidEnableTango: 0
androidEnableBanner: 1
androidUseLowAccuracyLocation: 0
- androidUseCustomKeystore: 0
+ androidUseCustomKeystore: 1
m_AndroidBanners:
- width: 320
height: 180
@@ -423,7 +426,7 @@ PlayerSettings:
m_BuildTargetGraphicsAPIs:
- m_BuildTarget: AndroidPlayer
m_APIs: 0b00000008000000
- m_Automatic: 1
+ m_Automatic: 0
- m_BuildTarget: iOSSupport
m_APIs: 10000000
m_Automatic: 1
@@ -453,6 +456,7 @@ PlayerSettings:
m_BuildTargetGroupLightmapEncodingQuality: []
m_BuildTargetGroupLightmapSettings: []
m_BuildTargetNormalMapEncoding: []
+ m_BuildTargetDefaultTextureCompressionFormat: []
playModeTestRunnerEnabled: 0
runPlayModeTestAsEditModeTest: 0
actionOnDotNetUnhandledException: 1
@@ -471,6 +475,7 @@ PlayerSettings:
switchScreenResolutionBehavior: 2
switchUseCPUProfiler: 0
switchUseGOLDLinker: 0
+ switchLTOSetting: 0
switchApplicationID: 0x01004b9000490000
switchNSODependencies:
switchTitleNames_0:
@@ -601,7 +606,9 @@ PlayerSettings:
switchPlayerConnectionEnabled: 1
switchUseNewStyleFilepaths: 0
switchUseMicroSleepForYield: 1
+ switchEnableRamDiskSupport: 0
switchMicroSleepForYieldTime: 25
+ switchRamDiskSpaceSize: 12
ps4NPAgeRating: 12
ps4NPTitleSecret:
ps4NPTrophyPackPath:
@@ -698,10 +705,10 @@ PlayerSettings:
webGLThreadsSupport: 0
webGLDecompressionFallback: 0
scriptingDefineSymbols:
- 1: CROSS_PLATFORM_INPUT
- 4: CROSS_PLATFORM_INPUT;MOBILE_INPUT
- 7: CROSS_PLATFORM_INPUT;MOBILE_INPUT
- 14: MOBILE_INPUT
+ Android: CROSS_PLATFORM_INPUT;MOBILE_INPUT
+ Standalone: CROSS_PLATFORM_INPUT
+ Windows Store Apps: MOBILE_INPUT
+ iPhone: CROSS_PLATFORM_INPUT;MOBILE_INPUT
additionalCompilerArguments: {}
platformArchitecture: {}
scriptingBackend:
@@ -712,7 +719,6 @@ PlayerSettings:
suppressCommonWarnings: 1
allowUnsafeCode: 0
useDeterministicCompilation: 1
- useReferenceAssemblies: 1
enableRoslynAnalyzers: 1
additionalIl2CppArgs:
scriptingRuntimeVersion: 1
@@ -749,6 +755,7 @@ PlayerSettings:
metroFTAName:
metroFTAFileTypes: []
metroProtocolName:
+ vcxProjDefaultLanguage:
XboxOneProductId:
XboxOneUpdateKey:
XboxOneSandboxId:
@@ -778,7 +785,13 @@ PlayerSettings:
XboxOneOverrideIdentityPublisher:
vrEditorSettings: {}
cloudServicesEnabled:
+ Build: 0
+ Collab: 0
+ Game Performance: 0
+ Purchasing: 0
+ UDP: 0
UNet: 1
+ Unity Ads: 0
luminIcon:
m_Name:
m_ModelFolderPath:
@@ -792,11 +805,13 @@ PlayerSettings:
m_VersionName:
apiCompatibilityLevel: 6
activeInputHandler: 2
- cloudProjectId:
+ cloudProjectId: 5a4cb549-fb8e-4ef0-aa1f-028f8768fdfd
framebufferDepthMemorylessMode: 0
qualitySettingsNames: []
- projectName:
- organizationId:
+ projectName: FrameWorld
+ organizationId: o-s-r
cloudEnabled: 0
legacyClampBlendShapeWeights: 0
+ playerDataPath:
+ forceSRGBBlit: 1
virtualTexturingSupportEnabled: 0