merge conflict
This commit is contained in:
parent
a3f874bd33
commit
283767a14b
|
@ -3,20 +3,12 @@ package de.samdev.colorrunner.game.world;
|
||||||
import com.badlogic.gdx.Game;
|
import com.badlogic.gdx.Game;
|
||||||
import com.badlogic.gdx.Gdx;
|
import com.badlogic.gdx.Gdx;
|
||||||
import com.badlogic.gdx.math.Rectangle;
|
import com.badlogic.gdx.math.Rectangle;
|
||||||
|
|
||||||
<<<<<<< .merge_file_a12048
|
|
||||||
import de.samdev.colorrunner.CRGame;
|
|
||||||
import de.samdev.colorrunner.game.renderer.AbstractGameRenderer;
|
|
||||||
=======
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
>>>>>>> .merge_file_a07400
|
|
||||||
import de.samdev.colorrunner.game.world.entities.CRGameEntity;
|
import de.samdev.colorrunner.game.world.entities.CRGameEntity;
|
||||||
import de.samdev.colorrunner.game.world.entities.gameentities.PlayerEntity;
|
import de.samdev.colorrunner.game.world.entities.gameentities.PlayerEntity;
|
||||||
import de.samdev.colorrunner.game.world.map.provider.MapProvider;
|
import de.samdev.colorrunner.game.world.map.provider.MapProvider;
|
||||||
import de.samdev.colorrunner.input.GameInputListener;
|
import de.samdev.colorrunner.input.GameInputListener;
|
||||||
import de.samdev.colorrunner.screens.menu.MainMenu;
|
|
||||||
|
|
||||||
public class CRGameWorld implements GameInputListener {
|
public class CRGameWorld implements GameInputListener {
|
||||||
public PlayerEntity player;
|
public PlayerEntity player;
|
||||||
|
|
Loading…
Reference in New Issue