Merge branch 'master' into refactor/panorama-names

momentum-mod · Jan 18, 2024 · 0150a6e · 0150a6e
2 parents 074aa73 + 022293f
commit 0150a6e
Show file tree

Hide file tree

Showing 7 changed files with 435 additions and 285 deletions.
diff --git a/layout/hud/cgaz.xml b/layout/hud/cgaz.xml
@@ -4,6 +4,8 @@
 	</styles>
 	<scripts>
 		<include src="file://{scripts}/common/gamemodes.js" />
+		<include src="file://{scripts}/util/math.js" />
+		<include src="file://{scripts}/util/colors.js" />
 		<include src="file://{scripts}/hud/cgaz.js" />
 	</scripts>
 

diff --git a/layout/hud/synchronizer.xml b/layout/hud/synchronizer.xml
@@ -4,7 +4,8 @@
 	</styles>
 	<scripts>
 		<include src="file://{scripts}/common/gamemodes.js" />
-		<include src="file://{scripts}/common/buttons.js" />
+		<include src="file://{scripts}/util/math.js" />
+		<include src="file://{scripts}/util/colors.js" />
 		<include src="file://{scripts}/hud/synchronizer.js" />
 	</scripts>
 	<MomHudSynchronizer class="synchronizer" alternateTicks="false">