diff --git a/assets/Data/items.json b/assets/Data/items.json index 73a74ba4..9d058978 100644 --- a/assets/Data/items.json +++ b/assets/Data/items.json @@ -57,7 +57,7 @@ "modelPath" : "Models/items/weapons/katana1alt.fbx", "weaponData" : { "weaponClass" : "sword2h", - "damage" : 34, + "damage" : 10, "hitboxes" : [ { "type": "hit_connected", diff --git a/assets/Models/creatures/viewmodel.glb b/assets/Models/creatures/viewmodel.glb index 7d049610..52be4846 100644 Binary files a/assets/Models/creatures/viewmodel.glb and b/assets/Models/creatures/viewmodel.glb differ diff --git a/buildNumber.properties b/buildNumber.properties index b316adf0..1551a78e 100644 --- a/buildNumber.properties +++ b/buildNumber.properties @@ -1,3 +1,3 @@ #maven.buildNumber.plugin properties file -#Thu Aug 08 09:35:08 EDT 2024 -buildNumber=200 +#Tue Aug 13 17:01:10 EDT 2024 +buildNumber=201 diff --git a/docs/src/progress/currenttarget.md b/docs/src/progress/currenttarget.md index e586316a..7d0dbca4 100644 --- a/docs/src/progress/currenttarget.md +++ b/docs/src/progress/currenttarget.md @@ -16,4 +16,5 @@ Stability + bug fixes - + Katana is frustum culled incorrectly + Rendering pipelines are broken when the katana is not drawn diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index fdf4409d..4673653a 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -556,6 +556,7 @@ Potential fix for client concurrency issue Debounce attack collisions Remove entities on death Remove movement restriction on attack +Update frame data for first person 2h sword swing to align with third person better and make it feel snappier # TODO diff --git a/src/main/java/electrosphere/renderer/RenderingEngine.java b/src/main/java/electrosphere/renderer/RenderingEngine.java index 247bba3f..3716b0d4 100644 --- a/src/main/java/electrosphere/renderer/RenderingEngine.java +++ b/src/main/java/electrosphere/renderer/RenderingEngine.java @@ -525,9 +525,11 @@ public class RenderingEngine { // checkError(); //check and call events and swap the buffers - LoggerInterface.loggerRenderer.DEBUG_LOOP("Swap buffers"); + LoggerInterface.loggerRenderer.DEBUG_LOOP("GLFW Swap buffers"); glfwSwapBuffers(Globals.window); + LoggerInterface.loggerRenderer.DEBUG_LOOP("GLFW Poll Events"); glfwPollEvents(); + LoggerInterface.loggerRenderer.DEBUG_LOOP("Check OpenGL Errors"); checkError(); }