Merged

2025-07-12 01:10:53 +02:00
parent 1fe051d275
commit 9dd12a55bf
1 changed files with 0 additions and 5 deletions
--- a/module.jai
+++ b/module.jai
@@ -157,11 +157,6 @@ coven_run :: (game_update_proc: (float), game_editor_update_proc: (float), game_

            if engine.current_scene != null && !engine.paused {
                update_animators(clamped_dt);
-<<<<<<< HEAD
-=======
-                update_mesh_colliders(engine.current_scene);
-                update_physics(engine.current_scene, clamped_dt);
->>>>>>> 5f61c0491241b1f62266e0d521c2e315b2c5b8e3

                pre_physx_sync(engine.current_scene);
                tick_physx(*engine.current_scene.physx_scene, clamped_dt);