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

MoveEdges are outer limit of Movement

Browse Source 
Textures renamed and reorganized
New (not optimal) obstacleTextures added
This commit is contained in:
=
2016-12-28 10:23:12 +01:00
parent 45b9c41ea4
commit decbf80ed5
117 changed files with 5437 additions and 2114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build/intermediates/res/merged/debug/layout/game.xml
View File

@ -12,7 +12,7 @@
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:layout_margin="10dp"
android:src="@drawable/pausebutton" />
android:src="@drawable/guis_pausebutton" />
<include
android:id="@+id/game_toolbuttonbar"

4
app/build/intermediates/res/merged/debug/layout/levelbutton.xml
View File

@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/levelbutton_background"
android:background="@drawable/xml_levelbutton_background"
android:layout_margin="10dp">
<TextView
@ -26,7 +26,7 @@
android:id="@+id/levelbutton_lock"
android:layout_width="100dp"
android:layout_height="100dp"
android:src="@drawable/lock"
android:src="@drawable/lock_locked"
android:layout_centerInParent="true"
android:visibility="invisible"/>

2
app/build/intermediates/res/merged/debug/layout/levels.xml
View File

@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@drawable/menu_background">
android:background="@drawable/backgrounds_menu_grass">
<include
layout="@layout/topbar"

2
app/build/intermediates/res/merged/debug/layout/levelup_message.xml
View File

@ -4,7 +4,7 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:id="@+id/levelup_mainlayout"
android:background="@drawable/levelupbackground">
android:background="@drawable/backgrounds_menu_levelup">
<LinearLayout
android:layout_width="match_parent"

2
app/build/intermediates/res/merged/debug/layout/short_menu.xml
View File

@ -2,7 +2,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/shortmenubackground">
android:background="@drawable/backgrounds_menu_shortmenu">
<include
android:layout_width="match_parent"

4
app/build/intermediates/res/merged/debug/layout/start_screen.xml
View File

@ -9,7 +9,7 @@
android:layout_width="110dp"
android:layout_height="110dp"
android:text="Play"
android:background="@drawable/ball"
android:background="@drawable/playershapes_ball"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="44dp"
@ -29,7 +29,7 @@
android:id="@+id/startscreen_sound"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/sound_toggle"
android:background="@drawable/xml_sound_toggle"
android:textOff=""
android:textOn=""
android:layout_below="@+id/startscreen_play"

2
app/build/intermediates/res/merged/debug/layout/tool_slot.xml
View File

@ -8,7 +8,7 @@
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_gravity="center"
android:background="@drawable/tool_slot_background"
android:background="@drawable/xml_tool_slot_background"
android:src="@drawable/rampbutton" />
</FrameLayout>

2
app/build/intermediates/res/merged/debug/layout/toolbutton.xml
View File

@ -25,7 +25,7 @@
android:layout_centerInParent="true"
android:max="100"
android:progress="100"
android:progressDrawable="@drawable/toolprogressbarlayers" />
android:progressDrawable="@drawable/xml_toolprogressbarlayers" />
</RelativeLayout>

2
app/build/intermediates/res/merged/debug/layout/toolshop.xml
View File

@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/menu_background">
android:background="@drawable/backgrounds_menu_grass">
<include
android:id="@+id/toolshop_topbar"

2
app/build/intermediates/res/merged/debug/layout/topbar.xml
View File

@ -60,7 +60,7 @@
android:layout_centerVertical="true"
android:layout_margin="5dp"
android:layout_toStartOf="@+id/topbar_toolshop"
android:background="@drawable/sound_toggle"
android:background="@drawable/xml_sound_toggle"
android:textOff=""
android:textOn="" />

2
app/build/intermediates/res/merged/debug/layout/unlock_message.xml
View File

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/unlock_message_background">
android:background="@drawable/xml_unlock_message_background">
<ImageView
android:layout_width="40dp"

8
app/build/intermediates/res/merged/debug/layout/world_button.xml
View File

@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="220dp"
android:layout_height="match_parent"
android:background="@drawable/worldbutton_background">
android:background="@drawable/xml_worldbutton_background">
<TextView
android:id="@+id/worldbutton_title"
@ -23,7 +23,7 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:adjustViewBounds="true"
android:src="@drawable/grasslands_preview" />
android:src="@drawable/previews_grass" />
<ImageView
android:id="@+id/worldbutton_lock"
@ -32,7 +32,7 @@
android:layout_alignBottom="@+id/worldbutton_preview"
android:layout_alignLeft="@+id/worldbutton_preview"
android:layout_alignStart="@+id/worldbutton_preview"
android:src="@drawable/lock"
android:src="@drawable/lock_locked"
android:visibility="visible" />
<RelativeLayout
@ -82,7 +82,7 @@
<ImageView
android:layout_width="30sp"
android:layout_height="30sp"
android:src="@drawable/unlocked"
android:src="@drawable/lock_unlocked"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"

2
app/build/intermediates/res/merged/debug/layout/worlds.xml
View File

@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/menu_background">
android:background="@drawable/backgrounds_menu_grass">
<include
android:id="@+id/worlds_topbar"