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

Fixed bug with terrain-collision

Browse Source
This commit is contained in:
julian 2018-06-29 16:47:49 +02:00
parent ed3a54af10
commit aec2ce0d80
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build/intermediates/assets/debug/levelpacks/Grasslands.xml
View File

@ -169,7 +169,7 @@
</obstacles>
<stars class="java.util.ArrayList">
<positionData x="2.8000035" y="-0.77999914"/>
<positionData x="11.243364" y="-0.43999982"/>
<positionData x="11.210031" y="-0.47333312"/>
<positionData x="16.21668" y="0.34666675"/>
</stars>
<energy x="19.086668" y="-0.81333315"/>

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

File diff suppressed because one or more lines are too long

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

@ -22,7 +22,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"

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

@ -163,7 +163,7 @@ public class CollisionDetector {
if (circle.getTopEdge() < terrainTile.getTopEdge()) {
float xDistance = Math.abs(circle.getPosition().x - terrainTile.getPosition().x);
if (xDistance < circle.getRadius() + terrainTile.getWidth() / 2)
return new EntityCollisionData(terrainTile, Edge.BOTTOM);
return new EntityCollisionData(terrainTile, Edge.LEFT);
}
if (isCircleQuadCollision(circle, terrainTile)) {
@ -179,7 +179,7 @@ public class CollisionDetector {
if (circle.getBottomEdge() > ceilingTile.getBottomEdge()) {
float xDistance = Math.abs(circle.getPosition().x - ceilingTile.getPosition().x);
if (xDistance < circle.getRadius() + ceilingTile.getWidth() / 2)
return new EntityCollisionData(ceilingTile, Edge.TOP);
return new EntityCollisionData(ceilingTile, Edge.LEFT);
}
if (isCircleQuadCollision(circle, ceilingTile)) {

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

@ -69,7 +69,7 @@
<string name="tutorial_place_ramp_air">Du kannst Tools auch mitten in der Luft setzen. Achte auf das richtige Timing!</string>
<string name="tutorial_leveled_up_to_toolshop">Glückwunsch! Du bist ein Level aufgestiegen! Jetzt gehe in den Toolshop</string>
<string name="tutorial_switch_tools_two_neccessary">Für dieses Level müssen zwei Tools ausgerüstet sein</string>
<string name="tutorial_switch_tools_switch">Um ein Tool auszuwählen, klicke einfach darauf</string>
<string name="tutorial_switch_tools_switch">Wähle, welches Tool du benutzen willst, indem du darauf klickst</string>
<string name="tutorial_place_ramp_gap">Setze die Rampe vor die Lücke</string>
<string name="credits_author">von Frajul</string>
<string name="credits_testers_title">TESTER</string>

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

@ -107,7 +107,7 @@
<string name="tutorial_leveled_up_to_toolshop">Congratulations! You have leveled up!\nNow go to the toolshop</string>
<string name="tutorial_spring_equipped">Well done! Now you can start the next level</string>
<string name="tutorial_switch_tools_two_neccessary">For this level you will need two tools equipped</string>
<string name="tutorial_switch_tools_switch">To select a tool just click on it</string>
<string name="tutorial_switch_tools_switch">Choose which tool to use by clicking on it</string>
<string name="credits_title" translatable="false">ENDLESS ROLL</string>
<string name="credits_author">by Frajul</string>