Merge branch 'dev' of ssh://git.austinwhoover.com:222/gitadmin/Renderer into dev

2021-06-11 23:16:48 -04:00 · 2021-06-11 23:16:48 -04:00 · c5bf84a8cd
commit c5bf84a8cd
parent ba494b32b5 1f90094761
1 changed files with 4 additions and 0 deletions
--- a/src/main/java/electrosphere/renderer/RenderUtils.java
+++ b/src/main/java/electrosphere/renderer/RenderUtils.java
@ -674,6 +674,10 @@ public class RenderUtils {
 //                    currentModel.draw();
 //                }
        }
+<<<<<<< HEAD
+=======
+        boolean renderHitboxes = false;
+>>>>>>> 1f90094761262a9a137f96e246d1fbd70437a8b8
        if(renderHitboxes){
            for(Entity currentHitbox : Globals.hitboxManager.getAllHitboxes()){
                Model hitboxModel;