julian/EndlessRoll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

-> Version 0.7.0

Browse Source
This commit is contained in:
julian 2018-07-01 17:37:48 +02:00
parent b7cab6f453
commit 607e9fef05
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/app.iml
View File

@ -120,7 +120,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform (1)" jdkType="Android SDK" />
<orderEntry type="jdk" jdkName="Android API 26 Platform (1)" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<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" />

8
app/build.gradle
View File

@ -3,14 +3,14 @@ apply plugin: 'com.android.application'
android {
signingConfigs {
}
compileSdkVersion 23
compileSdkVersion 26
buildToolsVersion '27.0.3'
defaultConfig {
applicationId 'de.frajul.endlessroll'
minSdkVersion 14
targetSdkVersion 23
versionCode 6
versionName '0.6.0'
targetSdkVersion 26
versionCode 7
versionName '0.7.0'
}
buildTypes {
release {

2
app/build/intermediates/incremental/mergeDebugResources/merger.xml
View File

File diff suppressed because one or more lines are too long

6
app/build/intermediates/manifests/full/debug/AndroidManifest.xml
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.frajul.endlessroll"
android:versionCode="6"
android:versionName="0.6.0" >
android:versionCode="7"
android:versionName="0.7.0" >
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="23" />
android:targetSdkVersion="26" />
<uses-feature
android:glEsVersion="0x00020000"

12
app/src/main/java/de/frajul/endlessroll/levels/worlds/World.java
View File

@ -20,12 +20,12 @@ public enum World {
R.drawable.terrain_c_grass, R.drawable.obstacles_grass,
R.drawable.backgrounds_game_grass),
ICY_MOUNTAINS(R.drawable.world_previews_icymountains, R.drawable.terrain_t_ice,
R.drawable.terrain_c_ice, R.drawable.obstacles_snow, R.drawable.backgrounds_game_snow),
TEST_WORLD_GRASS(R.drawable.world_previews_grasslands, R.drawable.terrain_t_grass,
R.drawable.terrain_c_grass, R.drawable.juri_obstacles_grass,
R.drawable.backgrounds_game_grass, R.drawable.juri_background_game_grass_2, R.drawable.juri_background_game_grass_3),
TEST_WORLD_SNOW(R.drawable.world_previews_icymountains, R.drawable.terrain_t_ice,
R.drawable.terrain_c_ice, R.drawable.obstacles_snow, R.drawable.backgrounds_game_snow, R.drawable.juri_background_game_snow_2, R.drawable.juri_background_game_snow_3);
R.drawable.terrain_c_ice, R.drawable.obstacles_snow, R.drawable.backgrounds_game_snow);
// TEST_WORLD_GRASS(R.drawable.world_previews_grasslands, R.drawable.terrain_t_grass,
// R.drawable.terrain_c_grass, R.drawable.juri_obstacles_grass,
// R.drawable.backgrounds_game_grass, R.drawable.juri_background_game_grass_2, R.drawable.juri_background_game_grass_3),
// TEST_WORLD_SNOW(R.drawable.world_previews_icymountains, R.drawable.terrain_t_ice,
// R.drawable.terrain_c_ice, R.drawable.obstacles_snow, R.drawable.backgrounds_game_snow, R.drawable.juri_background_game_snow_2, R.drawable.juri_background_game_snow_3);
@DrawableRes
private int previewId;

8
app/src/main/res/layout/start_screen.xml
View File

@ -27,7 +27,7 @@
android:layout_marginLeft="10dp"
android:layout_marginTop="2dp"
android:text="@string/start_screen_unlock_all_levels"
android:visibility="visible"/>
android:visibility="invisible"/>
<Button
android:id="@+id/startscreen_gain_90_ep"
@ -41,7 +41,7 @@
android:layout_marginLeft="10dp"
android:layout_marginTop="2dp"
android:text="@string/start_screen_gain_90_ep"
android:visibility="visible"/>
android:visibility="invisible"/>
<Button
android:id="@+id/startscreen_finish_world_1"
@ -52,7 +52,7 @@
android:layout_alignParentTop="true"
android:layout_margin="10dp"
android:text="@string/start_screen_finish_world_1"
android:visibility="visible"/>
android:visibility="invisible"/>
<Button
android:id="@+id/startscreen_to_gl_test_screen"
@ -63,6 +63,6 @@
android:layout_alignParentTop="true"
android:layout_margin="10dp"
android:text="@string/start_screen_to_gl_test_screen"
android:visibility="visible"/>
android:visibility="invisible"/>
</RelativeLayout>

2
app/src/main/res/values/strings.xml
View File

@ -112,7 +112,7 @@
<string name="credits_title" translatable="false">ENDLESS ROLL</string>
<string name="credits_author">by Julian Mutter</string>
<string name="credits_testers_title">TESTERS</string>
<string name="credits_testers" translatable="false">Tester1\nTester2\nTester3\nTester4</string>
<string name="credits_testers" translatable="false">Markus\nLukas\nMaurice\nLandmann\nRainer\nJohannes</string>
<string name="credits_sounds_title" translatable="false">SOUNDS</string>
<string name="credits_sounds" translatable="false">„Fruit-collected“, „Glocken-good“, „Carillon-02-a“, „Carillon-02-b“, „Fireball-02“, „Fruit-appearance“, „Voltage-hum“ (noiseforfun.com)</string>
<string name="credits_music_title">MUSIC</string>