1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 23:52:57 +08:00
Commit Graph

7886 Commits

Author SHA1 Message Date
Dean Herbert
699f661b02 Merge remote-tracking branch 'upstream/master' into AlFasGD-editor-seekbar-fix 2018-05-25 19:07:30 +09:00
Dean Herbert
cc69f07172 Merge remote-tracking branch 'upstream/master' into jorolf-open-external 2018-05-25 18:52:05 +09:00
Dean Herbert
1cb7d50407 Add and use default size (smaller than before) 2018-05-25 18:51:57 +09:00
Dean Herbert
1b5bb79fe9 Merge remote-tracking branch 'upstream/master' into jorolf-open-external 2018-05-25 18:50:30 +09:00
Dean Herbert
28aa6faef9
Merge branch 'master' into player_loader_input_toggles 2018-05-25 18:38:12 +09:00
Dean Herbert
385c2c5c86
Merge branch 'master' into musiccontroller-nullref 2018-05-25 11:01:09 +09:00
Dean Herbert
568d4882c6
Remove unnecessary null coalesce 2018-05-25 11:00:56 +09:00
Aergwyn
0c0f86fe26 fix incorrect default values keeping overlays in wrong state 2018-05-23 16:25:10 +02:00
smoogipoo
f894d73501 Fix possible MusicController nullref 2018-05-23 14:36:09 +09:00
Aergwyn
76fbc656a1 fix disclaimer allowing notifications 2018-05-22 17:53:36 +02:00
jorolf
8fbda5bc59 add license header 2018-05-22 15:41:10 +02:00
jorolf
b324337fa1 Add icon next to beatmap title/username to open in browser 2018-05-22 15:29:52 +02:00
Dean Herbert
ef40ca8805
Merge branch 'master' into respect-showoverlay-bindable 2018-05-22 19:00:42 +09:00
Dan Balasescu
99163ca8ba
Merge branch 'master' into fix-main-menu-escape 2018-05-22 18:17:51 +09:00
smoogipoo
0e122468db Fix progress easing to 0 if aborting after confirmation 2018-05-22 18:06:40 +09:00
Dean Herbert
d43e4af8ea Fix overlap between quit button at key input overlay 2018-05-22 16:45:42 +09:00
Dean Herbert
436067c01f Handle scale back in a nicer way 2018-05-22 16:44:37 +09:00
Dean Herbert
7b770d03c5 Use OnMouseMove instead of Update logic 2018-05-22 16:26:59 +09:00
Dean Herbert
babb7d5158 Fix white ring flash when holding button post-confirmation 2018-05-22 16:23:05 +09:00
Dean Herbert
5f8eb6d823 Fix class name 2018-05-22 16:04:36 +09:00
Dean Herbert
8fbda9d57e Improve comment 2018-05-22 16:04:07 +09:00
Dean Herbert
58ae545747 innerCircle -> overlayCircle 2018-05-22 15:59:53 +09:00
Dean Herbert
ef55c3c197 Fix icon scale not resetting due to no implicit triggering 2018-05-22 15:58:17 +09:00
Dean Herbert
2ce2bd9788 Add comment for pendingAnimation 2018-05-22 15:58:00 +09:00
Dean Herbert
5a892e4d08 This quit button don't quit 2018-05-22 02:09:52 +09:00
Dean Herbert
323aa189b6 Make on-confirmation animation more robust 2018-05-22 02:08:44 +09:00
Dean Herbert
156d7fb25a Change depth of HUD
Yes, this is intentional.
2018-05-22 02:08:21 +09:00
Dean Herbert
946a75ddb2 Block hover to use UI cursor instead of gameplay cursor 2018-05-22 02:05:08 +09:00
Dean Herbert
ebda287e81 Share code with HoldToConfirm implementations elsewhere 2018-05-22 01:44:06 +09:00
Roman Kapustin
30956b64aa Do not change Margin for player settings groups on the PlayerLoader screen 2018-05-21 18:57:01 +03:00
Dean Herbert
f9c162dee9 Adjust design and feel 2018-05-22 00:49:33 +09:00
Aergwyn
cee8d21542 hide overlays when going back to initial menu state 2018-05-21 17:24:57 +02:00
Dean Herbert
d5afccd610 Make hint text display briefly at initial display, then on hover 2018-05-22 00:02:03 +09:00
Dean Herbert
3d9d40448d Fix incorrect syntax 2018-05-22 00:01:40 +09:00
Dean Herbert
841336a181
Merge branch 'master' into exit_replay_button 2018-05-21 23:45:06 +09:00
Dean Herbert
9820666bcf
Merge branch 'master' into respect-showoverlay-bindable 2018-05-21 23:26:34 +09:00
Dean Herbert
d109522bf7 Fix escape not working to go backwards in menus before finally exiting the game
Resolves #2596.
2018-05-21 23:09:00 +09:00
Aergwyn
b7e3ea348b expose two Bindables with split logic instead of one with mixed logic 2018-05-21 15:53:55 +02:00
AlFasGD
a54bda6ce1 Apply requested changes 2018-05-21 13:23:39 +03:00
Aergwyn
1482bca147 Rename for better understanding
ShowOverlays -> AllowOverlays
ShowOverlaysOnEnter -> HideOverlaysOnEnter
2018-05-21 09:42:29 +02:00
Dean Herbert
c48c62ea04
Merge branch 'master' into player_loader_input_toggles 2018-05-21 16:20:08 +09:00
Dean Herbert
c75ef7704a Merge remote-tracking branch 'Joehuu/master' into ocboogie-ruleset-keybindings 2018-05-21 14:49:34 +09:00
Dean Herbert
42519e3723 Rewrite code for clarity
This also uses the AvailableRulesets list rather than private IDs
2018-05-21 14:49:26 +09:00
Joehu
46c6c1d07e Allow drag clicking footer and filter on song select 2018-05-20 20:25:39 -07:00
Dean Herbert
92668f07e0
Merge branch 'master' into drawable-room-improvements 2018-05-21 11:09:12 +09:00
Dean Herbert
9f0cc7683b
Merge branch 'master' into respect-showoverlay-bindable 2018-05-21 04:43:55 +09:00
Dean Herbert
aaca7e92b4 Avoid excessive property lookups 2018-05-21 03:56:59 +09:00
Aergwyn
4d528c4e67 fix VisualTests and Samples still playing 2018-05-20 10:57:15 +02:00
DrabWeb
9cd0ec366e Cleanup. 2018-05-19 02:51:51 -03:00
DrabWeb
136c57b824 Don't set size in ctor. 2018-05-19 02:27:33 -03:00