Commit Graph

8848 Commits

Author SHA1 Message Date
78213e09d4 Merge branch 'master' into editor-exit-stability 2021-05-30 23:03:50 +02:00
9b239e308b Merge branch 'master' into beatmap-skin 2021-05-29 15:36:43 +09:00
f1b5aced6f Merge branch 'master' into editor-exit-stability 2021-05-28 14:32:32 +09:00
7e0a4562c9 Merge branch 'master' into fix-bad-make-current-call 2021-05-28 00:32:51 +09:00
bc4ccb8a21 Merge pull request #12916 from peppy/fix-taiko-editor-sample-mutations
Fix osu!taiko editor operations not always updating the menu/visual state correctly
2021-05-27 23:55:16 +09:00
046087a367 Fix access to AliveChildren before IsLoaded 2021-05-27 16:58:01 +09:00
14a4095140 Merge branch 'master' into beatmap-skin 2021-05-26 18:39:47 +09:00
b3b39c4c13 Fix BeatmapCarousel accessing ScreenSpaceDrawQuad of non-loaded children
Fixes failure seen at
https://ci.appveyor.com/project/peppy/osu/builds/39302762/tests.
2021-05-26 15:42:27 +09:00
268230c8c4 Merge branch 'master' into fix-taiko-editor-sample-mutations 2021-05-25 19:01:47 +09:00
6263ebf9da Merge pull request #12495 from peppy/localisation-proof-of-concept
Add language selection and general structure for localisation support
2021-05-24 23:33:49 +09:00
3b4fbe22f0 Merge pull request #12928 from Firmatorenio/fix-colour-hitmeter-not-registering-taiko-misses
Fix colour hit error meter incorrectly assuming taiko hits were of correct colour
2021-05-24 23:31:54 +09:00
eeda33a453 Merge branch 'master' into localisation-proof-of-concept 2021-05-24 22:56:18 +09:00
471f17547a switch determining the hit result by offset to getting it from the judgement directly 2021-05-24 16:49:58 +06:00
af2a831c83 Merge pull request #12926 from peppy/fix-placement-blueprint-disappearing
Fix editor placement ending early if a blueprint becomes alive from a pool
2021-05-24 17:42:18 +09:00
65c3c0d53f Merge branch 'master' into localisation-proof-of-concept 2021-05-24 17:10:56 +09:00
4fc6ba50b7 Fix editor placement ending early if a blueprint becomes alive from a pool
Closes https://github.com/ppy/osu/issues/12630.
2021-05-24 17:04:02 +09:00
e5f586f2a6 fix colour hit error meter not pushing misses when wrong colour note is hit in taiko 2021-05-24 13:29:12 +06:00
100e2d14a5 Move call inside conditional 2021-05-24 15:14:55 +09:00
a69a1b5211 Fix Player potentially running MakeCurrent when already removed from the screen stack
Closes #12919.
2021-05-24 13:53:53 +09:00
83981b692e Also handle items exiting bounds on the opposite side 2021-05-24 13:44:13 +09:00
593fea0d5f Limit automatically calculated HUD offsets to keep menu items on screen 2021-05-24 13:14:18 +09:00
d605b6bb8d Fix HUD overlay components bottom positioning logic accounting for combo 2021-05-23 16:22:51 +03:00
6751d79ce8 Fix oversight in HUD overlay components top positioning logic 2021-05-23 16:22:22 +03:00
4c9d72e62a Ensure EditorBeatmap.Update is called inside PerformOnSelection calls 2021-05-23 21:22:35 +09:00
2fd0038154 Fix checkmark being hidden after clicking current waveform opacity setting 2021-05-22 16:42:20 -07:00
34a5b22b79 Merge branch 'master' into refactor-selection-rotate-logic 2021-05-22 20:52:28 +09:00
485728ca4e Merge pull request #12866 from peppy/refactor-selection-scale-logic
Add proper scaling support to skin editor
2021-05-22 20:07:03 +09:00
b13a68592f Merge branch 'master' into localisation-proof-of-concept 2021-05-22 17:07:23 +09:00
fb5672814d Add remaining strings for ButtonSystem 2021-05-22 13:56:59 +09:00
4f6de6fdc6 Implement GetSkin() for other working beatmaps 2021-05-21 20:21:29 +03:00
bb2fae55ce Merge branch 'master' into refactor-selection-rotate-logic 2021-05-21 19:19:54 +09:00
f335337e5d Merge pull request #12851 from vininew921/applause-stops-on-score-switch
Fix applause sound stopping after switching scores
2021-05-21 18:49:59 +09:00
0acf4cf85c Translate remaining ButtonSystem strings and rename to match class name 2021-05-21 18:48:11 +09:00
df426b9334 Merge pull request #12852 from timiimit/multi-larger-freemod-overlay
Make freemod selection overlay taller in multiplayer room
2021-05-21 18:45:15 +09:00
a8acbbe69c Merge pull request #12779 from Game4all/import-from-stable-select-location
Add ability to manually locate a stable location when importing from stable
2021-05-21 18:17:30 +09:00
b0a113a36b Merge branch 'master' into localisation-proof-of-concept 2021-05-21 17:57:54 +09:00
abc96057b2 Remove relative height specification and use constant height 2021-05-21 17:55:46 +09:00
2958b9adf4 Merge branch 'master' into import-from-stable-select-location 2021-05-21 17:37:34 +09:00
1ca563e831 Merge branch 'master' into applause-stops-on-score-switch 2021-05-21 17:28:28 +09:00
20f890cfd0 Merge branch 'master' into fix-spectator-playing-state-5 2021-05-21 16:49:22 +09:00
36aa186c6e Merge branch 'thread-safe-spectator-client' 2021-05-21 16:00:24 +09:00
895eb14c5a Forcefully end playing to fix test failures 2021-05-21 14:09:30 +09:00
7ad6a1d5ff Merge branch 'master' into thread-safe-spectator-client 2021-05-21 11:47:58 +09:00
527847596e Merge pull request #12884 from peppy/ternary-menu-item-refactor
Create base implementations of the two most common `TernaryStateMenuItem`s
2021-05-20 21:02:15 +09:00
e3284b976d Merge branch 'thread-safe-spectator-client' into fix-spectator-playing-state-5 2021-05-20 19:46:26 +09:00
5a8b8782d3 Fix WatchUser being called asynchronously in BDL 2021-05-20 19:44:43 +09:00
ee4bca9ed1 Handle collection changed event 2021-05-20 19:37:43 +09:00
df5970fab4 Create base implementations of the two most common TernaryStateMenuItems 2021-05-20 19:34:53 +09:00
7ee81669f7 Remove bind helpers from SpectatorClient 2021-05-20 19:27:43 +09:00
2896da499d Merge branch 'restructure-spectator-client' into thread-safe-spectator-client 2021-05-20 18:53:54 +09:00