Cleaned up the whole project

Added Copyrights
--> Version 0.7.1

.idea/misc.xml

@@ -25,7 +25,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/app.iml

@@ -122,25 +122,27 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 26 Platform (1)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-26.1.0" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement-15.0.1" level="project" />
     <orderEntry type="library" name="Gradle: __local_aars__:/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/libs/simple-xml-2.7.1.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-23.1.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-26.1.0" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-core-ui-26.1.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-15.0.1" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-26.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-15.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-26.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-base-15.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-base-15.0.1" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-fragment-26.1.0" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.core:common:1.0.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-lite-15.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-lite-15.0.1" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-media-compat-26.1.0" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:customtabs-26.1.0" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-annotations:26.1.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-gass-15.0.1" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-compat-26.1.0" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-v4-26.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-gass-15.0.0" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-identifier-15.0.1" level="project" />
   </component>

app/build.gradle

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:55 PM
+ *
+ */
+
 apply plugin: 'com.android.application'
 
 android {
@@ -9,8 +16,8 @@ android {
         applicationId 'de.frajul.endlessroll'
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode 7
+        versionCode 8
-        versionName '0.7.0'
+        versionName '0.7.1'
     }
     buildTypes {
         release {
@@ -25,7 +32,7 @@ android {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:appcompat-v7:26.1.0'
-    compile 'com.google.android.gms:play-services-ads:15.0.0'
+    compile 'com.google.android.gms:play-services-ads:15.0.1'
     compile files('libs/simple-xml-2.7.1.jar')
 }

app/build/intermediates/assets/debug/levelpacks/Grasslands.xml

@@ -1,3 +1,10 @@
+<!--
+  ~ Created by Julian Mutter on 7/10/18 3:58 PM
+  ~ Copyright (c) 2018. All rights reserved.
+  ~ Last modified 7/10/18 3:54 PM
+  ~
+  -->
+
 <levelPack id="1">
    <world>GRASSLANDS</world>
    <levels class="java.util.ArrayList">

app/build/intermediates/manifests/full/debug/AndroidManifest.xml

@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Created by Julian Mutter on 7/10/18 3:58 PM
+  ~ Copyright (c) 2018. All rights reserved.
+  ~ Last modified 7/10/18 3:54 PM
+  ~
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.frajul.endlessroll"
-    android:versionCode="7"
+    android:versionCode="8"
-    android:versionName="0.7.0" >
+    android:versionName="0.7.1" >
 
     <uses-sdk
         android:minSdkVersion="14"
@@ -12,7 +18,6 @@
         android:glEsVersion="0x00020000"
         android:required="true" />
 
-    <!-- Include required permissions for Google Mobile Ads to run -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
@@ -22,7 +27,6 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:testOnly="true"
         android:theme="@style/AppTheme" >
         <activity
             android:name="de.frajul.endlessroll.main.GameActivity"
@@ -34,7 +38,10 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <!-- Include the AdActivity and InAppPurchaseActivity configChanges and themes. -->
+
+        <meta-data
+            android:name="android.support.VERSION"
+            android:value="26.1.0" /> <!-- Include the AdActivity and InAppPurchaseActivity configChanges and themes. -->
         <activity
             android:name="com.google.android.gms.ads.AdActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
@@ -44,9 +51,6 @@
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
-        <meta-data
-            android:name="android.support.VERSION"
-            android:value="26.1.0" />
         <meta-data
             android:name="android.arch.lifecycle.VERSION"
             android:value="27.0.0-SNAPSHOT" />

app/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,65 +1,75 @@
 -- Merging decision tree log ---
 manifest
-ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12
+ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:9:1-36:12
-INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12
+INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:9:1-36:12
-INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12
+INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:9:1-36:12
-INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12
+INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:9:1-36:12
-MERGED from [com.android.support:appcompat-v7:23.1.1] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-23.1.1.aar/f70bb4f34045a4ad4687360caf0ef927/AndroidManifest.xml:17:1-24:12
+MERGED from [com.android.support:appcompat-v7:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-26.1.0.aar/18b57a22158dbf7d5801bb70e4a64a70/AndroidManifest.xml:17:1-31:12
-MERGED from [com.google.android.gms:play-services-ads:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-15.0.0.aar/7ac24a6f66d0598e2adcb13e6d71007a/AndroidManifest.xml:17:1-25:12
+MERGED from [com.google.android.gms:play-services-ads:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-15.0.1.aar/d402fb970414cb705951c82edacf8f2c/AndroidManifest.xml:17:1-25:12
+MERGED from [com.android.support:animated-vector-drawable:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-26.1.0.aar/19bf866e28c73b02829b507909c4b52d/AndroidManifest.xml:17:1-28:12
+MERGED from [com.android.support:support-vector-drawable:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-26.1.0.aar/5f7b53272b58bb3ca17d327909716a89/AndroidManifest.xml:17:1-28:12
+MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/0a428101973fd54eb7667c484618df34/AndroidManifest.xml:17:1-28:12
 MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-identifier-15.0.1.aar/ee16e1ceb133ed4e18a847b72832fd6f/AndroidManifest.xml:17:1-24:12
-MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/94e545642fe38314e8639620e7e1730b/AndroidManifest.xml:17:1-36:12
+MERGED from [com.google.android.gms:play-services-ads-lite:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.1.aar/cc42dc177470a74d9aade7dcfea0578f/AndroidManifest.xml:17:1-36:12
-MERGED from [com.google.android.gms:play-services-gass:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-gass-15.0.0.aar/7228f95980bb897adadb225cedf5e592/AndroidManifest.xml:2:1-9:12
+MERGED from [com.google.android.gms:play-services-gass:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-gass-15.0.1.aar/d79e0d5261c62585669d54378624ea0e/AndroidManifest.xml:2:1-9:12
 MERGED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/e6be48dd0b6e4917c12c50474730ff78/AndroidManifest.xml:17:1-28:12
 MERGED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/403416afa90196cce0fd49a00fa22962/AndroidManifest.xml:17:1-31:12
-MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/0a428101973fd54eb7667c484618df34/AndroidManifest.xml:17:1-28:12
-MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-base-15.0.0.aar/dfd96f823a554f14fee781bac95ef9dc/AndroidManifest.xml:17:1-24:12
 MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/aaa178100ecfc1b9d4211ee422904fab/AndroidManifest.xml:17:1-31:12
 MERGED from [com.android.support:support-fragment:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/4e9bfb3e7bd9eb8f0a1315161e1afba7/AndroidManifest.xml:17:1-31:12
 MERGED from [com.android.support:support-core-utils:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/962659bc193c74c3d8396b28d91edbd1/AndroidManifest.xml:17:1-31:12
 MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/07e5211afbefb3917a439f23e4af4190/AndroidManifest.xml:17:1-31:12
 MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/b422348bafb09bac1523beee6b873efd/AndroidManifest.xml:17:1-31:12
+MERGED from [com.google.android.gms:play-services-ads-base:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-base-15.0.1.aar/96d87658b0df801fbf9eb70a66b44253/AndroidManifest.xml:17:1-24:12
 MERGED from [android.arch.lifecycle:runtime:1.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/c7fdda8e225d8c787b9e917a4ca7f2fe/AndroidManifest.xml:17:1-30:12
-INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12
+INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:9:1-36:12
-INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12
+INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:9:1-36:12
-INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12
+INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:9:1-36:12
 	package
-		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:3:5-36
+		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:10:5-36
 		INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
 		INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
 	android:versionName
 		INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
-		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12
+		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:9:1-36:12
 		INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
 	android:versionCode
 		INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
-		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:1-28:12
+		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:9:1-36:12
 		INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
 	xmlns:android
-		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:2:11-69
+		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:9:11-69
 uses-feature#0x00020000
-ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:5:5-7:35
+ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:12:5-14:35
 	android:glEsVersion
-		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:6:9-41
+		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:13:9-41
 	android:required
-		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:7:9-32
+		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:14:9-32
+uses-permission#android.permission.INTERNET
+ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:16:5-66
+MERGED from [com.google.android.gms:play-services-ads-lite:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.1.aar/cc42dc177470a74d9aade7dcfea0578f/AndroidManifest.xml:23:5-67
+MERGED from [com.google.android.gms:play-services-ads-lite:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.1.aar/cc42dc177470a74d9aade7dcfea0578f/AndroidManifest.xml:23:5-67
+	android:name
+		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:16:22-64
 application
-ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:9:5-26:19
+ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:18:5-34:19
-MERGED from [com.android.support:appcompat-v7:23.1.1] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-23.1.1.aar/f70bb4f34045a4ad4687360caf0ef927/AndroidManifest.xml:22:5-20
+MERGED from [com.android.support:appcompat-v7:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-26.1.0.aar/18b57a22158dbf7d5801bb70e4a64a70/AndroidManifest.xml:25:5-29:19
-MERGED from [com.android.support:appcompat-v7:23.1.1] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-23.1.1.aar/f70bb4f34045a4ad4687360caf0ef927/AndroidManifest.xml:22:5-20
+MERGED from [com.android.support:appcompat-v7:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-26.1.0.aar/18b57a22158dbf7d5801bb70e4a64a70/AndroidManifest.xml:25:5-29:19
+MERGED from [com.android.support:animated-vector-drawable:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-26.1.0.aar/19bf866e28c73b02829b507909c4b52d/AndroidManifest.xml:22:5-26:19
+MERGED from [com.android.support:animated-vector-drawable:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-26.1.0.aar/19bf866e28c73b02829b507909c4b52d/AndroidManifest.xml:22:5-26:19
+MERGED from [com.android.support:support-vector-drawable:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-26.1.0.aar/5f7b53272b58bb3ca17d327909716a89/AndroidManifest.xml:22:5-26:19
+MERGED from [com.android.support:support-vector-drawable:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-26.1.0.aar/5f7b53272b58bb3ca17d327909716a89/AndroidManifest.xml:22:5-26:19
+MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/0a428101973fd54eb7667c484618df34/AndroidManifest.xml:22:5-26:19
+MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/0a428101973fd54eb7667c484618df34/AndroidManifest.xml:22:5-26:19
 MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-identifier-15.0.1.aar/ee16e1ceb133ed4e18a847b72832fd6f/AndroidManifest.xml:22:5-20
 MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-identifier-15.0.1.aar/ee16e1ceb133ed4e18a847b72832fd6f/AndroidManifest.xml:22:5-20
-MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/94e545642fe38314e8639620e7e1730b/AndroidManifest.xml:26:5-34:19
+MERGED from [com.google.android.gms:play-services-ads-lite:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.1.aar/cc42dc177470a74d9aade7dcfea0578f/AndroidManifest.xml:26:5-34:19
-MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/94e545642fe38314e8639620e7e1730b/AndroidManifest.xml:26:5-34:19
+MERGED from [com.google.android.gms:play-services-ads-lite:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.1.aar/cc42dc177470a74d9aade7dcfea0578f/AndroidManifest.xml:26:5-34:19
-MERGED from [com.google.android.gms:play-services-gass:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-gass-15.0.0.aar/7228f95980bb897adadb225cedf5e592/AndroidManifest.xml:7:5-20
+MERGED from [com.google.android.gms:play-services-gass:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-gass-15.0.1.aar/d79e0d5261c62585669d54378624ea0e/AndroidManifest.xml:7:5-20
-MERGED from [com.google.android.gms:play-services-gass:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-gass-15.0.0.aar/7228f95980bb897adadb225cedf5e592/AndroidManifest.xml:7:5-20
+MERGED from [com.google.android.gms:play-services-gass:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-gass-15.0.1.aar/d79e0d5261c62585669d54378624ea0e/AndroidManifest.xml:7:5-20
 MERGED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/e6be48dd0b6e4917c12c50474730ff78/AndroidManifest.xml:22:5-26:19
 MERGED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/e6be48dd0b6e4917c12c50474730ff78/AndroidManifest.xml:22:5-26:19
 MERGED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/403416afa90196cce0fd49a00fa22962/AndroidManifest.xml:25:5-29:19
 MERGED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/403416afa90196cce0fd49a00fa22962/AndroidManifest.xml:25:5-29:19
-MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/0a428101973fd54eb7667c484618df34/AndroidManifest.xml:22:5-26:19
-MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/0a428101973fd54eb7667c484618df34/AndroidManifest.xml:22:5-26:19
-MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-base-15.0.0.aar/dfd96f823a554f14fee781bac95ef9dc/AndroidManifest.xml:22:5-20
-MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-base-15.0.0.aar/dfd96f823a554f14fee781bac95ef9dc/AndroidManifest.xml:22:5-20
 MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/aaa178100ecfc1b9d4211ee422904fab/AndroidManifest.xml:25:5-29:19
 MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/aaa178100ecfc1b9d4211ee422904fab/AndroidManifest.xml:25:5-29:19
 MERGED from [com.android.support:support-fragment:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/4e9bfb3e7bd9eb8f0a1315161e1afba7/AndroidManifest.xml:25:5-29:19
@@ -70,58 +80,62 @@ MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/ca
 MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/07e5211afbefb3917a439f23e4af4190/AndroidManifest.xml:25:5-29:19
 MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/b422348bafb09bac1523beee6b873efd/AndroidManifest.xml:25:5-29:19
 MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/b422348bafb09bac1523beee6b873efd/AndroidManifest.xml:25:5-29:19
+MERGED from [com.google.android.gms:play-services-ads-base:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-base-15.0.1.aar/96d87658b0df801fbf9eb70a66b44253/AndroidManifest.xml:22:5-20
+MERGED from [com.google.android.gms:play-services-ads-base:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-base-15.0.1.aar/96d87658b0df801fbf9eb70a66b44253/AndroidManifest.xml:22:5-20
 MERGED from [android.arch.lifecycle:runtime:1.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/c7fdda8e225d8c787b9e917a4ca7f2fe/AndroidManifest.xml:24:5-28:19
 MERGED from [android.arch.lifecycle:runtime:1.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/c7fdda8e225d8c787b9e917a4ca7f2fe/AndroidManifest.xml:24:5-28:19
 	android:supportsRtl
-		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:13:9-35
+		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:22:9-35
 	android:label
-		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:12:9-41
+		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:21:9-41
 	android:icon
-		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:11:9-43
+		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:20:9-43
 	android:allowBackup
-		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:10:9-35
+		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:19:9-35
 	android:theme
-		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:14:9-40
+		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:23:9-40
 activity#de.frajul.endlessroll.main.GameActivity
-ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:16:9-25:20
+ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:24:9-33:20
 	android:screenOrientation
-		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:19:13-50
+		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:27:13-50
 	android:configChanges
-		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:18:13-74
+		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:26:13-74
 	android:name
-		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:17:13-46
+		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:25:13-46
 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:20:13-24:29
+ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:28:13-32:29
 action#android.intent.action.MAIN
-ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:21:17-69
+ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:29:17-69
 	android:name
-		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:21:25-66
+		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:29:25-66
 category#android.intent.category.LAUNCHER
-ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:23:17-77
+ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:31:17-77
 	android:name
-		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:23:27-74
+		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml:31:27-74
 uses-sdk
 INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml reason: use-sdk injection requested
 INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
 INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
-MERGED from [com.android.support:appcompat-v7:23.1.1] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-23.1.1.aar/f70bb4f34045a4ad4687360caf0ef927/AndroidManifest.xml:20:5-43
+MERGED from [com.android.support:appcompat-v7:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-26.1.0.aar/18b57a22158dbf7d5801bb70e4a64a70/AndroidManifest.xml:21:5-23:78
-MERGED from [com.android.support:appcompat-v7:23.1.1] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-23.1.1.aar/f70bb4f34045a4ad4687360caf0ef927/AndroidManifest.xml:20:5-43
+MERGED from [com.android.support:appcompat-v7:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-26.1.0.aar/18b57a22158dbf7d5801bb70e4a64a70/AndroidManifest.xml:21:5-23:78
-MERGED from [com.google.android.gms:play-services-ads:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-15.0.0.aar/7ac24a6f66d0598e2adcb13e6d71007a/AndroidManifest.xml:21:5-23:62
+MERGED from [com.google.android.gms:play-services-ads:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-15.0.1.aar/d402fb970414cb705951c82edacf8f2c/AndroidManifest.xml:21:5-23:62
-MERGED from [com.google.android.gms:play-services-ads:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-15.0.0.aar/7ac24a6f66d0598e2adcb13e6d71007a/AndroidManifest.xml:21:5-23:62
+MERGED from [com.google.android.gms:play-services-ads:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-15.0.1.aar/d402fb970414cb705951c82edacf8f2c/AndroidManifest.xml:21:5-23:62
+MERGED from [com.android.support:animated-vector-drawable:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-26.1.0.aar/19bf866e28c73b02829b507909c4b52d/AndroidManifest.xml:20:5-44
+MERGED from [com.android.support:animated-vector-drawable:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-26.1.0.aar/19bf866e28c73b02829b507909c4b52d/AndroidManifest.xml:20:5-44
+MERGED from [com.android.support:support-vector-drawable:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-26.1.0.aar/5f7b53272b58bb3ca17d327909716a89/AndroidManifest.xml:20:5-44
+MERGED from [com.android.support:support-vector-drawable:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-26.1.0.aar/5f7b53272b58bb3ca17d327909716a89/AndroidManifest.xml:20:5-44
+MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/0a428101973fd54eb7667c484618df34/AndroidManifest.xml:20:5-44
+MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/0a428101973fd54eb7667c484618df34/AndroidManifest.xml:20:5-44
 MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-identifier-15.0.1.aar/ee16e1ceb133ed4e18a847b72832fd6f/AndroidManifest.xml:20:5-44
 MERGED from [com.google.android.gms:play-services-ads-identifier:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-identifier-15.0.1.aar/ee16e1ceb133ed4e18a847b72832fd6f/AndroidManifest.xml:20:5-44
-MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/94e545642fe38314e8639620e7e1730b/AndroidManifest.xml:20:5-44
+MERGED from [com.google.android.gms:play-services-ads-lite:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.1.aar/cc42dc177470a74d9aade7dcfea0578f/AndroidManifest.xml:20:5-44
-MERGED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/94e545642fe38314e8639620e7e1730b/AndroidManifest.xml:20:5-44
+MERGED from [com.google.android.gms:play-services-ads-lite:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.1.aar/cc42dc177470a74d9aade7dcfea0578f/AndroidManifest.xml:20:5-44
-MERGED from [com.google.android.gms:play-services-gass:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-gass-15.0.0.aar/7228f95980bb897adadb225cedf5e592/AndroidManifest.xml:5:5-44
+MERGED from [com.google.android.gms:play-services-gass:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-gass-15.0.1.aar/d79e0d5261c62585669d54378624ea0e/AndroidManifest.xml:5:5-44
-MERGED from [com.google.android.gms:play-services-gass:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-gass-15.0.0.aar/7228f95980bb897adadb225cedf5e592/AndroidManifest.xml:5:5-44
+MERGED from [com.google.android.gms:play-services-gass:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-gass-15.0.1.aar/d79e0d5261c62585669d54378624ea0e/AndroidManifest.xml:5:5-44
 MERGED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/e6be48dd0b6e4917c12c50474730ff78/AndroidManifest.xml:20:5-44
 MERGED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/e6be48dd0b6e4917c12c50474730ff78/AndroidManifest.xml:20:5-44
 MERGED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/403416afa90196cce0fd49a00fa22962/AndroidManifest.xml:21:5-23:54
 MERGED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/403416afa90196cce0fd49a00fa22962/AndroidManifest.xml:21:5-23:54
-MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/0a428101973fd54eb7667c484618df34/AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/0a428101973fd54eb7667c484618df34/AndroidManifest.xml:20:5-44
-MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-base-15.0.0.aar/dfd96f823a554f14fee781bac95ef9dc/AndroidManifest.xml:20:5-44
-MERGED from [com.google.android.gms:play-services-ads-base:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-base-15.0.0.aar/dfd96f823a554f14fee781bac95ef9dc/AndroidManifest.xml:20:5-44
 MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/aaa178100ecfc1b9d4211ee422904fab/AndroidManifest.xml:21:5-23:63
 MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/aaa178100ecfc1b9d4211ee422904fab/AndroidManifest.xml:21:5-23:63
 MERGED from [com.android.support:support-fragment:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/4e9bfb3e7bd9eb8f0a1315161e1afba7/AndroidManifest.xml:21:5-23:60
@@ -132,12 +146,14 @@ MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/ca
 MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/07e5211afbefb3917a439f23e4af4190/AndroidManifest.xml:21:5-23:58
 MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/b422348bafb09bac1523beee6b873efd/AndroidManifest.xml:21:5-23:58
 MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/b422348bafb09bac1523beee6b873efd/AndroidManifest.xml:21:5-23:58
+MERGED from [com.google.android.gms:play-services-ads-base:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-base-15.0.1.aar/96d87658b0df801fbf9eb70a66b44253/AndroidManifest.xml:20:5-44
+MERGED from [com.google.android.gms:play-services-ads-base:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-base-15.0.1.aar/96d87658b0df801fbf9eb70a66b44253/AndroidManifest.xml:20:5-44
 MERGED from [android.arch.lifecycle:runtime:1.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/c7fdda8e225d8c787b9e917a4ca7f2fe/AndroidManifest.xml:20:5-22:41
 MERGED from [android.arch.lifecycle:runtime:1.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/c7fdda8e225d8c787b9e917a4ca7f2fe/AndroidManifest.xml:20:5-22:41
 INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
 INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
 	tools:overrideLibrary
-		ADDED from [com.google.android.gms:play-services-ads:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-15.0.0.aar/7ac24a6f66d0598e2adcb13e6d71007a/AndroidManifest.xml:23:9-59
+		ADDED from [com.android.support:appcompat-v7:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-26.1.0.aar/18b57a22158dbf7d5801bb70e4a64a70/AndroidManifest.xml:23:9-75
 	android:targetSdkVersion
 		INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
 		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
@@ -146,48 +162,50 @@ INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRo
 		INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
 		ADDED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
 		INJECTED from /mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/AndroidManifest.xml
-uses-permission#android.permission.INTERNET
+meta-data#android.support.VERSION
-ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/94e545642fe38314e8639620e7e1730b/AndroidManifest.xml:23:5-67
+ADDED from [com.android.support:appcompat-v7:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-26.1.0.aar/18b57a22158dbf7d5801bb70e4a64a70/AndroidManifest.xml:26:9-28:38
+MERGED from [com.android.support:animated-vector-drawable:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-26.1.0.aar/19bf866e28c73b02829b507909c4b52d/AndroidManifest.xml:23:9-25:38
+MERGED from [com.android.support:animated-vector-drawable:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-26.1.0.aar/19bf866e28c73b02829b507909c4b52d/AndroidManifest.xml:23:9-25:38
+MERGED from [com.android.support:support-vector-drawable:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-26.1.0.aar/5f7b53272b58bb3ca17d327909716a89/AndroidManifest.xml:23:9-25:38
+MERGED from [com.android.support:support-vector-drawable:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-26.1.0.aar/5f7b53272b58bb3ca17d327909716a89/AndroidManifest.xml:23:9-25:38
+MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/0a428101973fd54eb7667c484618df34/AndroidManifest.xml:23:9-25:38
+MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/0a428101973fd54eb7667c484618df34/AndroidManifest.xml:23:9-25:38
+MERGED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/403416afa90196cce0fd49a00fa22962/AndroidManifest.xml:26:9-28:38
+MERGED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/403416afa90196cce0fd49a00fa22962/AndroidManifest.xml:26:9-28:38
+MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/aaa178100ecfc1b9d4211ee422904fab/AndroidManifest.xml:26:9-28:38
+MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/aaa178100ecfc1b9d4211ee422904fab/AndroidManifest.xml:26:9-28:38
+MERGED from [com.android.support:support-fragment:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/4e9bfb3e7bd9eb8f0a1315161e1afba7/AndroidManifest.xml:26:9-28:38
+MERGED from [com.android.support:support-fragment:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/4e9bfb3e7bd9eb8f0a1315161e1afba7/AndroidManifest.xml:26:9-28:38
+MERGED from [com.android.support:support-core-utils:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/962659bc193c74c3d8396b28d91edbd1/AndroidManifest.xml:26:9-28:38
+MERGED from [com.android.support:support-core-utils:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/962659bc193c74c3d8396b28d91edbd1/AndroidManifest.xml:26:9-28:38
+MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/07e5211afbefb3917a439f23e4af4190/AndroidManifest.xml:26:9-28:38
+MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/07e5211afbefb3917a439f23e4af4190/AndroidManifest.xml:26:9-28:38
+MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/b422348bafb09bac1523beee6b873efd/AndroidManifest.xml:26:9-28:38
+MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/b422348bafb09bac1523beee6b873efd/AndroidManifest.xml:26:9-28:38
+	android:value
+		ADDED from [com.android.support:appcompat-v7:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-26.1.0.aar/18b57a22158dbf7d5801bb70e4a64a70/AndroidManifest.xml:28:13-35
 	android:name
-		ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/94e545642fe38314e8639620e7e1730b/AndroidManifest.xml:23:22-64
+		ADDED from [com.android.support:appcompat-v7:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/appcompat-v7-26.1.0.aar/18b57a22158dbf7d5801bb70e4a64a70/AndroidManifest.xml:27:13-51
 uses-permission#android.permission.ACCESS_NETWORK_STATE
-ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/94e545642fe38314e8639620e7e1730b/AndroidManifest.xml:24:5-79
+ADDED from [com.google.android.gms:play-services-ads-lite:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.1.aar/cc42dc177470a74d9aade7dcfea0578f/AndroidManifest.xml:24:5-79
 	android:name
-		ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/94e545642fe38314e8639620e7e1730b/AndroidManifest.xml:24:22-76
+		ADDED from [com.google.android.gms:play-services-ads-lite:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.1.aar/cc42dc177470a74d9aade7dcfea0578f/AndroidManifest.xml:24:22-76
 activity#com.google.android.gms.ads.AdActivity
-ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/94e545642fe38314e8639620e7e1730b/AndroidManifest.xml:29:9-33:64
+ADDED from [com.google.android.gms:play-services-ads-lite:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.1.aar/cc42dc177470a74d9aade7dcfea0578f/AndroidManifest.xml:29:9-33:64
 	android:exported
-		ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/94e545642fe38314e8639620e7e1730b/AndroidManifest.xml:32:13-37
+		ADDED from [com.google.android.gms:play-services-ads-lite:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.1.aar/cc42dc177470a74d9aade7dcfea0578f/AndroidManifest.xml:32:13-37
 	android:configChanges
-		ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/94e545642fe38314e8639620e7e1730b/AndroidManifest.xml:31:13-122
+		ADDED from [com.google.android.gms:play-services-ads-lite:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.1.aar/cc42dc177470a74d9aade7dcfea0578f/AndroidManifest.xml:31:13-122
 	android:theme
-		ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/94e545642fe38314e8639620e7e1730b/AndroidManifest.xml:33:13-61
+		ADDED from [com.google.android.gms:play-services-ads-lite:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.1.aar/cc42dc177470a74d9aade7dcfea0578f/AndroidManifest.xml:33:13-61
 	android:name
-		ADDED from [com.google.android.gms:play-services-ads-lite:15.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.0.aar/94e545642fe38314e8639620e7e1730b/AndroidManifest.xml:30:13-65
+		ADDED from [com.google.android.gms:play-services-ads-lite:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-ads-lite-15.0.1.aar/cc42dc177470a74d9aade7dcfea0578f/AndroidManifest.xml:30:13-65
 meta-data#com.google.android.gms.version
 ADDED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/e6be48dd0b6e4917c12c50474730ff78/AndroidManifest.xml:23:9-25:69
 	android:value
 		ADDED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/e6be48dd0b6e4917c12c50474730ff78/AndroidManifest.xml:25:13-66
 	android:name
 		ADDED from [com.google.android.gms:play-services-basement:15.0.1] /home/julian/.gradle/caches/transforms-1/files-1.1/play-services-basement-15.0.1.aar/e6be48dd0b6e4917c12c50474730ff78/AndroidManifest.xml:24:13-58
-meta-data#android.support.VERSION
-ADDED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/403416afa90196cce0fd49a00fa22962/AndroidManifest.xml:26:9-28:38
-MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/0a428101973fd54eb7667c484618df34/AndroidManifest.xml:23:9-25:38
-MERGED from [com.android.support:customtabs:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/customtabs-26.1.0.aar/0a428101973fd54eb7667c484618df34/AndroidManifest.xml:23:9-25:38
-MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/aaa178100ecfc1b9d4211ee422904fab/AndroidManifest.xml:26:9-28:38
-MERGED from [com.android.support:support-media-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/aaa178100ecfc1b9d4211ee422904fab/AndroidManifest.xml:26:9-28:38
-MERGED from [com.android.support:support-fragment:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/4e9bfb3e7bd9eb8f0a1315161e1afba7/AndroidManifest.xml:26:9-28:38
-MERGED from [com.android.support:support-fragment:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-fragment-26.1.0.aar/4e9bfb3e7bd9eb8f0a1315161e1afba7/AndroidManifest.xml:26:9-28:38
-MERGED from [com.android.support:support-core-utils:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/962659bc193c74c3d8396b28d91edbd1/AndroidManifest.xml:26:9-28:38
-MERGED from [com.android.support:support-core-utils:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-utils-26.1.0.aar/962659bc193c74c3d8396b28d91edbd1/AndroidManifest.xml:26:9-28:38
-MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/07e5211afbefb3917a439f23e4af4190/AndroidManifest.xml:26:9-28:38
-MERGED from [com.android.support:support-core-ui:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-core-ui-26.1.0.aar/07e5211afbefb3917a439f23e4af4190/AndroidManifest.xml:26:9-28:38
-MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/b422348bafb09bac1523beee6b873efd/AndroidManifest.xml:26:9-28:38
-MERGED from [com.android.support:support-compat:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-compat-26.1.0.aar/b422348bafb09bac1523beee6b873efd/AndroidManifest.xml:26:9-28:38
-	android:value
-		ADDED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/403416afa90196cce0fd49a00fa22962/AndroidManifest.xml:28:13-35
-	android:name
-		ADDED from [com.android.support:support-v4:26.1.0] /home/julian/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/403416afa90196cce0fd49a00fa22962/AndroidManifest.xml:27:13-51
 meta-data#android.arch.lifecycle.VERSION
 ADDED from [android.arch.lifecycle:runtime:1.0.0] /home/julian/.gradle/caches/transforms-1/files-1.1/runtime-1.0.0.aar/c7fdda8e225d8c787b9e917a4ca7f2fe/AndroidManifest.xml:25:9-27:47
 	android:value

app/src/androidTest/java/de/frajul/endlessroll/ApplicationTest.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll;
 
 import android.app.Application;

app/src/main/AndroidManifest.xml

@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Created by Julian Mutter on 7/10/18 3:58 PM
+  ~ Copyright (c) 2018. All rights reserved.
+  ~ Last modified 7/10/18 3:54 PM
+  ~
+  -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.frajul.endlessroll">
 
@@ -6,13 +13,14 @@
         android:glEsVersion="0x00020000"
         android:required="true" />
 
+    <uses-permission android:name="android.permission.INTERNET"/>
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-
         <activity
             android:name=".main.GameActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
@@ -25,4 +33,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>

app/src/main/assets/levelpacks/Grasslands.xml

@@ -1,3 +1,10 @@
+<!--
+  ~ Created by Julian Mutter on 7/10/18 3:58 PM
+  ~ Copyright (c) 2018. All rights reserved.
+  ~ Last modified 7/10/18 3:54 PM
+  ~
+  -->
+
 <levelPack id="1">
    <world>GRASSLANDS</world>
    <levels class="java.util.ArrayList">

app/src/main/assets/levelpacks/Icy Mountains.xml

@@ -1,3 +1,10 @@
+<!--
+  ~ Created by Julian Mutter on 7/10/18 3:58 PM
+  ~ Copyright (c) 2018. All rights reserved.
+  ~ Last modified 7/10/18 3:54 PM
+  ~
+  -->
+
 <levelPack id="2">
    <world>ICY_MOUNTAINS</world>
    <levels class="java.util.ArrayList">

app/src/main/java/de/frajul/endlessroll/data/Color3f.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.data;
 
 /**

app/src/main/java/de/frajul/endlessroll/data/Color4f.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.data;
 
 /**

app/src/main/java/de/frajul/endlessroll/data/SynchronizedArrayList.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.data;
 
 import java.util.ArrayList;

app/src/main/java/de/frajul/endlessroll/data/Vector.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.data;
 
 /**
@@ -24,10 +31,9 @@ public class Vector {
         return "Vector(" + x + ", " + y + ")";
     }
 
-    public Vector set(float x, float y) {
+    public void set(float x, float y) {
         this.x = x;
         this.y = y;
-        return this;
     }
 
     public float length() {
@@ -53,7 +59,7 @@ public class Vector {
         return this;
     }
 
-    public Vector abs(){
+    public Vector abs() {
         this.x = Math.abs(x);
         this.y = Math.abs(y);
         return this;

app/src/main/java/de/frajul/endlessroll/entities/AnimatedEntity.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities;
 
 import de.frajul.endlessroll.data.Vector;
@@ -17,7 +24,7 @@ public class AnimatedEntity extends Entity {
         animation = new Animation();
     }
 
-    public void update(Timer timer){
+    public void update(Timer timer) {
         animation.update(timer);
         super.setTextureAtlasIndex(animation.getCurrentTexIndex());
     }

app/src/main/java/de/frajul/endlessroll/entities/Animation.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities;
 
 import de.frajul.endlessroll.main.game.Timer;
@@ -15,7 +22,7 @@ public class Animation {
     private boolean stillRunning = true;
     private long lastSwitchTime = -1;
 
-    public void disable(){
+    public void disable() {
         stillRunning = false;
     }
 

app/src/main/java/de/frajul/endlessroll/entities/Background.java

@@ -1,10 +1,16 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import de.frajul.endlessroll.data.Vector;
 import de.frajul.endlessroll.entities.textures.Texture;
 
 /**
@@ -29,16 +35,16 @@ public class Background {
     }
 
     public void move(float playerMoveX, float cameraX) {
-        synchronized (layers){
+        synchronized (layers) {
-            for(BackgroundLayer layer : layers){
+            for (BackgroundLayer layer : layers) {
                 layer.move(playerMoveX, cameraX);
             }
         }
     }
 
     public void resetPosition() {
-        synchronized (layers){
+        synchronized (layers) {
-            for(BackgroundLayer layer : layers)
+            for (BackgroundLayer layer : layers)
                 layer.resetPosition();
         }
     }

app/src/main/java/de/frajul/endlessroll/entities/BackgroundLayer.java

@@ -1,6 +1,11 @@
-package de.frajul.endlessroll.entities;
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
 
-import java.util.List;
+package de.frajul.endlessroll.entities;
 
 import de.frajul.endlessroll.data.SynchronizedArrayList;
 import de.frajul.endlessroll.data.Vector;

app/src/main/java/de/frajul/endlessroll/entities/DestroyEffect.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities;
 
 import android.support.annotation.Nullable;

app/src/main/java/de/frajul/endlessroll/entities/Entity.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities;
 
 import de.frajul.endlessroll.data.Vector;

app/src/main/java/de/frajul/endlessroll/entities/Goal.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities;
 
 import de.frajul.endlessroll.data.Vector;

app/src/main/java/de/frajul/endlessroll/entities/Obstacle.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities;
 
 import de.frajul.endlessroll.data.Vector;

app/src/main/java/de/frajul/endlessroll/entities/Player.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities;
 
 import java.util.ArrayList;
@@ -15,7 +22,6 @@ import de.frajul.endlessroll.main.game.Timer;
  */
 public class Player extends Entity {
 
-    private final float ROTATION_SPEED = -400;
     public final float RADIUS = 0.1f;
     private final float START_X = -0.9f;
     private final float SPEED = 0.002f;
@@ -39,10 +45,6 @@ public class Player extends Entity {
         super.setHeight(RADIUS * 2);
     }
 
-    public void reset(){
-
-    }
-
     public void startSuperPower(long duration) {
         this.superPowerDuration = duration;
         currentSuperPowerDuration = 0;
@@ -104,7 +106,11 @@ public class Player extends Entity {
         forces.clear();
     }
 
-    public float getProgress() {
+    public float getProgress(float goalX) {
+        return (getPosition().x - START_X) / (goalX - START_X);
+    }
+
+    public float getXFromStart(){
         return getPosition().x - START_X;
     }
 

app/src/main/java/de/frajul/endlessroll/entities/Vertex.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities;
 
 import de.frajul.endlessroll.main.GameLog;

app/src/main/java/de/frajul/endlessroll/entities/collectables/Collectables.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.collectables;
 
 import java.util.ArrayList;
@@ -34,7 +41,7 @@ public class Collectables extends SynchronizedArrayList<Entity> {
 
     @Override
     public synchronized boolean remove(Object object) {
-        if(object instanceof Star)
+        if (object instanceof Star)
             stars.remove(object);
         else
             energy = null;

app/src/main/java/de/frajul/endlessroll/entities/collectables/Energy.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.collectables;
 
 import de.frajul.endlessroll.data.Vector;

app/src/main/java/de/frajul/endlessroll/entities/collectables/Star.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.collectables;
 
 import de.frajul.endlessroll.data.Vector;

app/src/main/java/de/frajul/endlessroll/entities/collision/CircleTriangleCollisionDetector.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.collision;
 
 import de.frajul.endlessroll.data.Vector;
@@ -16,9 +23,7 @@ public class CircleTriangleCollisionDetector {
         if (circleCenterInsideTriangle(circle, triangle))
             return true;
 
-        if (circleIntersectingWithTriangleEdges(circle, triangle))
+        return circleIntersectingWithTriangleEdges(circle, triangle);
-            return true;
-        return false;
     }
 
     private boolean circleIntersectingWithTriangleEdges(Circle circle, Triangle triangle) {
@@ -42,8 +47,7 @@ public class CircleTriangleCollisionDetector {
             k = k / length;
 
             if (k < length)
-                if (Math.sqrt(vertexToCenter.x * vertexToCenter.x + vertexToCenter.y * vertexToCenter.y - k * k) <= circle.getRadius())
+                return Math.sqrt(vertexToCenter.x * vertexToCenter.x + vertexToCenter.y * vertexToCenter.y - k * k) <= circle.getRadius();
-                    return true;
         }
         return false;
     }

app/src/main/java/de/frajul/endlessroll/entities/collision/CollisionDetector.java

@@ -1,8 +1,14 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.collision;
 
 import de.frajul.endlessroll.data.Vector;
 import de.frajul.endlessroll.entities.Entity;
-import de.frajul.endlessroll.entities.Obstacle;
 import de.frajul.endlessroll.entities.Player;
 import de.frajul.endlessroll.entities.collision.collisionData.EntityCollisionData;
 import de.frajul.endlessroll.entities.collision.geometry.Circle;
@@ -52,9 +58,7 @@ public class CollisionDetector {
 
     public boolean isPointInQuad(Vector point, Quad quad) {
         if (point.getX() >= quad.getLeftEdge() && point.getX() <= quad.getRightEdge()) {
-            if (point.getY() >= quad.getBottomEdge() && point.getY() <= quad.getTopEdge()) {
+            return point.getY() >= quad.getBottomEdge() && point.getY() <= quad.getTopEdge();
-                return true;
-            }
         }
         return false;
     }
@@ -95,9 +99,7 @@ public class CollisionDetector {
         float yDistance = Math.abs(q2.getPosition().y - q1.getPosition().y);
         if (xDistance >= q1.getWidth() / 2 + q2.getWidth() / 2)
             return false;
-        if (yDistance >= q1.getHeight() / 2 + q2.getHeight() / 2)
+        return !(yDistance >= q1.getHeight() / 2 + q2.getHeight() / 2);
-            return false;
-        return true;
     }
 
     public boolean isTriangleTriangleCollision(Triangle triangle1, Triangle triangle2) {
@@ -117,9 +119,7 @@ public class CollisionDetector {
         if (triangle2Vertex2InTriangle1)
             return true;
         boolean triangle2Vertex3InTriangle1 = isVertexInTriangle(triangle2.getBottomLeftVertex(), triangle1);
-        if (triangle2Vertex3InTriangle1)
+        return triangle2Vertex3InTriangle1;
-            return true;
-        return false;
     }
 
     public boolean isQuadTriangleCollision(Quad quad, Triangle triangle) {
@@ -148,9 +148,7 @@ public class CollisionDetector {
         boolean triangleVertex3InQuad = isPointInQuad(triangle.getBottomLeftVertex(), quad);
         if (triangleVertex3InQuad)
             return true;
-        if (triangle.getTopEdge() >= quad.getTopEdge() && triangle.getBottomEdge() <= quad.getBottomEdge() && ((triangle.getLeftEdge() <= quad.getRightEdge() && triangle.getLeftEdge() >= quad.getLeftEdge()) || (triangle.getRightEdge() <= quad.getRightEdge() && triangle.getRightEdge() >= quad.getLeftEdge())))
+        return triangle.getTopEdge() >= quad.getTopEdge() && triangle.getBottomEdge() <= quad.getBottomEdge() && ((triangle.getLeftEdge() <= quad.getRightEdge() && triangle.getLeftEdge() >= quad.getLeftEdge()) || (triangle.getRightEdge() <= quad.getRightEdge() && triangle.getRightEdge() >= quad.getLeftEdge()));
-            return true;
-        return false;
     }
 
     private boolean isVertexInTriangle(Vector vertex, Triangle triangle) {

app/src/main/java/de/frajul/endlessroll/entities/collision/CollisionManager.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.collision;
 
 import de.frajul.endlessroll.entities.DestroyEffect;

app/src/main/java/de/frajul/endlessroll/entities/collision/Edge.java

@@ -1,5 +1,12 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.collision;
 
 public enum Edge {
-    LEFT, RIGHT, TOP, BOTTOM, NONE;
+    LEFT, RIGHT, TOP, BOTTOM, NONE
 }

app/src/main/java/de/frajul/endlessroll/entities/collision/collisionData/EntityCollisionData.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.collision.collisionData;
 
 import de.frajul.endlessroll.entities.Entity;

app/src/main/java/de/frajul/endlessroll/entities/collision/collisionData/ObstacleCollisionData.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.collision.collisionData;
 
 import java.util.List;

app/src/main/java/de/frajul/endlessroll/entities/collision/collisionData/PlayerCollisionData.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.collision.collisionData;
 
 /**

app/src/main/java/de/frajul/endlessroll/entities/collision/collisionData/ToolCollisionData.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.collision.collisionData;
 
 import java.util.List;

app/src/main/java/de/frajul/endlessroll/entities/collision/geometry/Circle.java

@@ -1,8 +1,14 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.collision.geometry;
 
 import de.frajul.endlessroll.data.Vector;
 import de.frajul.endlessroll.entities.Player;
-import de.frajul.endlessroll.entities.collision.CollisionDetector;
 
 /**
  * Created by Julian on 01.12.2015.

app/src/main/java/de/frajul/endlessroll/entities/collision/geometry/Geometry.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.collision.geometry;
 
 /**

app/src/main/java/de/frajul/endlessroll/entities/collision/geometry/Quad.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.collision.geometry;
 
 import de.frajul.endlessroll.data.Vector;

app/src/main/java/de/frajul/endlessroll/entities/collision/geometry/Triangle.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.collision.geometry;
 
 import de.frajul.endlessroll.data.Vector;

app/src/main/java/de/frajul/endlessroll/entities/guis/Countdown.java

@@ -1,9 +1,15 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.guis;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import de.frajul.endlessroll.data.Vector;
-import de.frajul.endlessroll.entities.Entity;
 import de.frajul.endlessroll.entities.textures.Texture;
 import de.frajul.endlessroll.entities.textures.TexturePack;
 import de.frajul.endlessroll.main.game.Game;

app/src/main/java/de/frajul/endlessroll/entities/guis/Gui.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.guis;
 
 import de.frajul.endlessroll.data.Color4f;

app/src/main/java/de/frajul/endlessroll/entities/guis/Progressbar.java

@@ -1,8 +1,14 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.guis;
 
 import de.frajul.endlessroll.data.Vector;
 import de.frajul.endlessroll.entities.textures.Texture;
-import de.frajul.endlessroll.main.GameLog;
 
 public class Progressbar extends Gui {
 
@@ -14,13 +20,13 @@ public class Progressbar extends Gui {
         this.maxTime = maxTime;
     }
 
-    public void update(float frameTime){
+    public void update(float frameTime) {
         progress += frameTime / maxTime;
         if (progress >= 1f)
             progress = 1f;
     }
 
-    public boolean hasFinished(){
+    public boolean hasFinished() {
         return progress == 1;
     }
 

app/src/main/java/de/frajul/endlessroll/entities/guis/ToolButton.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.guis;
 
 import java.util.concurrent.atomic.AtomicBoolean;

app/src/main/java/de/frajul/endlessroll/entities/guis/ToolButtonAnimationLayer.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.guis;
 
 import de.frajul.endlessroll.data.Vector;

app/src/main/java/de/frajul/endlessroll/entities/guis/ToolButtonBar.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.guis;
 
 import java.util.ArrayList;

app/src/main/java/de/frajul/endlessroll/entities/particles/Firework.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.particles;
 
 import java.util.Random;

app/src/main/java/de/frajul/endlessroll/entities/particles/Particle.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.particles;
 
 import java.util.Random;

app/src/main/java/de/frajul/endlessroll/entities/particles/ParticleData.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.particles;
 
 import de.frajul.endlessroll.entities.particles.attributes.attributeValues.Range;

app/src/main/java/de/frajul/endlessroll/entities/particles/ParticleEffect.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.particles;
 
 import java.util.ArrayList;
@@ -59,7 +66,7 @@ public class ParticleEffect {
     }
 
     public ParticleData createParticleData() {
-        return new ParticleData(life.getRange(), scale, velocity, angle, rotation, transparency, tint, wind , gravity);
+        return new ParticleData(life.getRange(), scale, velocity, angle, rotation, transparency, tint, wind, gravity);
     }
 
     public Random getRandom() {

app/src/main/java/de/frajul/endlessroll/entities/particles/ParticleReader.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.particles;
 
 import android.content.Context;

app/src/main/java/de/frajul/endlessroll/entities/particles/ParticleSource.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.particles;
 
 import java.util.ArrayList;
@@ -128,7 +135,7 @@ public class ParticleSource {
         setUpParticle(new Vector(position).translate(xOff, yOff));
     }
 
-    private Particle setUpParticle(Vector position) {
+    private void setUpParticle(Vector position) {
         Particle particle;
         if (inactiveParticles.size() > 0)
             particle = inactiveParticles.remove(0);
@@ -140,7 +147,6 @@ public class ParticleSource {
         activeParticleLock.lock();
         activeParticles.add(particle);
         activeParticleLock.unlock();
-        return particle;
     }
 
     private float calcEmittPause() {

app/src/main/java/de/frajul/endlessroll/entities/particles/ParticleSystem.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.particles;
 
 import android.content.Context;
@@ -39,7 +46,7 @@ public class ParticleSystem {
         superPower = reader.read("particleEffects/superPower.pe");
         snow = reader.read("particleEffects/snow.pe");
 
-        effects = new ParticleEffect[]{stasis, testFire,colorChange, explosion, magnet, starCollect, energyCollect, firework, superPower, snow};
+        effects = new ParticleEffect[]{stasis, testFire, colorChange, explosion, magnet, starCollect, energyCollect, firework, superPower, snow};
     }
 
     public void update(Timer timer) {

app/src/main/java/de/frajul/endlessroll/entities/particles/attributes/Attribute.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.particles.attributes;
 
 import java.util.ArrayList;

app/src/main/java/de/frajul/endlessroll/entities/particles/attributes/AttributeValueReader.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.particles.attributes;
 
 import de.frajul.endlessroll.entities.particles.attributes.attributeValues.ImagePath;
@@ -55,21 +62,21 @@ public class AttributeValueReader {
             ((ImagePath) attribute.get(ParticleAttributeValueType.IMAGE_PATH)).setImagePath(line);
     }
 
-    private int parseTimeLineIndex(String start, String line) throws Exception {
+    private int parseTimeLineIndex(String start, String line) {
         String asString = line.split(start)[1].split(":")[0];
         return Integer.parseInt(asString);
     }
 
-    private float parseFloat(String line) throws Exception {
+    private float parseFloat(String line) {
         String asString = line.split(" ")[1];
         return Float.parseFloat(asString);
     }
 
-    private String parseString(String line) throws Exception {
+    private String parseString(String line) {
         return line.split(" ")[1];
     }
 
-    private boolean parseBoolean(String line) throws Exception {
+    private boolean parseBoolean(String line) {
         String asString = line.split(" ")[1];
         return Boolean.parseBoolean(asString);
     }

app/src/main/java/de/frajul/endlessroll/entities/particles/attributes/ParticleAttributeType.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.particles.attributes;
 
 import de.frajul.endlessroll.entities.particles.attributes.attributeValues.ParticleAttributeValueType;

app/src/main/java/de/frajul/endlessroll/entities/particles/attributes/attributeValues/ImagePath.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
 
 /**

app/src/main/java/de/frajul/endlessroll/entities/particles/attributes/attributeValues/Options.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
 
 /**

app/src/main/java/de/frajul/endlessroll/entities/particles/attributes/attributeValues/ParticleAttributeValue.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
 
 /**

app/src/main/java/de/frajul/endlessroll/entities/particles/attributes/attributeValues/ParticleAttributeValueType.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
 
 /**

app/src/main/java/de/frajul/endlessroll/entities/particles/attributes/attributeValues/Range.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
 
 import java.util.Random;

app/src/main/java/de/frajul/endlessroll/entities/particles/attributes/attributeValues/SpawnShape.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
 
 /**

app/src/main/java/de/frajul/endlessroll/entities/particles/attributes/attributeValues/Timeline.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
 
 import java.util.ArrayList;

app/src/main/java/de/frajul/endlessroll/entities/particles/attributes/attributeValues/TimelinePoint.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
 
 public class TimelinePoint {

app/src/main/java/de/frajul/endlessroll/entities/particles/attributes/attributeValues/TimelineRange.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
 
 /**

app/src/main/java/de/frajul/endlessroll/entities/particles/attributes/attributeValues/TintTimeline.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
 
 import java.util.ArrayList;
@@ -47,7 +54,7 @@ public class TintTimeline extends ParticleAttributeValue {
                 float leftMultiplier = leftDist / totalDist;
                 float rightMultiplier = rightDist / totalDist;
 
-                return left.getColor().interpolate(leftMultiplier,rightMultiplier, right.getColor());
+                return left.getColor().interpolate(leftMultiplier, rightMultiplier, right.getColor());
             }
             return left.getColor();
         }

app/src/main/java/de/frajul/endlessroll/entities/particles/attributes/attributeValues/TintTimelinePoint.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
 
 import de.frajul.endlessroll.data.Color3f;

app/src/main/java/de/frajul/endlessroll/entities/shapes/CollectEnergyTask.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.shapes;
 
 import android.content.Context;

app/src/main/java/de/frajul/endlessroll/entities/shapes/CollectStarTask.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.shapes;
 
 import android.content.Context;

app/src/main/java/de/frajul/endlessroll/entities/shapes/CompleteWorldTask.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.shapes;
 
 import android.content.Context;

app/src/main/java/de/frajul/endlessroll/entities/shapes/EmptyTask.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.shapes;
 
 import android.content.Context;
@@ -9,7 +16,7 @@ import de.frajul.endlessroll.levels.LevelManager;
  * Created by Julian on 30.10.2017.
  */
 
-public class EmptyTask extends Task{
+public class EmptyTask extends Task {
 
     public EmptyTask() {
         super(0);

app/src/main/java/de/frajul/endlessroll/entities/shapes/PlayerShape.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.shapes;
 
 import android.support.annotation.DrawableRes;

app/src/main/java/de/frajul/endlessroll/entities/shapes/PlayerShapeButtonOnClickListener.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.shapes;
 
 import de.frajul.endlessroll.views.PlayerShapeButton;
@@ -8,6 +15,6 @@ import de.frajul.endlessroll.views.PlayerShapeButton;
 
 public interface PlayerShapeButtonOnClickListener {
 
-    public void onClick(PlayerShapeButton button);
+    void onClick(PlayerShapeButton button);
 
 }

app/src/main/java/de/frajul/endlessroll/entities/shapes/Task.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.shapes;
 
 import android.content.Context;
@@ -17,7 +24,7 @@ public abstract class Task {
         this.condition = condition;
     }
 
-    public void update(LevelManager levelManager){
+    public void update(LevelManager levelManager) {
         conditionFulfilled = checkConditionFulfilled(levelManager);
     }
 

app/src/main/java/de/frajul/endlessroll/entities/textures/Texture.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.textures;
 
 /**

app/src/main/java/de/frajul/endlessroll/entities/textures/TextureLoader.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.textures;
 
 import android.content.Context;

app/src/main/java/de/frajul/endlessroll/entities/textures/TexturePack.java

@@ -1,7 +1,13 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.textures;
 
 import android.content.Context;
-import android.opengl.GLES20;
 import android.support.annotation.DrawableRes;
 
 import de.frajul.endlessroll.R;

app/src/main/java/de/frajul/endlessroll/entities/tileLists/Ceiling.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.tileLists;
 
 import de.frajul.endlessroll.entities.textures.Texture;

app/src/main/java/de/frajul/endlessroll/entities/tileLists/Terrain.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.tileLists;
 
 import de.frajul.endlessroll.entities.textures.Texture;

app/src/main/java/de/frajul/endlessroll/entities/tileLists/Tile.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.tileLists;
 
 import de.frajul.endlessroll.data.Vector;

app/src/main/java/de/frajul/endlessroll/entities/tileLists/TileList.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.tileLists;
 
 import java.util.ArrayList;
@@ -53,7 +60,7 @@ public class TileList extends SynchronizedArrayList<Tile> {
             float leftEdge = data.getX() - data.getWidth() / 2;
             float rightEdge = data.getX() + data.getWidth() / 2;
             if (Math.abs(lastRightEdge - leftEdge) < 0.1f)
-                GameLog.i("!!! Too small gap found !!! " + toMeters(lastRightEdge) + "m; " + lastRightEdge + "-"+leftEdge+"; iRight="+tileData.indexOf(data));
+                GameLog.i("!!! Too small gap found !!! " + toMeters(lastRightEdge) + "m; " + lastRightEdge + "-" + leftEdge + "; iRight=" + tileData.indexOf(data));
             lastRightEdge = rightEdge;
             super.add(new Tile(type, texture, edge, data));
         }

app/src/main/java/de/frajul/endlessroll/entities/tools/Bomb.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.tools;
 
 import de.frajul.endlessroll.data.Vector;
@@ -33,7 +40,7 @@ public class Bomb extends Tool {
         delta += timer.getFrameTimeMilliseconds();
         int currentExplosionState = Math.min((int) (delta / (explosionDuration / 3f)), 3);
         if (attachedObstacle != null) {
-            if(attachedObstacle.isMoving())
+            if (attachedObstacle.isMoving())
                 super.setPosition(new Vector(attachedObstacle.getPosition()).translate(offsetToObstaclePosition));
             attachedObstacle.setBombExplosionState(currentExplosionState);
         }

app/src/main/java/de/frajul/endlessroll/entities/tools/Magnet.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.tools;
 
 import de.frajul.endlessroll.data.Vector;

app/src/main/java/de/frajul/endlessroll/entities/tools/PowerMushroom.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.tools;
 
 import de.frajul.endlessroll.data.Vector;

app/src/main/java/de/frajul/endlessroll/entities/tools/Ramp.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.tools;
 
 import de.frajul.endlessroll.data.Vector;

app/src/main/java/de/frajul/endlessroll/entities/tools/Spring.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.tools;
 
 import de.frajul.endlessroll.data.Vector;
@@ -17,7 +24,7 @@ public class Spring extends Tool {
 
     public Spring(Vector position, SoundManager soundManager) {
         super(ToolType.SPRING, position, .3f, .35f, true, true);
-        animation.setIndexSequence(new int[]{1,3,3,1});
+        animation.setIndexSequence(new int[]{1, 3, 3, 1});
         animation.setRequiredDelta(80);
         this.soundManager = soundManager;
     }

app/src/main/java/de/frajul/endlessroll/entities/tools/Stasis.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.tools;
 
 import de.frajul.endlessroll.data.Vector;

app/src/main/java/de/frajul/endlessroll/entities/tools/Tool.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.tools;
 
 import de.frajul.endlessroll.data.Vector;

app/src/main/java/de/frajul/endlessroll/entities/tools/ToolSlot.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.tools;
 
 import de.frajul.endlessroll.R;
@@ -22,7 +29,7 @@ public class ToolSlot {
     public int getDrawable() {
         if (locked)
             return R.drawable.tools_button_locked;
-        else if(toolType != null)
+        else if (toolType != null)
             return toolType.getButtonDrawable();
         else
             return R.drawable.tools_button_empty;

app/src/main/java/de/frajul/endlessroll/entities/tools/ToolType.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.tools;
 
 import android.support.annotation.Nullable;

app/src/main/java/de/frajul/endlessroll/entities/tools/ToolUpgrade.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.tools;
 
 /**

app/src/main/java/de/frajul/endlessroll/entities/tools/ToolUpgradeType.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.entities.tools;
 
 /**
@@ -6,6 +13,6 @@ package de.frajul.endlessroll.entities.tools;
 
 public enum ToolUpgradeType {
 
-    COOLDOWN, DURATION, FORCE, SIZE;
+    COOLDOWN, DURATION, FORCE, SIZE
 
 }

app/src/main/java/de/frajul/endlessroll/levels/Gap.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.levels;
 
 import org.simpleframework.xml.Attribute;

app/src/main/java/de/frajul/endlessroll/levels/Level.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.levels;
 
 import org.simpleframework.xml.Attribute;

app/src/main/java/de/frajul/endlessroll/levels/LevelManager.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.levels;
 
 import android.content.Context;

app/src/main/java/de/frajul/endlessroll/levels/LevelPack.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.levels;
 
 import org.simpleframework.xml.Attribute;

app/src/main/java/de/frajul/endlessroll/levels/MoveComponent.java

@@ -1,3 +1,10 @@
+/*
+ * Created by Julian Mutter on 7/10/18 3:58 PM
+ * Copyright (c) 2018. All rights reserved.
+ * Last modified 7/10/18 3:54 PM
+ *
+ */
+
 package de.frajul.endlessroll.levels;
 
 import org.simpleframework.xml.Attribute;