Commit Graph

12305 Commits

Author SHA1 Message Date
94e819578e Finally fix the problem when we can't apply a ruleset in the multi screen
because it's disabled
2019-06-24 01:55:35 +03:00
60ff497add Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-24 01:06:54 +03:00
36f59ec86d Remove unused using 2019-06-21 08:29:45 -07:00
74e99b2915 Remove unused parameter 2019-06-21 08:11:10 -07:00
1d6b6a7828 Fix audio being dimmed on preview tracks 2019-06-21 08:06:57 -07:00
3ad74e2ff3 Merge branch 'master' into update-framework 2019-06-21 22:24:57 +09:00
ca2a3937ea Fix audio not dimming after race condition (#5049)
Fix audio not dimming after race condition
2019-06-21 22:24:36 +09:00
859afefb79 Prevent non-combo affecting judgements from triggering sudden death (#5095)
Prevent non-combo affecting judgements from triggering sudden death
2019-06-21 22:24:00 +09:00
13f6c6a87e Update framework 2019-06-21 15:23:35 +03:00
cff5ddb137 Merge branch 'master' into fix-inactive-audio-race 2019-06-21 21:09:12 +09:00
f766068e17 Remove local implementation of bindable in OsuCheckbox (#5046)
Remove local implementation of bindable in OsuCheckbox
2019-06-21 21:08:09 +09:00
abd0c2bb1a Move NotificationSection strings to constructor (#5078)
Move NotificationSection strings to constructor
2019-06-21 20:47:31 +09:00
67246eddd4 Merge branch 'master' into fix-chat-test-scene 2019-06-21 16:34:35 +09:00
681a123560 Merge branch 'master' into add-spacing-user-profile-ranks 2019-06-21 16:06:49 +09:00
ae084157e4 Add tournament streaming and management toolchain (#3491)
Add tournament streaming and management toolchain
2019-06-21 16:02:35 +09:00
6627cdefd2 Merge branch 'master' into tournament-tools 2019-06-21 15:52:47 +09:00
540b61da0a Add some spacing between user profile ranks 2019-06-21 15:27:19 +09:00
5ed6c09aa9 Merge branch 'master' into key-binding-fixes 2019-06-21 15:12:37 +09:00
6c5599f874 Fix chat being dismissed in test scene when it shouldn't 2019-06-21 15:09:54 +09:00
666d5744cd Fix unbinding not working correctly 2019-06-21 14:43:00 +09:00
de59e038ac Prevent non-combo affecting judgements from triggering sudden death 2019-06-21 14:29:16 +09:00
c79c4641f3 Merge branch 'master' into use-modelbackeddrawable 2019-06-21 14:26:07 +09:00
a6e5c6a62a Add cancel/clear buttons in place of instructional text 2019-06-21 13:50:05 +09:00
73d307114f Merge branch 'master' into notification-overlay-always-present 2019-06-21 13:12:04 +09:00
cbc1eff8f1 Merge branch 'master' into chat-async-improvements 2019-06-21 12:59:58 +09:00
8ab7a8641b Add comment for why it's not a fill flow 2019-06-21 12:42:35 +09:00
0571bbd555 Merge branch 'master' into carousel-gradient 2019-06-21 12:40:24 +09:00
61d8cb628a Merge branch 'master' into music-controller-always-present 2019-06-21 11:57:36 +09:00
6deee968ac Merge branch 'master' into modselect-async-improvements 2019-06-21 11:42:25 +09:00
4d02e17539 Merge branch 'master' into remove-debug-utils 2019-06-21 11:10:59 +09:00
fa263b91a7 Attempt to fix tests 2019-06-21 00:12:39 +09:00
f2200594c9 Remove necessity for MusicController to be always visible 2019-06-20 23:40:25 +09:00
52ca5f9c00 Fix mod icons in ModSelect being loaded in a blocking fashion 2019-06-20 23:06:07 +09:00
74fabf8db4 Improve ChatOverlay load behaviour 2019-06-20 23:02:02 +09:00
4a25a84975 Fix DrawableChannel async flow 2019-06-20 23:01:39 +09:00
4ef165fdac Fix ChatLine not being correctly loaded asynchronously 2019-06-20 23:01:02 +09:00
21a1fd738b Remove the necessity for NotificationOverlay to always be present
Now it will only become present when there is a pending notification.
2019-06-20 19:06:21 +09:00
9a663715cd Make get methods of ProgressNotification return correct values immediately
Previously they were only updated after the resultant schedule ran. This would not bode well when the overlay containing them is not present.
2019-06-20 19:05:33 +09:00
6bc2cf85d1 Move NotificationSection strings to constructor 2019-06-20 17:41:12 +09:00
65c84428cc Fix position of gradient in beatmap carousel 2019-06-20 15:05:15 +09:00
ca919f02e6 Remove bad words on code comments 2019-06-19 21:33:58 -07:00
97d65783db Remove osu!-side DebugUtils 2019-06-20 12:48:45 +09:00
133c1fc0f1 Merge branch 'master' into remove-osu-checkbox-bindable 2019-06-20 11:33:39 +09:00
7482ecb8e7 Fix beatmap set cover goes out of its container (#5073)
Fix beatmap set cover goes out of its container
2019-06-20 11:21:22 +09:00
0da8a483c5 Fix scores header is visible even if no scores are loaded 2019-06-19 23:14:53 +03:00
ee2268caba Enable masking for the beatmap set cover 2019-06-19 21:20:00 +03:00
5f5441c692 Add ShowPlaceholderOnNull in updateable flag + do not show placeholders in some overlays 2019-06-19 20:17:02 +03:00
865af00ab6 Merge branch 'master' into header-improvements 2019-06-19 20:00:28 +03:00
08cf8dd299 Adjust for readability 2019-06-20 01:39:54 +09:00
2773cfba42 Merge branch 'master' into andy840119/_20190614_hidden_nod_label_when_empty 2019-06-20 01:35:24 +09:00