diff --git a/assets/Textures/Ground/GrassTileable.png b/assets/Textures/Ground/GrassTileable.png new file mode 100644 index 00000000..4ca7be33 Binary files /dev/null and b/assets/Textures/Ground/GrassTileable.png differ diff --git a/src/main/java/electrosphere/engine/LoadingThread.java b/src/main/java/electrosphere/engine/LoadingThread.java index a7935adf..b4176eec 100644 --- a/src/main/java/electrosphere/engine/LoadingThread.java +++ b/src/main/java/electrosphere/engine/LoadingThread.java @@ -210,7 +210,7 @@ public class LoadingThread extends Thread { initCollisionEngine(Globals.RUN_SERVER); //initialize the "virtual" objects simulation - initMacroSimulation(); +// initMacroSimulation(); //initialize the "real" objects simulation initMicroSimulation(); diff --git a/src/main/java/electrosphere/game/client/cells/DrawCell.java b/src/main/java/electrosphere/game/client/cells/DrawCell.java index e9c726cf..03a992f1 100644 --- a/src/main/java/electrosphere/game/client/cells/DrawCell.java +++ b/src/main/java/electrosphere/game/client/cells/DrawCell.java @@ -44,7 +44,7 @@ public class DrawCell { static Texture groundTextureFour; static { - groundTextureOne = new Texture("/Textures/Ground/Grass1.png"); + groundTextureOne = new Texture("/Textures/Ground/GrassTileable.png"); groundTextureTwo = new Texture("/Textures/Ground/Dirt1.png"); groundTextureThree = new Texture("/Textures/Ground/Dirt1.png"); groundTextureFour = new Texture("/Textures/Ground/Dirt1.png"); diff --git a/src/main/java/electrosphere/net/server/ServerConnectionHandler.java b/src/main/java/electrosphere/net/server/ServerConnectionHandler.java index 594f079a..37e3e93b 100644 --- a/src/main/java/electrosphere/net/server/ServerConnectionHandler.java +++ b/src/main/java/electrosphere/net/server/ServerConnectionHandler.java @@ -97,7 +97,7 @@ public class ServerConnectionHandler implements Runnable { Player newPlayerObject = new Player(this); Globals.playerManager.addPlayer(newPlayerObject); //spawn player in world - Entity newPlayerCharacter = CreatureUtils.spawnBasicCreature("CUBE_MAN"); + Entity newPlayerCharacter = CreatureUtils.spawnBasicCreature("Human"); playerCharacterID = newPlayerCharacter.getId(); CollisionObjUtils.positionCharacter(newPlayerCharacter, new Vector3f(Globals.spawnPoint.x,Globals.spawnPoint.y,Globals.spawnPoint.z)); //attach player object to player character