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

This commit is contained in:
austin 2021-06-11 23:16:48 -04:00
commit c5bf84a8cd

View File

@ -674,6 +674,10 @@ public class RenderUtils {
// currentModel.draw(); // currentModel.draw();
// } // }
} }
<<<<<<< HEAD
=======
boolean renderHitboxes = false;
>>>>>>> 1f90094761262a9a137f96e246d1fbd70437a8b8
if(renderHitboxes){ if(renderHitboxes){
for(Entity currentHitbox : Globals.hitboxManager.getAllHitboxes()){ for(Entity currentHitbox : Globals.hitboxManager.getAllHitboxes()){
Model hitboxModel; Model hitboxModel;