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

11088 Commits

Author SHA1 Message Date
Dean Herbert
e2f9e237e8 Use GradientHorizontal helper function 2018-03-07 14:07:04 +09:00
Dean Herbert
c176e309e1
Merge branch 'master' into volume-control 2018-03-07 14:03:09 +09:00
Dean Herbert
b84367c52a
Merge pull request #2175 from smoogipoo/flowcontainer-changes
Update framework with FlowContainer changes
2018-03-07 14:01:14 +09:00
Dean Herbert
08c469a8b3 Update framework 2018-03-07 13:22:08 +09:00
Dean Herbert
4dfd3a61cc Remove alpha setting 2018-03-06 18:40:39 +09:00
Dean Herbert
7cf1d4450a SliderTick transform improvements 2018-03-06 18:28:36 +09:00
Dean Herbert
e82cadc811 Make LegacyID nullable
The -1 default was getting stored to the database.
2018-03-06 17:40:14 +09:00
Dean Herbert
07bf8549eb Fix arbitrary API request errors getting identified as timeouts 2018-03-06 17:39:34 +09:00
smoogipoo
78d73d4c11 Additional fixes for flow ordering after framework changes 2018-03-06 17:20:58 +09:00
smoogipoo
27e0ed4ea8 Update framework 2018-03-06 14:16:17 +09:00
smoogipoo
148551afa2 osu!-side changes in-line with framework layout changes 2018-03-06 14:12:37 +09:00
naoey
9669c5aee3
Make locally used things local and rename method. 2018-03-06 09:33:15 +05:30
Dean Herbert
90828cca8f Fix left and right arrows keys in chat overlay not working
Misplaced override. Resolves ppy/osu-framework#1444
2018-03-06 08:59:40 +09:00
TocoToucan
697ad63d72 Resolve merge conflicts 2018-03-05 22:24:25 +03:00
Dean Herbert
a6460832f4
Merge pull request #2167 from smoogipoo/fix-taiko-conversion
Fix incorrect slider-to-drumroll conversions in taiko
2018-03-06 01:52:22 +09:00
Dean Herbert
c4c1b0b6ff Fix merge regression 2018-03-06 01:39:01 +09:00
Dean Herbert
7b18e8a5ca Merge branch 'master' into fix-taiko-conversion 2018-03-06 01:16:47 +09:00
Dean Herbert
4aafc2228e Improve skip button behaviour when mouse buttons are down 2018-03-06 00:53:40 +09:00
Dean Herbert
d115c56742 Avoid using input blocking 2018-03-06 00:27:55 +09:00
Dean Herbert
792a3ac469 SkipButton -> SkipOverlay 2018-03-06 00:10:53 +09:00
Dean Herbert
d1a115f4ec Merge remote-tracking branch 'upstream/master' into cursor-trail 2018-03-05 23:34:04 +09:00
Dean Herbert
e1eb18702b
Merge pull request #2171 from smoogipoo/fix-drumroll-nullref
Fix taiko drumrolls potentially getting incorrect judgements
2018-03-05 23:07:48 +09:00
Dean Herbert
41727509d7
Merge branch 'master' into fix-drumroll-nullref 2018-03-05 22:46:33 +09:00
Dan Balasescu
efcf2ae311
Merge pull request #2164 from peppy/fix-skin-performance
Fix skin file path lookup performance
2018-03-05 21:43:43 +09:00
smoogipoo
2a9fb2c2c6 Make NestedHitObjects lazily-constructed 2018-03-05 21:40:26 +09:00
Dean Herbert
02690e5f25 Move to private implementation 2018-03-05 21:27:37 +09:00
Dean Herbert
0d817e8e98 Merge remote-tracking branch 'ppy/master' into fix-skin-performance 2018-03-05 21:23:18 +09:00
Dan Balasescu
2519b8edfd
Merge pull request #2162 from peppy/storyboard-rewind-support
Add rewind support for storyboards
2018-03-05 21:21:07 +09:00
smoogipoo
df84b23847 Fix possible nullref when there are 0 drumroll ticks 2018-03-05 21:19:40 +09:00
smoogipoo
7ce3e60722 Fix drumrolls giving GOOD judgements too one tick too late 2018-03-05 21:19:36 +09:00
Dan Balasescu
25e2844e49
Merge branch 'master' into storyboard-rewind-support 2018-03-05 21:11:00 +09:00
Dan Balasescu
30ea3299a9
Merge pull request #2163 from peppy/fix-spinner-crash
Fix hard crash due to spinner spin requirement being zero
2018-03-05 21:10:45 +09:00
Dan Balasescu
59c887cd8e
Merge branch 'master' into fix-spinner-crash 2018-03-05 20:51:19 +09:00
Dan Balasescu
d7c6998409
Merge pull request #2161 from peppy/fix-parallax-during-rewind
Fix parallax container during rewinds
2018-03-05 20:47:21 +09:00
Dan Balasescu
56550e4dd8
Merge branch 'master' into fix-parallax-during-rewind 2018-03-05 20:39:16 +09:00
Dan Balasescu
34a8fbe77c
Merge pull request #2166 from peppy/add-internal-legacy-offsets
Add legacy timing offsets
2018-03-05 20:39:06 +09:00
Dan Balasescu
65d510baf2
Merge branch 'master' into add-internal-legacy-offsets 2018-03-05 20:27:27 +09:00
Dean Herbert
3ddaf1879d CursorTrail always present, just to be safe 2018-03-05 20:20:06 +09:00
Dean Herbert
f4965ee7d6 Use high precision updating on CursorTrail
Avoids bloackage
2018-03-05 20:20:06 +09:00
Dean Herbert
69c0e95d9d Use a better fade effect for the gameplay cursor 2018-03-05 20:20:06 +09:00
Dean Herbert
60f851df3e Add support for DrawInfo alpha when drawing CursorTrail 2018-03-05 20:15:07 +09:00
Dean Herbert
53edfedfc8 Remove unneeded HighFrequencyMousePosition from GameplayMenuOverlay 2018-03-05 19:43:57 +09:00
Dean Herbert
7d11e55d06 Only block mouse input when the shaded portion of the SkipButton is hovered 2018-03-05 19:43:33 +09:00
Dan Balasescu
0e2a7bf680
Merge pull request #2126 from peppy/clock-fixes
Improve clock handling logic for gameplay
2018-03-05 17:55:10 +09:00
Dean Herbert
2003887cc8
Merge branch 'master' into clock-fixes 2018-03-05 17:45:08 +09:00
smoogipoo
c013f83267 Restore IgnoreAttribute 2018-03-05 17:01:27 +09:00
smoogipoo
a6b6c016d6 Fix beatmap decoder tests 2018-03-05 16:14:36 +09:00
smoogipoo
88c33e31e8 Add slider conversion testcases 2018-03-05 16:01:45 +09:00
smoogipoo
d44dc1a4f9 Fix SliderMultiplier/SliderTickRate parsing inaccuracy 2018-03-05 16:01:05 +09:00
smoogipoo
63155f169e Fix incorrect taiko slider conversions due to beatlength adjustments
Fixes ppy/osu#2152 .
2018-03-05 15:12:15 +09:00