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

Redid collision system -> No more tool-glitches

Browse Source
This commit is contained in:
= 2017-10-20 17:42:30 +02:00
parent 2d74599749
commit aa1c0c01a4
5 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/build/intermediates/blame/res/debug/single/layout.json
View File

@ -3,22 +3,22 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\levels.xml", "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\levels.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\levels.xml" "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\levels.xml"
}, },
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\toolshop.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\toolshop.xml"
},
{ {
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\tutorial.xml", "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\tutorial.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\tutorial.xml" "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\tutorial.xml"
}, },
{ {
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\abc_screen_simple_overlay_action_mode.xml", "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\toolshop.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\layout\\abc_screen_simple_overlay_action_mode.xml" "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\toolshop.xml"
}, },
{ {
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\worlds.xml", "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\worlds.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\worlds.xml" "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\worlds.xml"
}, },
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\abc_screen_simple_overlay_action_mode.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\layout\\abc_screen_simple_overlay_action_mode.xml"
},
{ {
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\abc_screen_simple.xml", "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\abc_screen_simple.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\layout\\abc_screen_simple.xml" "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\layout\\abc_screen_simple.xml"

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

@ -34,7 +34,7 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_below="@+id/startscreen_play" android:layout_below="@+id/startscreen_play"
android:text="@string/start_screen_unlock_all_levels" android:text="@string/start_screen_unlock_all_levels"
android:visibility="invisible"/> android:visibility="visible"/>
<Button <Button
android:id="@+id/startscreen_gain_90_ep" android:id="@+id/startscreen_gain_90_ep"
@ -45,7 +45,7 @@
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_below="@+id/startscreen_play" android:layout_below="@+id/startscreen_play"
android:text="@string/start_screen_gain_90_ep" android:text="@string/start_screen_gain_90_ep"
android:visibility="invisible"/> android:visibility="visible"/>
<Button <Button
android:id="@+id/startscreen_to_gl_test_screen" android:id="@+id/startscreen_to_gl_test_screen"
@ -55,6 +55,6 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:text="@string/start_screen_to_gl_test_screen" android:text="@string/start_screen_to_gl_test_screen"
android:visibility="invisible"/> android:visibility="visible"/>
</RelativeLayout> </RelativeLayout>

BIN
app/build/intermediates/res/resources-debug.ap_
View File

Binary file not shown.

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

@ -24,7 +24,12 @@ public class PowerMushroom extends Tool {
} }
@Override @Override
protected Geometry createCollisionBounds() { protected Geometry createWorldCollisionBounds() {
return this;
}
@Override
protected Geometry createPlayerCollisionBounds() {
return this; return this;
} }
} }

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

@ -34,7 +34,7 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_below="@+id/startscreen_play" android:layout_below="@+id/startscreen_play"
android:text="@string/start_screen_unlock_all_levels" android:text="@string/start_screen_unlock_all_levels"
android:visibility="invisible"/> android:visibility="visible"/>
<Button <Button
android:id="@+id/startscreen_gain_90_ep" android:id="@+id/startscreen_gain_90_ep"
@ -45,7 +45,7 @@
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_below="@+id/startscreen_play" android:layout_below="@+id/startscreen_play"
android:text="@string/start_screen_gain_90_ep" android:text="@string/start_screen_gain_90_ep"
android:visibility="invisible"/> android:visibility="visible"/>
<Button <Button
android:id="@+id/startscreen_to_gl_test_screen" android:id="@+id/startscreen_to_gl_test_screen"
@ -55,6 +55,6 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:text="@string/start_screen_to_gl_test_screen" android:text="@string/start_screen_to_gl_test_screen"
android:visibility="invisible"/> android:visibility="visible"/>
</RelativeLayout> </RelativeLayout>