1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 20:38:33 +08:00
Commit Graph

19431 Commits

Author SHA1 Message Date
Dean Herbert
1204c56d2d
Update framework (#5108)
Update framework

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-21 22:42:47 +09:00
Dean Herbert
3ad74e2ff3
Merge branch 'master' into update-framework 2019-06-21 22:24:57 +09:00
Dean Herbert
ca2a3937ea
Fix audio not dimming after race condition (#5049)
Fix audio not dimming after race condition
2019-06-21 22:24:36 +09:00
Dean Herbert
667125a184
Fix ModSelectOverlay tests failing due to asynchronous loading (#5104)
Fix ModSelectOverlay tests failing due to asynchronous loading

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-06-21 22:24:11 +09:00
Dean Herbert
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
KingLuigi4932
13f6c6a87e Update framework 2019-06-21 15:23:35 +03:00
Dean Herbert
cff5ddb137
Merge branch 'master' into fix-inactive-audio-race 2019-06-21 21:09:12 +09:00
Dean Herbert
f766068e17
Remove local implementation of bindable in OsuCheckbox (#5046)
Remove local implementation of bindable in OsuCheckbox
2019-06-21 21:08:09 +09:00
Dan Balasescu
bf52670d39
Merge branch 'master' into fix-modselect-tests 2019-06-21 20:54:48 +09:00
Dean Herbert
abd0c2bb1a
Move NotificationSection strings to constructor (#5078)
Move NotificationSection strings to constructor
2019-06-21 20:47:31 +09:00
Dean Herbert
c2b451a55f Fix ModSelectOverlay tests failing due to asynchronous loading 2019-06-21 17:51:25 +09:00
Dean Herbert
1c19d3a4fb
Fix chat being dismissed in test scene when it shouldn't (#5097)
Fix chat being dismissed in test scene when it shouldn't

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-06-21 17:15:34 +09:00
David Zhao
8fecd8dcdc Fix sudden death not being applied on first run 2019-06-21 16:37:06 +09:00
Dan Balasescu
67246eddd4
Merge branch 'master' into fix-chat-test-scene 2019-06-21 16:34:35 +09:00
Dan Balasescu
640dd28f1f
Merge pull request #5098 from peppy/add-spacing-user-profile-ranks
Add some spacing between user profile ranks
2019-06-21 16:21:29 +09:00
Dan Balasescu
681a123560
Merge branch 'master' into add-spacing-user-profile-ranks 2019-06-21 16:06:49 +09:00
Dean Herbert
ae084157e4
Add tournament streaming and management toolchain (#3491)
Add tournament streaming and management toolchain
2019-06-21 16:02:35 +09:00
Dan Balasescu
8cbea298d8
Merge pull request #5096 from peppy/key-binding-fixes
Add buttons to clear or cancel key binding
2019-06-21 15:55:10 +09:00
Dean Herbert
6627cdefd2
Merge branch 'master' into tournament-tools 2019-06-21 15:52:47 +09:00
smoogipoo
66b8dc2de7 Fix ladder permanently disappearing after being dragged offscreen 2019-06-21 15:47:41 +09:00
smoogipoo
5a34794240 Add default date to matches 2019-06-21 15:34:03 +09:00
Dean Herbert
19be83181f Add back missing test scene 2019-06-21 15:32:06 +09:00
Dean Herbert
540b61da0a Add some spacing between user profile ranks 2019-06-21 15:27:19 +09:00
smoogipoo
cffc82ce81 Add a max height for the ladder settings dropdowns 2019-06-21 15:22:56 +09:00
Dean Herbert
5ed6c09aa9
Merge branch 'master' into key-binding-fixes 2019-06-21 15:12:37 +09:00
Dean Herbert
6c5599f874 Fix chat being dismissed in test scene when it shouldn't 2019-06-21 15:09:54 +09:00
smoogipoo
ee30612a76 Add registry-based stable storage fallback 2019-06-21 15:07:12 +09:00
smoogipoo
12323c87ae Add VSCode debug configs 2019-06-21 15:00:48 +09:00
Dean Herbert
666d5744cd Fix unbinding not working correctly 2019-06-21 14:43:00 +09:00
Dan Balasescu
554b451e04
Merge pull request #5042 from iiSaLMaN/use-modelbackeddrawable
Use ModelBackedDrawables for Flags, Ranks and Avatars
2019-06-21 14:38:00 +09:00
David Zhao
de59e038ac Prevent non-combo affecting judgements from triggering sudden death 2019-06-21 14:29:16 +09:00
Dan Balasescu
c79c4641f3
Merge branch 'master' into use-modelbackeddrawable 2019-06-21 14:26:07 +09:00
Dean Herbert
a6e5c6a62a Add cancel/clear buttons in place of instructional text 2019-06-21 13:50:05 +09:00
Dean Herbert
f22d0fa1b4 Update test case for dynamic compilation and corret naming 2019-06-21 13:33:51 +09:00
Dan Balasescu
88f449e3a1
Merge pull request #5081 from peppy/notification-overlay-always-present
Fix NotificationOverlay being always present
2019-06-21 13:28:47 +09:00
Dan Balasescu
73d307114f
Merge branch 'master' into notification-overlay-always-present 2019-06-21 13:12:04 +09:00
Dan Balasescu
da3188b97b
Merge pull request #5082 from peppy/chat-async-improvements
Improve chat startup and channel switching performance
2019-06-21 13:11:59 +09:00
Dan Balasescu
cbc1eff8f1
Merge branch 'master' into chat-async-improvements 2019-06-21 12:59:58 +09:00
Dean Herbert
d0fb08d918
Fix position of gradient in beatmap carousel when scaling UI (#5093)
Fix position of gradient in beatmap carousel when scaling UI

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-06-21 12:59:38 +09:00
Dan Balasescu
8ab7a8641b
Add comment for why it's not a fill flow 2019-06-21 12:42:35 +09:00
Dan Balasescu
0571bbd555
Merge branch 'master' into carousel-gradient 2019-06-21 12:40:24 +09:00
Dan Balasescu
0cd3e7a35c
Merge pull request #5084 from peppy/music-controller-always-present
Remove necessity for MusicController to be always visible
2019-06-21 12:37:12 +09:00
Dan Balasescu
61d8cb628a
Merge branch 'master' into music-controller-always-present 2019-06-21 11:57:36 +09:00
Dan Balasescu
daad16b5e7
Merge pull request #5083 from peppy/modselect-async-improvements
Fix mod icons in ModSelect being loaded in a blocking fashion
2019-06-21 11:53:17 +09:00
Dan Balasescu
6deee968ac
Merge branch 'master' into modselect-async-improvements 2019-06-21 11:42:25 +09:00
Dan Balasescu
cd52dbf1a7
Merge pull request #5076 from peppy/remove-debug-utils
Remove osu!-side DebugUtils
2019-06-21 11:25:22 +09:00
Dan Balasescu
4d02e17539
Merge branch 'master' into remove-debug-utils 2019-06-21 11:10:59 +09:00
Dean Herbert
fa94f063be Use correct button type 2019-06-21 00:26:55 +09:00
Dean Herbert
fa263b91a7 Attempt to fix tests 2019-06-21 00:12:39 +09:00
Dean Herbert
7b4180ce86 Fix failing test 2019-06-20 23:51:47 +09:00