Revert "Added instanced player messaging. Correct Player Joining/Leaving bugs."

This reverts commit c028e94d2c.

.gitattributes

@@ -1 +0,0 @@
-*.j3o filter=lfs diff=lfs merge=lfs -text

assets/Materials/Generated/model2-Hair001_baked_006.j3m

@@ -1,27 +0,0 @@
-Material MyMaterial : Common/MatDefs/Light/PBRLighting.j3md {
-    MaterialParameters {
-        Glossiness : 1.0
-        EmissivePower : 3.0
-        BaseColor : 1.0 1.0 1.0 1.0
-        ParallaxHeight : 0.05
-        Metallic : 0.0
-        BackfaceShadows : false
-        Roughness : 0.0
-        NormalType : -1.0
-        Emissive : 0.0 0.0 0.0 1.0
-        EmissiveIntensity : 2.0
-        BaseColorMap : Texture2D[name=image6.png, image=Image[size=1024x256, format=ABGR8, id=323]]:returned null key
-        Specular : 1.0 1.0 1.0 1.0
-    }
-    AdditionalRenderState {
-        PointSprite On
-        FaceCull Off
-        AlphaTestFalloff 0.0
-        DepthWrite On
-        ColorWrite On
-        PolyOffset 0.0 0.0
-        DepthTest On
-        Blend Off
-        Wireframe Off
-    }
-}

assets/Materials/Generated/model2-Hair001_baked_2391.j3m

@@ -1,23 +0,0 @@
-Material MyMaterial : Common/MatDefs/Light/Lighting.j3md {
-    MaterialParameters {
-        Diffuse : 0.64000005 0.64000005 0.64000005 1.0
-        UseMaterialColors : true
-        ParallaxHeight : 0.05
-        Ambient : 1.0 1.0 1.0 1.0
-        BackfaceShadows : false
-        DiffuseMap : Texture2D[name=Atlas_40637.png, image=Image[size=8192x4096, format=RGBA8, id=481]]:returned null key
-        Specular : 0.4 0.4 0.4 1.0
-        Shininess : 128.0
-    }
-    AdditionalRenderState {
-        PointSprite On
-        FaceCull Back
-        AlphaTestFalloff 0.0
-        DepthWrite On
-        ColorWrite On
-        PolyOffset 0.0 0.0
-        DepthTest On
-        Blend Off
-        Wireframe Off
-    }
-}

assets/Materials/PinkHair.j3m

@@ -1,9 +0,0 @@
-Material PinkHair : Common/MatDefs/Light/Lighting.j3md {
-     MaterialParameters {
-        Diffuse : 1.0 0.2 1.0 1.0
-        VertexLighting : false
-        UseMaterialColors : true
-     }
-    AdditionalRenderState {
-    }
-}

assets/Models/model5/model5.j3o

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:176f45a93d4e1074dd77f53868dba0a1b05dbbd858a4f2a2b67311ec13308331
-size 120792010

assets/Models/model5/model5.j3odata

@@ -1,3 +0,0 @@
-#
-#Sun Jun 28 15:49:26 KST 2020
-ORIGINAL_PATH=Models/model5/model5.gltf

assets/Scenes/TestLevel2.j3o

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7a1e76295163b1d07e43a734e54c4e8ea440ebb6af63240eb015a095311d6765
-size 155133

assets/Scenes/TestLevel2.j3odata

@@ -1,3 +0,0 @@
-#
-#Wed Jun 17 10:55:55 KST 2020
-ORIGINAL_PATH=Scenes/TestLevel.j3o

nbproject/private/private.xml

@@ -5,10 +5,8 @@
         <group>
             <file>file:/E:/GameProjects/Rabi-Bounce-Bounce-R/src/mygame/Main.java</file>
             <file>file:/E:/GameProjects/Rabi-Bounce-Bounce-R/src/mygame/appstate/RunLevel.java</file>
-            <file>file:/E:/GameProjects/Rabi-Bounce-Bounce-R/src/mygame/control/PhysicsControl.java</file>
             <file>file:/E:/GameProjects/Rabi-Bounce-Bounce-R/src/mygame/control/PlayableCharacter.java</file>
             <file>file:/E:/GameProjects/Rabi-Bounce-Bounce-R/src/mygame/server/ServerMain.java</file>
-            <file>file:/E:/GameProjects/Rabi-Bounce-Bounce-R/src/mygame/server/Instance.java</file>
             <file>file:/E:/GameProjects/Rabi-Bounce-Bounce-R/src/mygame/control/NetworkPlayableCharacter.java</file>
         </group>
     </open-files>

nbproject/project.properties

@@ -51,8 +51,8 @@ javac.deprecation=false
 javac.external.vm=false
 javac.processorpath=\
     ${javac.classpath}
-javac.source=1.8
-javac.target=1.8
+javac.source=1.7
+javac.target=1.7
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}

src/mygame/Main.java

@@ -68,7 +68,7 @@ public class Main extends SimpleApplication implements ClientStateListener{
     public void simpleInitApp() {
         flyCam.setEnabled(false);
         //flyCam.setMoveSpeed(50);
-        level = new RunLevel("TestLevel2");
+        level = new RunLevel("TestLevel");
         stateManager.attach(level);
     }