Cleaned up -> Removed unused imports / files

This commit is contained in:
= 2018-03-15 18:04:08 +01:00
parent d8a5974c52
commit 9ad8666d5c
112 changed files with 188 additions and 402 deletions

View File

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

View File

@ -600,5 +600,124 @@
</stars>
<energy x="10.900037" y="0.33333334"/>
</level>
<level packId="2" id="9" goalX="26.813334" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="0.5266659" width="7.053332"/>
<tileData x="6.0975885" width="2.8885126"/>
<tileData x="8.564014" width="0.39834118"/>
<tileData x="11.516363" width="2.932355"/>
<tileData x="17.878101" width="1.5211315"/>
<tileData x="25.215616" width="7.921894"/>
</terrainTiles>
<ceilingTiles class="java.util.ArrayList">
<tileData x="11.906667" width="29.813334"/>
</ceilingTiles>
<obstacles class="java.util.ArrayList">
<obstacleData floating="false" moving="false" deadly="false" leftEdge="1.7096655" rightEdge="2.7036655" height="0.28" y="-0.46000004">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="2.7624984" rightEdge="3.2974982" height="0.573" y="-0.31350002">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="3.3816662" rightEdge="4.451666" height="0.28" y="-0.07000004">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="5.0070043" rightEdge="6.153004" height="0.586" y="0.093333334">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="6.2228346" rightEdge="7.6238346" height="0.395" y="0.08666667">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="8.072022" rightEdge="9.448022" height="0.433" y="0.3266665">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="10.872514" rightEdge="12.987514" height="1.185" y="-0.0075000525">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="true" deadly="false" leftEdge="8.817183" rightEdge="9.556183" height="0.293" y="-0.81333303">
<moveComponent length="1.83" rotation="45.236" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="true" triggerDistance="-0.551"/>
</obstacleData>
<obstacleData floating="true" moving="true" deadly="false" leftEdge="13.030026" rightEdge="13.530026" height="0.331" y="-1.0133333">
<moveComponent length="3.479" rotation="90.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="true" triggerDistance="-0.245"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="13.819201" rightEdge="14.634202" height="1.146" y="0.07999999">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="14.684545" rightEdge="16.315544" height="0.5" y="0.33999988">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="15.113712" rightEdge="16.259712" height="0.306" y="-0.3799999">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="16.35821" rightEdge="17.555208" height="0.357" y="0.34666663">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="17.684023" rightEdge="19.136023" height="0.331" y="-0.43450004">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="20.656307" rightEdge="22.210308" height="0.357" y="-0.42150003">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="true" deadly="true" leftEdge="22.251436" rightEdge="22.608435" height="0.331" y="-0.43450004">
<moveComponent length="2.191" rotation="90.0" startOffset="0.0" direction="1.0" speed="1.0" hasPlayerXSpeed="false" triggerDistance="3.0"/>
</obstacleData>
<obstacleData floating="false" moving="true" deadly="true" leftEdge="24.891079" rightEdge="25.22208" height="0.331" y="-0.43450004">
<moveComponent length="2.062" rotation="90.0" startOffset="0.0" direction="1.0" speed="0.843" hasPlayerXSpeed="false" triggerDistance="0.571"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="24.35241" rightEdge="25.167408" height="0.255" y="0.48000008">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
</obstacles>
<stars class="java.util.ArrayList">
<positionData x="6.890018" y="-0.39333332"/>
<positionData x="15.67671" y="-0.06666667"/>
<positionData x="24.766592" y="0.18666668"/>
</stars>
<energy x="4.343331" y="-0.53999984"/>
</level>
<level packId="2" id="10" goalX="5.939997" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="-0.78716683" width="4.4256663"/>
<tileData x="3.8938317" width="4.092331"/>
</terrainTiles>
<ceilingTiles class="java.util.ArrayList">
<tileData x="1.4699984" width="8.939997"/>
</ceilingTiles>
<obstacles class="java.util.ArrayList">
<obstacleData floating="true" moving="false" deadly="false" leftEdge="-2.7500002" rightEdge="0.96999985" height="1.439" y="0.36000007">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="true" deadly="false" leftEdge="1.4514995" rightEdge="1.8084996" height="0.369" y="-0.80666643">
<moveComponent length="1.778" rotation="0.0" startOffset="0.0" direction="1.0" speed="1.0" hasPlayerXSpeed="false" triggerDistance="-0.122"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="2.0181656" rightEdge="4.2351656" height="0.5" y="0.14000002">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="1.9039984" rightEdge="4.9359984" height="1.07" y="1.3333334">
<moveComponent length="0.0" rotation="0.0" startOffset="0.0" direction="1.0" speed="0.0" hasPlayerXSpeed="false" triggerDistance="0.0"/>
</obstacleData>
</obstacles>
<stars class="java.util.ArrayList"/>
</level>
<level packId="2" id="11" goalX="3.0" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="0.0" width="6.0"/>
</terrainTiles>
<ceilingTiles class="java.util.ArrayList">
<tileData x="0.0" width="6.0"/>
</ceilingTiles>
<obstacles class="java.util.ArrayList"/>
<stars class="java.util.ArrayList"/>
</level>
<level packId="2" id="12" goalX="3.0" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="0.0" width="6.0"/>
</terrainTiles>
<ceilingTiles class="java.util.ArrayList">
<tileData x="0.0" width="6.0"/>
</ceilingTiles>
<obstacles class="java.util.ArrayList"/>
<stars class="java.util.ArrayList"/>
</level>
</levels>
</levelPack>

View File

@ -1,7 +1,5 @@
package de.frajul.endlessroll.data;
import de.frajul.endlessroll.main.GameLog;
/**
* Created by Julian on 02.08.2016.
*/

View File

@ -10,7 +10,6 @@ import de.frajul.endlessroll.entities.collision.collisionData.ObstacleCollisionD
import de.frajul.endlessroll.entities.collision.collisionData.PlayerCollisionData;
import de.frajul.endlessroll.entities.collision.collisionData.ToolCollisionData;
import de.frajul.endlessroll.entities.tools.Tool;
import de.frajul.endlessroll.main.GameLog;
import de.frajul.endlessroll.main.game.Game;
import de.frajul.endlessroll.main.game.GameScene;
import de.frajul.endlessroll.main.game.Timer;

View File

@ -1,9 +1,9 @@
package de.frajul.endlessroll.entities.collision.collisionData;
import de.frajul.endlessroll.entities.tools.Tool;
import java.util.List;
import de.frajul.endlessroll.entities.tools.Tool;
/**
* Created by Julian on 21.02.2016.
*/

View File

@ -1,5 +1,10 @@
package de.frajul.endlessroll.entities.particles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import de.frajul.endlessroll.entities.particles.attributes.attributeValues.Options;
import de.frajul.endlessroll.entities.particles.attributes.attributeValues.Range;
import de.frajul.endlessroll.entities.particles.attributes.attributeValues.SpawnShape;
@ -9,11 +14,6 @@ import de.frajul.endlessroll.entities.particles.attributes.attributeValues.TintT
import de.frajul.endlessroll.entities.textures.Texture;
import de.frajul.endlessroll.main.game.Timer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Random;
/**
* Created by Julian on 05.08.2016.
*/

View File

@ -2,6 +2,12 @@ package de.frajul.endlessroll.entities.particles;
import android.content.Context;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
import de.frajul.endlessroll.entities.particles.attributes.Attribute;
import de.frajul.endlessroll.entities.particles.attributes.AttributeValueReader;
import de.frajul.endlessroll.entities.particles.attributes.ParticleAttributeType;
@ -14,12 +20,6 @@ import de.frajul.endlessroll.entities.particles.attributes.attributeValues.Timel
import de.frajul.endlessroll.entities.particles.attributes.attributeValues.TimelineRange;
import de.frajul.endlessroll.entities.particles.attributes.attributeValues.TintTimeline;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
/**
* Created by Julian on 02.08.2016.
*/

View File

@ -1,7 +1,5 @@
package de.frajul.endlessroll.entities.particles;
import android.util.Log;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@ -9,7 +7,6 @@ import java.util.Random;
import de.frajul.endlessroll.data.Vector;
import de.frajul.endlessroll.entities.particles.attributes.attributeValues.SpawnShape;
import de.frajul.endlessroll.main.GameLog;
import de.frajul.endlessroll.main.game.Timer;
import de.frajul.endlessroll.rendering.Lock;

View File

@ -1,11 +1,11 @@
package de.frajul.endlessroll.entities.particles.attributes;
import de.frajul.endlessroll.entities.particles.attributes.attributeValues.ParticleAttributeValue;
import de.frajul.endlessroll.entities.particles.attributes.attributeValues.ParticleAttributeValueType;
import java.util.ArrayList;
import java.util.List;
import de.frajul.endlessroll.entities.particles.attributes.attributeValues.ParticleAttributeValue;
import de.frajul.endlessroll.entities.particles.attributes.attributeValues.ParticleAttributeValueType;
/**
* Created by Julian on 02.08.2016.
*/

View File

@ -1,11 +1,10 @@
package de.frajul.endlessroll.entities.particles.attributes.attributeValues;
import de.frajul.endlessroll.data.Color;
import de.frajul.endlessroll.main.GameLog;
import java.util.ArrayList;
import java.util.List;
import de.frajul.endlessroll.data.Color;
/**
* Created by Julian on 02.08.2016.
*/

View File

@ -5,7 +5,6 @@ import de.frajul.endlessroll.entities.DestroyEffect;
import de.frajul.endlessroll.entities.Player;
import de.frajul.endlessroll.entities.collision.geometry.Geometry;
import de.frajul.endlessroll.main.game.Timer;
import de.frajul.endlessroll.sounds.Sound;
import de.frajul.endlessroll.sounds.SoundManager;
/**

View File

@ -11,7 +11,6 @@ import de.frajul.endlessroll.data.Vector;
import de.frajul.endlessroll.entities.particles.ParticleSystem;
import de.frajul.endlessroll.entities.textures.Texture;
import de.frajul.endlessroll.entities.textures.TexturePack;
import de.frajul.endlessroll.sounds.Sound;
import de.frajul.endlessroll.sounds.SoundManager;
public enum ToolType {

View File

@ -2,11 +2,11 @@ package de.frajul.endlessroll.main;
import android.widget.RelativeLayout;
import java.util.List;
import de.frajul.endlessroll.main.screens.Screen;
import de.frajul.endlessroll.main.tutorial.BreakPoint;
import java.util.List;
/**
* Created by Julian on 08.12.2015.
*/

View File

@ -2,8 +2,6 @@ package de.frajul.endlessroll.main;
import android.content.Context;
import android.opengl.GLSurfaceView;
import android.view.MotionEvent;
import android.view.View;
import de.frajul.endlessroll.rendering.Rendering;
import de.frajul.endlessroll.rendering.renderer.GameRenderer;

View File

@ -1,15 +1,8 @@
package de.frajul.endlessroll.main.game;
import de.frajul.endlessroll.data.Vector;
import de.frajul.endlessroll.entities.Entity;
import de.frajul.endlessroll.entities.Obstacle;
import de.frajul.endlessroll.entities.particles.Firework;
import de.frajul.endlessroll.entities.particles.ParticleEffect;
import de.frajul.endlessroll.entities.particles.ParticleSource;
import de.frajul.endlessroll.entities.particles.ParticleSystem;
import de.frajul.endlessroll.entities.shapes.PlayerShape;
import de.frajul.endlessroll.entities.textures.TexturePack;
import de.frajul.endlessroll.levels.ObstacleData;
import de.frajul.endlessroll.levels.worlds.World;
import de.frajul.endlessroll.main.GameActivity;

View File

@ -1,6 +1,5 @@
package de.frajul.endlessroll.main.screens;
import android.support.annotation.LayoutRes;
import android.widget.RelativeLayout;
import de.frajul.endlessroll.R;

View File

@ -1,6 +1,5 @@
package de.frajul.endlessroll.main.screens;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import de.frajul.endlessroll.R;

View File

@ -7,7 +7,6 @@ import de.frajul.endlessroll.entities.particles.ParticleSystem;
import de.frajul.endlessroll.entities.textures.TexturePack;
import de.frajul.endlessroll.main.GameActivity;
import de.frajul.endlessroll.main.GameLog;
import de.frajul.endlessroll.main.game.Game;
import de.frajul.endlessroll.main.game.TestScreenScene;
import de.frajul.endlessroll.main.game.Timer;
import de.frajul.endlessroll.rendering.Rendering;

View File

@ -1,7 +1,6 @@
package de.frajul.endlessroll.main.screens;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.FrameLayout;

View File

@ -1,7 +1,6 @@
package de.frajul.endlessroll.main.screens;
import android.view.Gravity;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;

View File

@ -3,18 +3,17 @@ package de.frajul.endlessroll.rendering.renderer;
import android.content.Context;
import android.opengl.GLES20;
import javax.microedition.khronos.opengles.GL10;
import de.frajul.endlessroll.entities.particles.Particle;
import de.frajul.endlessroll.entities.particles.ParticleEffect;
import de.frajul.endlessroll.entities.particles.ParticleSource;
import de.frajul.endlessroll.main.GameLog;
import de.frajul.endlessroll.main.game.Scene;
import de.frajul.endlessroll.rendering.Fbo;
import de.frajul.endlessroll.rendering.MatrixCreator;
import de.frajul.endlessroll.rendering.Quad;
import de.frajul.endlessroll.rendering.shader.ParticleShader;
import javax.microedition.khronos.opengles.GL10;
/**
* Created by Julian on 10.08.2016.
*/

View File

@ -3,12 +3,12 @@ package de.frajul.endlessroll.rendering.shader;
import android.content.Context;
import android.opengl.GLES20;
import de.frajul.endlessroll.main.GameLog;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import de.frajul.endlessroll.main.GameLog;
/**
* Created by Julian on 23.11.2015.
*/

View File

@ -1,7 +1,5 @@
package de.frajul.endlessroll.user;
import android.content.Context;
import java.util.ArrayList;
import java.util.List;

View File

@ -1,10 +1,10 @@
package de.frajul.endlessroll.user;
import java.util.ArrayList;
import de.frajul.endlessroll.entities.tools.ToolSlot;
import de.frajul.endlessroll.entities.tools.ToolType;
import java.util.ArrayList;
/**
* Created by Julian on 15.07.2016.
*/

View File

@ -9,11 +9,9 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import de.frajul.endlessroll.R;
import de.frajul.endlessroll.entities.tileLists.TileList;
import de.frajul.endlessroll.main.GameActivity;
import de.frajul.endlessroll.main.screens.Screen;
import de.frajul.endlessroll.user.LevelBounty;
import de.frajul.endlessroll.user.User;
/**
* Created by Julian on 15.07.2016.

View File

@ -2,7 +2,6 @@ package de.frajul.endlessroll.views;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.Button;

View File

@ -4,7 +4,6 @@ import android.content.Context;
import android.graphics.Typeface;
import android.support.annotation.DrawableRes;
import android.support.annotation.StringRes;
import android.view.LayoutInflater;
import android.view.View;
import android.view.animation.Animation;
import android.widget.ImageView;

View File

@ -6,9 +6,7 @@ import android.widget.ImageView;
import android.widget.TextView;
import de.frajul.endlessroll.R;
import de.frajul.endlessroll.entities.shapes.EmptyTask;
import de.frajul.endlessroll.entities.shapes.PlayerShape;
import de.frajul.endlessroll.entities.shapes.Task;
import de.frajul.endlessroll.main.GameActivity;
/**

View File

@ -5,8 +5,6 @@ import android.graphics.Typeface;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.FrameLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import java.util.Random;

View File

@ -10,7 +10,6 @@ import de.frajul.endlessroll.R;
import de.frajul.endlessroll.entities.tools.ToolType;
import de.frajul.endlessroll.main.GameActivity;
import de.frajul.endlessroll.main.screens.ToolShopScreen;
import de.frajul.endlessroll.user.LevelUpBounties;
/**
* Created by Julian on 03.06.2017.

View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:fillAfter="true">
<scale
android:duration="200"
android:fromXScale="1.0"
android:fromYScale="1.0"
android:pivotX="50%"
android:pivotY="50%"
android:toXScale="0.8"
android:toYScale="0.8" />
</set>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 109 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 248 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 165 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 168 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 223 KiB

View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<padding
android:bottom="15dp"
android:left="15dp"
android:right="15dp"
android:top="15dp" />
<stroke
android:width="1dp"
android:color="#d8000000" />
<solid
android:color="#ffffff"/>
</shape>

View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true"
android:drawable="@drawable/playershapes_wheel">
<shape android:shape="rectangle">
<size
android:width="24dp"
android:height="24dp" />
</shape>
</item>
<item android:state_checked="false"
android:drawable="@drawable/playershapes_smiley">
<shape android:shape="rectangle">
<size
android:width="24dp"
android:height="24dp" />
</shape>
</item>
</selector>

View File

@ -11,7 +11,6 @@
android:layout_height="wrap_content"/>
<HorizontalScrollView
android:id="@+id/horizontalScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"

View File

@ -35,7 +35,6 @@
<ImageView
android:layout_width="400dp"
android:layout_height="10dp"
android:id="@+id/imageView"
android:layout_gravity="center_horizontal"
android:src="@drawable/guis_splitter"
android:layout_marginTop="10dp"/>

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/linearLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/xml_selector_pricebutton"

View File

@ -11,7 +11,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="Smiley"
android:text="@string/placeholder_textview"
android:textAlignment="center"
android:textSize="28sp"/>
@ -44,7 +44,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="Don't worry - roll happy!"
android:text="@string/placeholder_textview"
android:textAlignment="center"
android:textSize="20sp"/>
</RelativeLayout>

View File

@ -1,76 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/linearLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/xml_background_toolupgrade"
android:orientation="vertical"
android:padding="2dp">
<TextView
android:id="@+id/tool_upgrade_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/tool_upgrade_title_placeholder"
android:textSize="17sp"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/tool_upgrade_imageview"
android:layout_width="34dp"
android:layout_height="34dp"
android:layout_gravity="center"
android:layout_marginRight="3dp"
android:layout_weight="1"
android:src="@drawable/tools_ramp_button"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/tool_upgrade_value_old"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/placeholder_percent"
android:textSize="16sp"/>
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center_vertical|center_horizontal"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:src="@drawable/guis_arrow_green"/>
<TextView
android:id="@+id/tool_upgrade_value_new"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:text="@string/placeholder_percent"
android:textSize="16sp"/>
</LinearLayout>
<include
android:id="@+id/tool_upgrade_pricebutton"
layout="@layout/price_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/topbar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/xml_background_topbar">

View File

@ -6,17 +6,14 @@
<string name="message_to_menu">Zum Menü</string>
<string name="message_try_again">Erneut versuchen</string>
<string name="message_restart">Neustart</string>
<string name="message_next_level">Nächstes Level</string>
<string name="goal_message_restart_format_d">Neustart: Level %d</string>
<string name="goal_message_next_level_format_d">Nächstes Level: %d</string>
<string name="goal_message_next_world_format_s">Gehe zur nächsten Welt:\n%s</string>
<string name="pre_start_screen_loading">LÄDT...</string>
<string name="short_menu_continue">Weiter</string>
<string name="short_menu_restart">Neustart</string>
<string name="short_menu_exit">Beenden</string>
<string name="start_screen_play">Spielen</string>
<string name="start_screen_finish_world_1">Erste Welt abschließen!</string>
<string name="tool_upgrade_title_placeholder">Zeit (Lv12)</string>
<string name="settings_reset">Fortschritt zurücksetzen</string>
<string name="unlock_message_placeholder">Rampe freigeschaltet</string>
<string name="world_button_title_placeholder">Hammer Welt!</string>
@ -51,10 +48,6 @@
<string name="tool_name_bomb">Bombe</string>
<string name="tool_name_power_mushroom">Pilz</string>
<string name="tool_name_stasis">Stase</string>
<string name="tool_upgrade_none">Nichts</string>
<string name="tool_upgrade_time">Zeit</string>
<string name="tool_upgrade_radius">Radius</string>
<string name="tool_upgrade_force">Kraft</string>
<string name="confirm_dialog_button_yes">Ja</string>
<string name="confirm_dialog_button_no">Nein</string>
<string name="confirm_dialog_placeholder">Der allerschönste Platzhalter für einen ConfirmDialog!</string>
@ -67,9 +60,6 @@
<string name="tutorial_place_ramp_obstacle">Super! Jetzt setze sie vor das Hindernis</string>
<string name="tutorial_place_ramp_air_2">Versuch es erneut!</string>
<string name="tutorial_spring_equipped">Sehr gut! Jetzt schaffst du bestimmt das nächste Level</string>
<string name="task_completed">Aufgabe abgeschlossen</string>
<string name="message_tools">Tools</string>
<string name="topbar_toolshop">Toolshop</string>
<string name="bounty_message_tool_slot">Neuer Slot freigeschaltet</string>
<string name="bounty_message_shape_unlocked">Neues Aussehen freigeschaltet</string>
<string name="playershape_description_locked">Ein neuer Look und noch viel mehr Spaß</string>

View File

@ -12,7 +12,6 @@
<color name="red">#ff0000</color>
<color name="black">#000000</color>
<color name="white">#ffffff</color>
<color name="transparent">#00000000</color>
<color name="message_buttons">#daf10d</color>

View File

@ -3,7 +3,6 @@
<string name="placeholder_button">Click me!</string>
<string name="placeholder_textview">I\'m a text!</string>
<string name="placeholder_number" translatable="false">997.5</string>
<string name="placeholder_percent" translatable="false">85.1%</string>
<string name="game_playerprogress_placeholder" translatable="false">0.0m</string>
<string name="game_playerprogress_format_f" translatable="false">%.1fm</string>
@ -12,35 +11,29 @@
<string name="game_fps_placeholder" translatable="false">Fps: 00</string>
<string name="game_fps_format_d" translatable="false">Fps: %d</string>
<string name="game_countdown_placeholder" translatable="false">3</string>
<string name="task_completed">Task completed</string>
<string name="levelup" translatable="false">Level Up</string>
<string name="message_game_over" translatable="false">GAME OVER</string>
<string name="message_level_finished">LEVEL FINISHED</string>
<string name="message_tools">Tools</string>
<string name="message_to_menu">To menu</string>
<string name="message_try_again">Try again</string>
<string name="message_restart">Restart</string>
<string name="message_next_level">Next level</string>
<string name="goal_message_restart_format_d">Restart level %d</string>
<string name="goal_message_next_level_format_d">Next level: %d</string>
<string name="goal_message_next_world_format_s">Go to the next world:\n%s</string>
<string name="pre_start_screen_loading">LOADING...</string>
<string name="short_menu_continue">Continue</string>
<string name="short_menu_restart">Restart</string>
<string name="short_menu_exit">Exit</string>
<string name="start_screen_play">Play</string>
<string name="start_screen_unlock_all_levels" translatable="false">Unlock all levels</string>
<string name="start_screen_gain_90_ep" translatable="false">Gain 90 ep</string>
<string name="start_screen_finish_world_1">Finish the first world!</string>
<string name="start_screen_to_gl_test_screen" translatable="false">Test GL Stuff!!!</string>
<string name="tool_upgrade_title_placeholder">Time (Lv12)</string>
<string name="topbar_level_placeholder" translatable="false">Level: 24</string>
<string name="topbar_level_format_d" translatable="false">Level: %d</string>
<string name="settings_reset">Reset progress</string>
<string name="settings_credits" translatable="false">Credits</string>
<string name="settings_music">Music</string>
<string name="settings_sounds" translatable="false">Sounds</string>
<string name="topbar_toolshop">Toolshop</string>
<string name="unlock_message_placeholder">Ramp unlocked</string>
<string name="world_button_title_placeholder">Great world</string>
<string name="world_button_progress_placeholder" translatable="false">21/15</string>
@ -92,12 +85,6 @@
<string name="tool_name_power_mushroom">Mushroom</string>
<string name="tool_name_stasis">Stasis</string>
<string name="tool_level_format_d" translatable="false">Level: %d</string>
<string name="tool_upgrade_title_format_sd" translatable="false">%1$s (Lv%2$d)</string>
<string name="tool_upgrade_none">None</string>
<string name="tool_upgrade_time">Time</string>
<string name="tool_upgrade_radius">Radius</string>
<string name="tool_upgrade_force">Force</string>
<string name="tool_upgrade_value_max" translatable="false">Max.</string>
<string name="confirm_dialog_button_yes">Yes</string>
<string name="confirm_dialog_button_no">No</string>

View File

@ -2,7 +2,7 @@ package de.frajul.endlessroll;
import org.junit.Test;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
/**
* To work on unit tests, switch the Test Artifact in the Build Variants view.

View File

@ -1,8 +1,8 @@
package de.frajul.particlelab.entities;
import de.frajul.particlelab.data.Color;
import de.frajul.particlelab.entities.textures.Texture;
import de.frajul.particlelab.data.Vector;
import de.frajul.particlelab.entities.textures.Texture;
/**
* Created by Julian on 20.11.2015.

View File

@ -1,15 +1,14 @@
package de.frajul.particlelab.entities.particles;
import java.util.Random;
import de.frajul.particlelab.data.Vector;
import de.frajul.particlelab.entities.Entity;
import de.frajul.particlelab.entities.particles.attributes.attributeValues.Range;
import de.frajul.particlelab.entities.particles.attributes.attributeValues.Timeline;
import de.frajul.particlelab.entities.particles.attributes.attributeValues.TintTimeline;
import de.frajul.particlelab.main.GameLog;
import de.frajul.particlelab.rendering.Timer;
import java.util.Random;
/**
* Created by Julian on 02.08.2016.
*/

View File

@ -4,7 +4,6 @@ import de.frajul.particlelab.entities.particles.attributes.attributeValues.Range
import de.frajul.particlelab.entities.particles.attributes.attributeValues.Timeline;
import de.frajul.particlelab.entities.particles.attributes.attributeValues.TimelineRange;
import de.frajul.particlelab.entities.particles.attributes.attributeValues.TintTimeline;
import de.frajul.particlelab.entities.textures.Texture;
/**
* Created by Julian on 03.08.2016.

View File

@ -1,5 +1,9 @@
package de.frajul.particlelab.entities.particles;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import de.frajul.particlelab.entities.particles.attributes.attributeValues.Options;
import de.frajul.particlelab.entities.particles.attributes.attributeValues.Range;
import de.frajul.particlelab.entities.particles.attributes.attributeValues.SpawnShape;
@ -9,10 +13,6 @@ import de.frajul.particlelab.entities.particles.attributes.attributeValues.TintT
import de.frajul.particlelab.entities.textures.Texture;
import de.frajul.particlelab.rendering.Timer;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
/**
* Created by Julian on 05.08.2016.
*/

View File

@ -2,6 +2,12 @@ package de.frajul.particlelab.entities.particles;
import android.content.Context;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
import de.frajul.particlelab.entities.particles.attributes.Attribute;
import de.frajul.particlelab.entities.particles.attributes.AttributeValueReader;
import de.frajul.particlelab.entities.particles.attributes.ParticleAttributeType;
@ -13,13 +19,6 @@ import de.frajul.particlelab.entities.particles.attributes.attributeValues.Spawn
import de.frajul.particlelab.entities.particles.attributes.attributeValues.Timeline;
import de.frajul.particlelab.entities.particles.attributes.attributeValues.TimelineRange;
import de.frajul.particlelab.entities.particles.attributes.attributeValues.TintTimeline;
import de.frajul.particlelab.main.GameLog;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
/**
* Created by Julian on 02.08.2016.

View File

@ -1,16 +1,15 @@
package de.frajul.particlelab.entities.particles;
import de.frajul.particlelab.data.Vector;
import de.frajul.particlelab.entities.particles.attributes.attributeValues.SpawnShape;
import de.frajul.particlelab.main.GameLog;
import de.frajul.particlelab.rendering.Lock;
import de.frajul.particlelab.rendering.Timer;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Random;
import de.frajul.particlelab.data.Vector;
import de.frajul.particlelab.entities.particles.attributes.attributeValues.SpawnShape;
import de.frajul.particlelab.rendering.Lock;
import de.frajul.particlelab.rendering.Timer;
/**
* Created by Julian on 02.08.2016.
*/

View File

@ -1,11 +1,11 @@
package de.frajul.particlelab.entities.particles.attributes;
import de.frajul.particlelab.entities.particles.attributes.attributeValues.ParticleAttributeValue;
import de.frajul.particlelab.entities.particles.attributes.attributeValues.ParticleAttributeValueType;
import java.util.ArrayList;
import java.util.List;
import de.frajul.particlelab.entities.particles.attributes.attributeValues.ParticleAttributeValue;
import de.frajul.particlelab.entities.particles.attributes.attributeValues.ParticleAttributeValueType;
/**
* Created by Julian on 02.08.2016.
*/

View File

@ -1,8 +1,5 @@
package de.frajul.particlelab.entities.particles.attributes.attributeValues;
import de.frajul.particlelab.entities.particles.attributes.attributeValues.Range;
import de.frajul.particlelab.entities.particles.attributes.attributeValues.Timeline;
/**
* Created by Julian on 02.08.2016.
*/

View File

@ -1,11 +1,11 @@
package de.frajul.particlelab.entities.particles.attributes.attributeValues;
import de.frajul.particlelab.data.Color;
import de.frajul.particlelab.main.GameLog;
import java.util.ArrayList;
import java.util.List;
import de.frajul.particlelab.data.Color;
import de.frajul.particlelab.main.GameLog;
/**
* Created by Julian on 02.08.2016.
*/

View File

@ -6,10 +6,10 @@ import android.graphics.BitmapFactory;
import android.opengl.GLES20;
import android.opengl.GLUtils;
import de.frajul.particlelab.main.GameLog;
import java.io.InputStream;
import de.frajul.particlelab.main.GameLog;
/**
* Created by Julian on 26.11.2015.
*/

View File

@ -9,7 +9,6 @@ import android.os.Bundle;
import android.view.Window;
import android.view.WindowManager;
import de.frajul.particlelab.entities.particles.ParticleReader;
import de.frajul.particlelab.entities.particles.ParticleSystem;
import de.frajul.particlelab.rendering.GameRenderer;
import de.frajul.particlelab.rendering.Rendering;

View File

@ -2,6 +2,9 @@ package de.frajul.particlelab.main;
import android.content.Context;
import java.util.ArrayList;
import java.util.Iterator;
import de.frajul.particlelab.data.Vector;
import de.frajul.particlelab.entities.Entity;
import de.frajul.particlelab.entities.particles.ParticleSource;
@ -9,9 +12,6 @@ import de.frajul.particlelab.entities.particles.ParticleSystem;
import de.frajul.particlelab.entities.textures.TexturePack;
import de.frajul.particlelab.rendering.Timer;
import java.util.ArrayList;
import java.util.Iterator;
/**
* Created by Julian on 20.07.2016.
*/

View File

@ -4,6 +4,9 @@ import android.content.Context;
import android.opengl.GLES20;
import android.opengl.GLSurfaceView;
import javax.microedition.khronos.egl.EGLConfig;
import javax.microedition.khronos.opengles.GL10;
import de.frajul.particlelab.data.Color;
import de.frajul.particlelab.entities.Entity;
import de.frajul.particlelab.entities.particles.ParticleEffect;
@ -13,9 +16,6 @@ import de.frajul.particlelab.entities.textures.TexturePack;
import de.frajul.particlelab.main.GameLog;
import de.frajul.particlelab.main.Scene;
import javax.microedition.khronos.egl.EGLConfig;
import javax.microedition.khronos.opengles.GL10;
/**
* Created by Julian on 22.11.2015.
*/

View File

@ -2,8 +2,8 @@ package de.frajul.particlelab.rendering;
import android.opengl.Matrix;
import de.frajul.particlelab.entities.Entity;
import de.frajul.particlelab.data.Vector;
import de.frajul.particlelab.entities.Entity;
/**
* Created by Julian on 23.11.2015.

View File

@ -1,10 +1,10 @@
package de.frajul.particlelab.rendering;
import de.frajul.particlelab.data.Vector;
import de.frajul.particlelab.entities.particles.ParticleSystem;
import de.frajul.particlelab.entities.textures.TexturePack;
import de.frajul.particlelab.main.MainActivity;
import de.frajul.particlelab.main.Scene;
import de.frajul.particlelab.data.Vector;
/**
* Created by Julian on 26.11.2015.

View File

@ -3,15 +3,15 @@ package de.frajul.particlelab.rendering;
import android.content.Context;
import android.opengl.GLES20;
import de.frajul.particlelab.entities.Entity;
import de.frajul.particlelab.data.Color;
import de.frajul.particlelab.entities.textures.Texture;
import de.frajul.particlelab.main.GameLog;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import de.frajul.particlelab.data.Color;
import de.frajul.particlelab.entities.Entity;
import de.frajul.particlelab.entities.textures.Texture;
import de.frajul.particlelab.main.GameLog;
/**
* Created by Julian on 23.11.2015.
*/

Binary file not shown.

Before

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 701 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 132 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

View File

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" tools:context=".main.GameActivity">
<item android:state_pressed="true" android:state_enabled="true">
<shape>
<corners android:radius="20dp" />
<padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
<stroke android:width="1dp" android:color="#992f2f" />
<solid android:color="#ef4444" />
</shape>
</item>
<item android:state_pressed="false" android:state_enabled="true">
<shape>
<corners android:radius="20dp" />
<padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
<stroke android:width="1dp" android:color="#992f2f" />
<gradient android:angle="270" android:endColor="#992f2f" android:startColor="#ef4444" />
</shape>
</item>
<item android:state_enabled="false">
<shape>
<corners android:radius="20dp" />
<padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
<stroke android:width="1dp" android:color="#992f2f" />
<gradient android:angle="270" android:endColor="#a15d5d" android:startColor="#b73d3d" />
</shape>
</item>
</selector>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 89 KiB

View File

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="47dp" />
<gradient
android:centerColor="#669dd4"
android:centerX="50%"
android:centerY="50%"
android:endColor="#F7F9FF"
android:gradientRadius="300"
android:startColor="#a07bbc"
android:type="radial" />
<padding
android:bottom="0dp"
android:left="0dp"
android:right="0dp"
android:top="20dp" />
<size
android:width="200dp"
android:height="150dp" />
<stroke
android:width="10dp"
android:color="#b11a1a" />
</shape>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 899 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 154 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 923 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="false"
android:drawable="@drawable/sound_off" />
<item android:state_checked="true"
android:drawable="@drawable/sound_on" />
</selector>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 459 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

Some files were not shown because too many files have changed in this diff Show More