1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 22:27:25 +08:00
Commit Graph

13722 Commits

Author SHA1 Message Date
Dean Herbert
4f1b7c8065
Merge branch 'master' into reduce-panel-width 2018-07-17 04:20:40 +09:00
Dean Herbert
c1b8a88e39
Merge pull request #3048 from peppy/use-has-flags
Use Enum.HasFlag
2018-07-17 04:20:25 +09:00
Dean Herbert
84c13174d9
Merge branch 'master' into use-has-flags 2018-07-17 03:50:40 +09:00
Dean Herbert
f153f39596
Merge pull request #3031 from peppy/make-notifications-quieter
Make notifications less noisy
2018-07-17 03:50:27 +09:00
Dean Herbert
40a1f8313e
Merge branch 'master' into make-notifications-quieter 2018-07-17 03:24:47 +09:00
Dean Herbert
7f4c6cad8c
Merge pull request #3023 from morguldir/fix_color_parsing
Only read numbers when handling colors.
2018-07-17 01:23:45 +09:00
Dean Herbert
f4591c6d0b
Merge branch 'master' into fix_color_parsing 2018-07-17 00:25:32 +09:00
Dean Herbert
1c1e34ecf6
Merge pull request #3006 from HoutarouOreki/correctQuickFade
Instantly hide content for quick retry
2018-07-17 00:25:27 +09:00
Dean Herbert
da300baff1 Update hide logic 2018-07-17 00:06:51 +09:00
Dean Herbert
ca7b61367f
Merge branch 'master' into correctQuickFade 2018-07-17 00:02:15 +09:00
morguldir
fc77e01ba9 Fix formatting, make StripComments protected
Don't strip comments when calling ParseLine
2018-07-16 16:35:55 +02:00
Dean Herbert
58fe434dd0 Don't use in invalidation logic to avoid incorrect execution 2018-07-16 16:39:52 +09:00
Dean Herbert
98cddc0c04 Fix some legacy cases 2018-07-16 16:26:37 +09:00
Dean Herbert
dbc538abbe Use Enum.HasFlag
With .NET core 2.0+ this is as efficient as the ugly code we've been using.
2018-07-16 16:18:46 +09:00
Dean Herbert
a117b323e2
Merge branch 'master' into make-notifications-quieter 2018-07-16 13:15:07 +09:00
Dean Herbert
a12c47536b Change default to being important 2018-07-16 13:00:21 +09:00
morguldir
429306aa87 Fix casing, use ordinal string comparison when stripping comments 2018-07-16 01:54:20 +02:00
morguldir
87a4bf3d92 Remove using directive for regex in LegacyDecoder 2018-07-16 01:08:30 +02:00
morguldir
6c861a1638 Strip comments from everything except metadata 2018-07-16 01:04:41 +02:00
Dean Herbert
bb7d0715b1
Merge pull request #2950 from naoey/download-button-state
Add download state indicators to osu!direct panels
2018-07-16 03:25:39 +09:00
Dean Herbert
4829f4f09c
Merge branch 'master' into download-button-state 2018-07-16 03:17:26 +09:00
HoutarouOreki
453d58bcbd Hide Content instead of particular overlays 2018-07-15 01:10:05 +02:00
Dean Herbert
8e5c93e3ca
Merge pull request #3035 from turbedi/patch-1
Fix KeyCounter counting clicks when game is paused
2018-07-14 12:13:57 +09:00
Berkan Diler
c8697e1743
Fix KeyCounter counting clicks when game is paused 2018-07-14 03:08:28 +02:00
Dean Herbert
730eb2daa2 Reduce osu!direct panel width to allow three panels displayed at 16:9 resolutions 2018-07-14 03:47:56 +09:00
Dean Herbert
81e5a37d6d Enlist a few more important notifications 2018-07-14 03:31:19 +09:00
Dean Herbert
7c3b0dc919
Merge pull request #2990 from HoutarouOreki/lesserSideKeys
Make arrow keys change settings at the lowest possible intervals
2018-07-14 00:38:48 +09:00
Dean Herbert
e0bcd6988a
Merge branch 'master' into lesserSideKeys 2018-07-13 23:32:44 +09:00
Dean Herbert
d63611a9b3
Merge branch 'master' into fix-incorrect-mods 2018-07-13 22:08:21 +09:00
Dean Herbert
6698f320fb
Merge branch 'master' into download-button-state 2018-07-13 22:05:26 +09:00
Dean Herbert
4f5578245e Fix regression causing previews to not play 2018-07-13 21:45:49 +09:00
Dean Herbert
63c40e9051 Remove unnecessary cache operations 2018-07-13 21:45:42 +09:00
Dean Herbert
ac35e8bd99 Remove redundant empty statement 2018-07-13 21:27:09 +09:00
Dean Herbert
ac4f25c5bc Make notifications less noisy 2018-07-13 21:25:08 +09:00
Dan Balasescu
d08c44a726
Merge pull request #3030 from peppy/focused-overlay-blocks-select
Make focused overlays block "select" and keys
2018-07-13 21:20:43 +09:00
Dean Herbert
fc3aff6689 Fix initial colour 2018-07-13 21:19:10 +09:00
Dean Herbert
6d8923a37c Use better logic 2018-07-13 21:08:41 +09:00
Dan Balasescu
ce804461e8
Merge branch 'master' into focused-overlay-blocks-select 2018-07-13 21:06:59 +09:00
Dean Herbert
a1a077398c Merge remote-tracking branch 'upstream/master' into peppy-clickable-download-notifications 2018-07-13 21:04:17 +09:00
Dean Herbert
95f314d949 Fix crash when clicking notification from player 2018-07-13 21:04:10 +09:00
Dean Herbert
b33a0f772e Don't close toolbar 2018-07-13 21:00:52 +09:00
Dean Herbert
7b106bd0c1
Merge pull request #3029 from peppy/fix-informational-overlay-hiding
Fix informational overlays not hiding when user toggles other overlay views
2018-07-13 20:56:01 +09:00
Dean Herbert
67e7e371cc Also block keyboard completely 2018-07-13 20:40:49 +09:00
Dean Herbert
3308f8f823 Fix focused overlays not blocking select action 2018-07-13 20:37:49 +09:00
Dean Herbert
96eb44425b Fix informational overlays not hiding when user toggles other overlay views
Closes #3014.
2018-07-13 20:34:41 +09:00
Dan Balasescu
9d8060d5e0
Merge pull request #2975 from thatprogrammer1/osu-default-bindings
Change osu!standard default key bindings
2018-07-13 20:33:24 +09:00
Dan Balasescu
9153c7ecfb
Merge branch 'master' into osu-default-bindings 2018-07-13 20:23:27 +09:00
Dean Herbert
bbb11a4066 Fix regression in drawable rank first display 2018-07-13 19:53:29 +09:00
Dan Balasescu
eeb6bdef93
Merge pull request #3027 from peppy/remove-migration-notice
Remove migration log output
2018-07-13 19:40:07 +09:00
smoogipoo
2d8e2dc5f7 Merge remote-tracking branch 'origin/master' into osu-default-bindings 2018-07-13 19:32:40 +09:00