diff --git a/checkstyle.json b/checkstyle.json index 3da04230f..dc89409da 100644 --- a/checkstyle.json +++ b/checkstyle.json @@ -312,7 +312,8 @@ "props": { "ignoreExtern": true, "format": "^[a-z][a-zA-Z0-9]*$", - "tokens": [] + "tokens": [], + "severity": "IGNORE" }, "type": "MethodName" }, diff --git a/hmm.json b/hmm.json index fd6da955c..c53a1143b 100644 --- a/hmm.json +++ b/hmm.json @@ -4,21 +4,21 @@ "name": "discord_rpc", "type": "git", "dir": null, - "ref": "2d83fa8", + "ref": "2d83fa863ef0c1eace5f1cf67c3ac315d1a3a8a5", "url": "https://github.com/Aidan63/linc_discord-rpc" }, { "name": "flixel", "type": "git", "dir": null, - "ref": "5823c46b4e7410372d58b99f8d5c52fc18b3cb3d", + "ref": "a7d8e3bad89a0a3506a4714121f73d8e34522c49", "url": "https://github.com/FunkinCrew/flixel" }, { "name": "flixel-addons", "type": "git", "dir": null, - "ref": "a523c3b", + "ref": "a523c3b56622f0640933944171efed46929e360e", "url": "https://github.com/FunkinCrew/flixel-addons" }, { @@ -30,14 +30,14 @@ "name": "flixel-ui", "type": "git", "dir": null, - "ref": "719b4f1", + "ref": "719b4f10d94186ed55f6fef1b6618d32abec8c15", "url": "https://github.com/HaxeFlixel/flixel-ui" }, { "name": "flxanimate", "type": "git", "dir": null, - "ref": "17e0d59", + "ref": "17e0d59fdbc2b6283a5c0e4df41f1c7f27b71c49", "url": "https://github.com/FunkinCrew/flxanimate" }, { @@ -49,7 +49,7 @@ "name": "funkVis", "type": "git", "dir": null, - "ref": "7fc9901", + "ref": "7fc9901553fbe9b8fcf6e2e84bc86eabeaf29701", "url": "https://github.com/FunkinCrew/funkVis" }, { @@ -61,14 +61,14 @@ "name": "haxeui-core", "type": "git", "dir": null, - "ref": "0212d8fd", + "ref": "0212d8fdfcafeb5f0d5a41e1ddba8ff21d0e183b", "url": "https://github.com/haxeui/haxeui-core" }, { "name": "haxeui-flixel", "type": "git", "dir": null, - "ref": "63a906a", + "ref": "63a906a6148958dbfde8c7b48d90b0693767fd95", "url": "https://github.com/haxeui/haxeui-flixel" }, { @@ -80,7 +80,7 @@ "name": "hxCodec", "type": "git", "dir": null, - "ref": "387e166", + "ref": "387e1665d6feb5762358134f168e6ebfe46acec8", "url": "https://github.com/FunkinCrew/hxCodec" }, { @@ -92,7 +92,7 @@ "name": "hxcpp-debug-server", "type": "git", "dir": "hxcpp-debug-server", - "ref": "1472941", + "ref": "147294123f983e35f50a966741474438069a7a8f", "url": "https://github.com/FunkinCrew/hxcpp-debugger" }, { @@ -104,7 +104,7 @@ "name": "json2object", "type": "git", "dir": null, - "ref": "a8c26f1", + "ref": "a8c26f18463c98da32f744c214fe02273e1823fa", "url": "https://github.com/FunkinCrew/json2object" }, { @@ -118,28 +118,28 @@ "name": "mconsole", "type": "git", "dir": null, - "ref": "06c0499", + "ref": "06c0499ed8f80628a0e6e55ffa32c3cbd688a838", "url": "https://github.com/massive-oss/mconsole" }, { "name": "mcover", "type": "git", "dir": "src", - "ref": "c3c47cd", + "ref": "c3c47cd682b0b202a41caee95321989391b617ef", "url": "https://github.com/massive-oss/mcover" }, { "name": "mockatoo", "type": "git", "dir": "src", - "ref": "13d77a0", + "ref": "13d77a0a8eaf5e789ef5dae6cd33eee812deda36", "url": "https://github.com/FunkinCrew/mockatoo" }, { "name": "munit", "type": "git", "dir": "src", - "ref": "f61be7f", + "ref": "f61be7f7ba796595f45023ca65164a485aba0e7e", "url": "https://github.com/FunkinCrew/MassiveUnit" }, { @@ -171,4 +171,4 @@ "url": "https://github.com/FunkinCrew/thx.semver" } ] -} +} \ No newline at end of file diff --git a/source/Main.hx b/source/Main.hx index 35d7bf602..cbfc3ac63 100644 --- a/source/Main.hx +++ b/source/Main.hx @@ -113,6 +113,8 @@ class Main extends Sprite addChild(game); + game.debugger.interaction.addTool(new funkin.util.TrackerToolButtonUtil()); + addChild(fpsCounter); #if hxcpp_debug_server @@ -129,6 +131,7 @@ class Main extends Sprite // - It scans the class path and registers any HaxeUI components. Toolkit.init(); Toolkit.theme = 'dark'; // don't be cringe + // Toolkit.theme = 'light'; // embrace cringe Toolkit.autoScale = false; // Don't focus on UI elements when they first appear. haxe.ui.focus.FocusManager.instance.autoFocus = false; diff --git a/source/funkin/util/TrackerToolButtonUtil.hx b/source/funkin/util/TrackerToolButtonUtil.hx new file mode 100644 index 000000000..161d92650 --- /dev/null +++ b/source/funkin/util/TrackerToolButtonUtil.hx @@ -0,0 +1,31 @@ +package funkin.util; + +import flixel.system.debug.interaction.tools.Pointer.GraphicCursorCross; +import flixel.system.debug.interaction.Interaction; +import flixel.system.debug.interaction.tools.Tool; + +/** + * the name is a bit of a mouthful, but this adds a button to the + * FlxDebugger Interaction window, which when pressed will open a + * tracking window corresponding to whatever currently selected objects are + */ +class TrackerToolButtonUtil extends Tool +{ + override function init(brain:Interaction):Tool + { + super.init(brain); + + _name = "Add Tracker"; + setButton(GraphicCursorCross); + + button.upHandler = function() { + brain.selectedItems.forEach(function(item) { + FlxG.debugger.track(item); + }); + }; + + button.toggleMode = false; + + return this; + } +}