Closed AGame-1 closed 1 year ago
Since there was a significant amount of things that were changed since I made the first pull request, I decided to make a second one and compact all the changes into one commit.
FYI, you can squash several commits into one without needing a new PR, and there's even an option when hitting the merge button to squash all commits into one before merging.
https://stackoverflow.com/questions/5189560/how-do-i-squash-my-last-n-commits-together
You'll need to do a force push which can be dangerous if you're not careful, but for stuff like this that should be totally fine.
Ahhhhh dangit, the mute taunts option cuts off the password entry field when auto login is set to User We could look into making it scroll, to the chagrin of people who hate having a million toggles, or we could just let it be a hidden prefs variable.
Aaagh noooooooo I'll look into fixing that later, but for now I think it can be relegated to a hidden pref (sadly)
Ok I was able to get it to scroll pretty easily, but it's a little awkward since the bar can scroll even when the auto login is set to "None" or "Guest". Even commenting out the line that makes it always on doesn't help, since they're basically two blank spaces no matter what. That might be fixable but I think a hidden prefs variable is probably the way to go here.
diff --git a/Marble Blast Platinum/platinum/client/ui/OptionsGui.gui b/Marble Blast Platinum/platinum/client/ui/OptionsGui.gui
index 179d4048..cb8c92ff 100644
--- a/Marble Blast Platinum/platinum/client/ui/OptionsGui.gui
+++ b/Marble Blast Platinum/platinum/client/ui/OptionsGui.gui
@@ -1124,8 +1124,8 @@ new GuiControl(OptionsGui) {
controlLeft = "OptionsControlsKeyboardButton";
};
};
- new GuiControl(OptionsOnlinePanel) {
- profile = "GuiDefaultProfile";
+ new GuiScrollCtrl(OptionsOnlinePanel) {
+ profile = "PQScrollProfile";
horizSizing = "right";
vertSizing = "bottom";
position = "30 88";
@@ -1133,6 +1133,11 @@ new GuiControl(OptionsGui) {
minExtent = "8 8";
visible = "0";
helpTag = "0";
+ willFirstRespond = "1";
+ hScrollBar = "alwaysOff";
+ //vScrollBar = "alwaysOn";
+ constantThumbHeight = "0";
+ childMargin = "0 0";
new GuiControl(OptionsOnlineContent) {
profile = "GuiDefaultProfile";
So removing the optionsGui changes will fix it, really doesn't matter anymore.
I'm having a bit of trouble force pushing... so if I undo my change, without squashing my commits, will the merge squash them?
There's probably some better way to do this, but it doesn't really change anything in the long run.
lol this is becoming a mess
Don't worry about the commits too much. I can help you squash them all together if you really want. I do see two similar copies of the same commit with a merge commit after, which is a little weird, but it's not the biggest deal in the world.
After one last test of everything, it all looks good! Thanks for your contribution!
:hype:
Versions of Pianoforte from 1.50 and 1.14 added to the jukebox, similar to the legacy soundtracks already in-game.
Added an option to disable taunts in Multiplayer.
Added "waiting.png" from MBP 1.50 to the MBP UI texture pack.
Debug mode will no longer spam the console with unused mode callback messages.
You are no longer able to select Pianoforte to be the song for a level, since it wouldn't do anything.