diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index da5eaf0..0000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.j3o filter=lfs diff=lfs merge=lfs -text diff --git a/assets/Materials/Generated/model2-Hair001_baked_006.j3m b/assets/Materials/Generated/model2-Hair001_baked_006.j3m deleted file mode 100644 index 0a830cc..0000000 --- a/assets/Materials/Generated/model2-Hair001_baked_006.j3m +++ /dev/null @@ -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 - } -} diff --git a/assets/Materials/Generated/model2-Hair001_baked_2391.j3m b/assets/Materials/Generated/model2-Hair001_baked_2391.j3m deleted file mode 100644 index 644fd8f..0000000 --- a/assets/Materials/Generated/model2-Hair001_baked_2391.j3m +++ /dev/null @@ -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 - } -} diff --git a/assets/Materials/PinkHair.j3m b/assets/Materials/PinkHair.j3m deleted file mode 100644 index be5428c..0000000 --- a/assets/Materials/PinkHair.j3m +++ /dev/null @@ -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 { - } -} diff --git a/assets/Models/Oto.mesh.j3o b/assets/Models/Oto.mesh.j3o index 78a56be..d35803a 100644 Binary files a/assets/Models/Oto.mesh.j3o and b/assets/Models/Oto.mesh.j3o differ diff --git a/assets/Models/model5/model5.j3o b/assets/Models/model5/model5.j3o deleted file mode 100644 index 22e7515..0000000 --- a/assets/Models/model5/model5.j3o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:176f45a93d4e1074dd77f53868dba0a1b05dbbd858a4f2a2b67311ec13308331 -size 120792010 diff --git a/assets/Models/model5/model5.j3odata b/assets/Models/model5/model5.j3odata deleted file mode 100644 index f73bdad..0000000 --- a/assets/Models/model5/model5.j3odata +++ /dev/null @@ -1,3 +0,0 @@ -# -#Sun Jun 28 15:49:26 KST 2020 -ORIGINAL_PATH=Models/model5/model5.gltf diff --git a/assets/Models/test ava/test ava.j3o b/assets/Models/test ava/test ava.j3o index ecc453d..d33fb76 100644 Binary files a/assets/Models/test ava/test ava.j3o and b/assets/Models/test ava/test ava.j3o differ diff --git a/assets/Scenes/TestLevel.j3o b/assets/Scenes/TestLevel.j3o index 5a454a5..65061fd 100644 Binary files a/assets/Scenes/TestLevel.j3o and b/assets/Scenes/TestLevel.j3o differ diff --git a/assets/Scenes/TestLevel2.j3o b/assets/Scenes/TestLevel2.j3o deleted file mode 100644 index d5a1c53..0000000 --- a/assets/Scenes/TestLevel2.j3o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a1e76295163b1d07e43a734e54c4e8ea440ebb6af63240eb015a095311d6765 -size 155133 diff --git a/assets/Scenes/TestLevel2.j3odata b/assets/Scenes/TestLevel2.j3odata deleted file mode 100644 index 8a842a7..0000000 --- a/assets/Scenes/TestLevel2.j3odata +++ /dev/null @@ -1,3 +0,0 @@ -# -#Wed Jun 17 10:55:55 KST 2020 -ORIGINAL_PATH=Scenes/TestLevel.j3o diff --git a/build/classes/mygame/Main.class b/build/classes/mygame/Main.class index 083f205..98689ab 100644 Binary files a/build/classes/mygame/Main.class and b/build/classes/mygame/Main.class differ diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index f15cd3b..bd3a23f 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -5,10 +5,8 @@ file:/E:/GameProjects/Rabi-Bounce-Bounce-R/src/mygame/Main.java file:/E:/GameProjects/Rabi-Bounce-Bounce-R/src/mygame/appstate/RunLevel.java - file:/E:/GameProjects/Rabi-Bounce-Bounce-R/src/mygame/control/PhysicsControl.java file:/E:/GameProjects/Rabi-Bounce-Bounce-R/src/mygame/control/PlayableCharacter.java file:/E:/GameProjects/Rabi-Bounce-Bounce-R/src/mygame/server/ServerMain.java - file:/E:/GameProjects/Rabi-Bounce-Bounce-R/src/mygame/server/Instance.java file:/E:/GameProjects/Rabi-Bounce-Bounce-R/src/mygame/control/NetworkPlayableCharacter.java diff --git a/nbproject/project.properties b/nbproject/project.properties index 44764bc..3e5ae05 100644 --- a/nbproject/project.properties +++ b/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} diff --git a/src/mygame/Main.java b/src/mygame/Main.java index 7b5a04d..3f284a3 100644 --- a/src/mygame/Main.java +++ b/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); }