Beta Version [Meta Pull Request]#1129
Conversation
8f8f7df to
613be13
Compare
…ror, and fix interaction with Alt+V on macOS
# Conflicts: # src/screens/UScreenSong.pas
# Conflicts: # src/screens/UScreenScore.pas # src/screens/UScreenSong.pas # src/screens/UScreenTop5.pas
# Conflicts: # src/screens/UScreenSong.pas
# Conflicts: # game/languages/English.ini # game/languages/German.ini # src/base/UDraw.pas # src/base/UThemes.pas # src/screens/UScreenJukebox.pas # src/screens/UScreenJukeboxOptions.pas # src/screens/UScreenJukeboxPlaylist.pas # src/screens/UScreenOptionsJukebox.pas # src/screens/UScreenSong.pas
# Conflicts: # game/themes/Modern.ini # src/base/UIni.pas # src/base/USingScores.pas # src/screens/UScreenName.pas # src/screens/UScreenScore.pas # src/screens/views/UScreenSingView.pas
# Conflicts: # game/themes/Modern/[name]noavatar.png # game/themes/Modern/[sing.player]lyric_active.png # game/themes/Modern/[sing.player]lyric_inactive.png # src/screens/UScreenSong.pas
|
FYI, at this point the spam this "PR" is causing in other legit issues and PRs is getting annoying and out of hand. The 5 million force-pushes on things that most of the time don't need it (they don't conflict) or sometimes even after they've already been approved (why??) are annoying enough on their own, but there's a new kid on the block and it's the six billion "mentioned this pull request/issue on ..." and I request you stop causing those. You can see the kind of spam on the Conversation tab on other issues. I don't know if it'll also trigger on just having the commits but you might want to stop doing |
|
I'd hope that this PR gets irrelevant and closed at some point. But we're not quite there yet with more people moving to this version, the situation might be better in a few months when fewer prs are open. |
# Conflicts: # src/screens/UScreenEditSub.pas # src/screens/views/UScreenSingView.pas
This pull request is not meant for merging!!
Note that this PR includes the duet highscore that adds a column to the highscore database and the nullbyte database fix that changes the database irrevocably.
Builds
I merged the PRs mainly in chronological order, which worked alright.
Instead it combines numerous open pull requests (compared to master) for beta testing purposes:
Skipped / Look unfinished / Duplicate: