1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 01:43:20 +08:00
Commit Graph

8684 Commits

Author SHA1 Message Date
Dean Herbert
825941aff1 Use switch with type matching in place of if-else where possible 2018-07-17 14:35:09 +09:00
Dean Herbert
b967fe714b Fix lead-in time now being long enough in many cases 2018-07-17 14:29:22 +09:00
Dan Balasescu
745d596343
Merge branch 'master' into fix-incorrect-mods 2018-07-17 13:41:02 +09:00
Dan Balasescu
7a2dc3c674
Merge branch 'master' into clickable-download-notifications 2018-07-17 13:29:16 +09:00
Dan Balasescu
61f58ed08a
Merge branch 'master' into reduce-panel-width 2018-07-17 12:51:16 +09:00
Dan Balasescu
e4fc3a1c65
Merge branch 'master' into fix-drawable-load-regression 2018-07-17 12:22:12 +09:00
Dean Herbert
4f1b7c8065
Merge branch 'master' into reduce-panel-width 2018-07-17 04:20:40 +09:00
Dean Herbert
84c13174d9
Merge branch 'master' into use-has-flags 2018-07-17 03:50:40 +09:00
Dean Herbert
40a1f8313e
Merge branch 'master' into make-notifications-quieter 2018-07-17 03:24:47 +09:00
Dean Herbert
f4591c6d0b
Merge branch 'master' into fix_color_parsing 2018-07-17 00:25:32 +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
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
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
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
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
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
Dean Herbert
bbb11a4066 Fix regression in drawable rank first display 2018-07-13 19:53:29 +09:00
Dan Balasescu
6cc0a69413
Merge branch 'master' into remove-migration-notice 2018-07-13 19:31:20 +09:00
Dean Herbert
cd31df7c2e
Merge pull request #2903 from smoogipoo/storyboard-samples
Implement storyboard sample playback
2018-07-13 18:48:05 +09:00
Dean Herbert
c160a61fb7
Merge branch 'master' into storyboard-samples 2018-07-13 18:34:51 +09:00
Dean Herbert
3f44f5c60e Remove migration log output 2018-07-13 18:34:38 +09:00
Dan Balasescu
69acb4f10e
Merge branch 'master' into improve-difficulty-icons 2018-07-13 18:27:43 +09:00
Dean Herbert
2d602c0e3c
Add todo regarding playback skip logic 2018-07-13 18:23:12 +09:00
Dean Herbert
b5a05a13ab
Merge branch 'master' into fix-ugly-line 2018-07-13 18:19:03 +09:00
Dan Balasescu
3d136ef0f9
Merge branch 'master' into fix-ugly-line 2018-07-13 18:08:55 +09:00
Dan Balasescu
1a5e77ab40
Merge branch 'master' into fix-weird-import-fail 2018-07-13 17:58:35 +09:00
Dean Herbert
159b26509b Improve visuals of difficulty icons 2018-07-13 17:15:06 +09:00
Dean Herbert
ee2c7c50ad Tidy up button hierarchy 2018-07-13 16:28:18 +09:00
Dean Herbert
0676919496 Fix incorrect corner radius 2018-07-13 14:56:44 +09:00
Dean Herbert
09be9c2ed2 Merge remote-tracking branch 'upstream/master' into naoey-download-button-state 2018-07-13 14:52:10 +09:00
Dean Herbert
ac078153ae Merge remote-tracking branch 'upstream/master' into peppy-fix-incorrect-mods 2018-07-13 14:20:56 +09:00
Criminalllz
a9f8c2acb8 Use Regex to only care about colors and commas when parsing a color. 2018-07-12 20:36:57 +02:00
Dan Balasescu
3a9929d466
Merge branch 'master' into fix-tooltip-behaviour 2018-07-12 23:54:24 +09:00
Dan Balasescu
e20cdccf05
Merge branch 'master' into update-disclaimer 2018-07-12 23:41:55 +09:00
Dean Herbert
4eb0e207b2
Merge branch 'master' into fix-tooltip-behaviour 2018-07-12 20:18:04 +09:00
Dean Herbert
20b805f9eb
Merge branch 'master' into fix-key-binding-row 2018-07-12 20:06:47 +09:00
Dean Herbert
6bcc8d1cbc Update framework 2018-07-12 19:56:41 +09:00
Dean Herbert
68fa6f03f0 Merge remote-tracking branch 'upstream/master' into peppy-fix-tooltip-behaviour 2018-07-12 19:55:24 +09:00
Dean Herbert
c67e11b2c7 Restore old tooltip appear delay behaviour 2018-07-12 15:27:17 +09:00
Dean Herbert
5df2df9b3a Fix osu! logo handling non-left mouse buttons 2018-07-12 12:36:58 +09:00
HoutarouOreki
1e48582dc2 Instantly hide pause menu for quick retry 2018-07-11 13:49:37 +02:00
Dean Herbert
24054246b8 Fix DI regression 2018-07-11 17:54:01 +09:00
Dean Herbert
fbc5250bf1 Update framework 2018-07-11 17:12:01 +09:00
Dean Herbert
96ef526474 Merge remote-tracking branch 'upstream/master' into ekrctb-fix-disable-mouse 2018-07-11 17:02:01 +09:00
Dean Herbert
8bc7c4c9a2 Add TestCase and update disclaimer screen 2018-07-11 16:30:51 +09:00
ekrctb
55e0cd770d Use BypassAutoSizeAxes 2018-07-11 11:24:43 +09:00
Dean Herbert
7157428882 Fix import failure of beatmap sets containing duplicate beatmap difficulties 2018-07-11 02:59:00 +09:00
Dean Herbert
1418d1369f Add the ability to click completed download notifications to select beatmap
Closes #2731.
2018-07-11 01:32:10 +09:00
HoutarouOreki
dd20663192 Lesser keyboard steps 2018-07-10 17:28:56 +02:00
Dean Herbert
2150cb1028 Update framework and other packages 2018-07-10 20:31:04 +09:00
Dan Balasescu
f5504914cc
Merge branch 'master' into fix-hitsound-fallback 2018-07-10 17:19:16 +09:00
Dan Balasescu
40ec486152
Merge branch 'master' into improve-button-system 2018-07-10 16:44:55 +09:00
Dan Balasescu
ce219cda53
Merge branch 'master' into fix-beatmap-links 2018-07-10 16:20:59 +09:00
smoogipoo
bf1ce8cdd8 Fix linking still being broken 2018-07-10 16:02:13 +09:00
smoogipoo
0f649cd231 Merge remote-tracking branch 'origin/master' into fix-beatmap-links 2018-07-10 16:01:56 +09:00
Dan Balasescu
8cc042bd5a
Merge branch 'master' into fix-beatmap-id-conflicts 2018-07-10 15:49:30 +09:00
Dean Herbert
6dffb1147c
Merge branch 'master' into fix-right-mouse-absolute 2018-07-10 15:34:03 +09:00
Dan Balasescu
ede95b6954
Merge branch 'master' into fix-hitsound-fallback 2018-07-10 15:31:15 +09:00
Dean Herbert
14c3cc70b1
Prefer namespace lookups first 2018-07-10 15:23:47 +09:00
Dean Herbert
7f315d79c2 Fix pixel gap in user profile when scrolling 2018-07-10 13:06:03 +09:00
Dean Herbert
ba258b8a05 Fix lack of fallback logic for custom bank samples
Closes #2966.

---

Was causing some beatmaps to not play all of their hitsounds
2018-07-10 02:56:22 +09:00
Dean Herbert
9e59b4a8e2 Fix SongSelect binding to ruleset too early
Causes music to stop playing while at main menu.
2018-07-10 01:29:24 +09:00
Dean Herbert
974c4f5185 ToolbarMode* -> ToolbarRuleset* 2018-07-10 01:20:21 +09:00
Dean Herbert
abfebbddd9 Update framework 2018-07-09 23:50:45 +09:00
Dean Herbert
1670f4fe31
Merge branch 'master' into fix-osd-fade-in 2018-07-09 19:10:57 +09:00
Dan Balasescu
ee4607c86e
Merge branch 'master' into fix-exit-race-condition 2018-07-09 19:02:37 +09:00
Dean Herbert
49e94850b6 Fix being able to trigger player before carousel is ready
Causes an eventual crash.
2018-07-09 18:43:20 +09:00
Dean Herbert
09b3375a9d Fix pressing escape too fast causing multiple exit attempts at song select 2018-07-09 18:12:23 +09:00
Dean Herbert
df67c0498d Fix OSD fade-in not correctly debouncing
It could potentially never fade in on quick presses.
2018-07-09 17:53:39 +09:00
Dean Herbert
6ced51bb67
Merge branch 'master' into removeAge 2018-07-09 17:43:23 +09:00
HoutarouOreki
10aae3b0ee Remove age from User class 2018-07-09 10:33:46 +02:00
HoutarouOreki
930667d0f9 Remove unused age display code 2018-07-09 10:12:10 +02:00
smoogipoo
0a67e5a274 Fix some possible null reference exceptions 2018-07-09 17:09:17 +09:00
Dean Herbert
b20afb915d Fix right mouse activated absolute scroll not working 2018-07-09 15:26:22 +09:00