1
0
mirror of https://github.com/ppy/osu.git synced 2024-10-02 01:17:24 +08:00
Commit Graph

11057 Commits

Author SHA1 Message Date
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
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
smoogipoo
49b8670dfc Fix beatmap conversion tests not properly constructing decoder 2018-03-05 14:53:57 +09:00
Dean Herbert
e46f363fdc Fix failing unit test 2018-03-04 22:46:50 +09:00
jorolf
0a571278c9 change TestCase to OsuTestCase 2018-03-04 14:03:53 +01:00
Dean Herbert
bc0bc8d459 Add legacy timing offsets
These have been in release builds since January, but implemented in a hacky way.

This brings them with a sane implementation.
2018-03-04 21:57:50 +09:00
jorolf
ec013dbee8 remove blank line and try to get test case working 2018-03-03 21:55:19 +01:00
jorolf
bafcab1349 redo the test case 2018-03-03 20:20:07 +01:00
jorolf
033d066520 blank line 2018-03-03 20:03:24 +01:00
jorolf
ba80cd5f34 OsuColour can't be used in TestCases..? 2018-03-03 20:01:39 +01:00
jorolf
1cda58fe29 another blank line 2018-03-03 19:51:11 +01:00
jorolf
9293ec635a add license headers and remove blank line 2018-03-03 19:49:38 +01:00
jorolf
8e0a524c4d change colours 2018-03-03 19:31:29 +01:00
jorolf
ef63366d91 simplify VolumeMeter 2018-03-03 19:25:34 +01:00
Dean Herbert
30b1447318 Fix skin file path lookup performance
Move path mapping to the resource store, so caching can happen against the component's name rather than the skin path.

Fixes regression of beatmap load time when a custom skin is selected.
2018-03-04 03:19:01 +09:00
jorolf
9a29c53c5e Merge branch 'master' of git://github.com/ppy/osu into volume-control 2018-03-03 19:09:08 +01:00
jorolf
3a420ba826 add the volume overlay 2018-03-03 19:08:35 +01:00
Dean Herbert
ea6e3938c0 Fix hard crash due to spinner spin requirement being zero
Resolves #2133.
2018-03-04 03:01:47 +09:00
Dean Herbert
66493d200b
Merge branch 'master' into user-profile-recent 2018-03-04 02:45:12 +09:00
Dean Herbert
d3092a3003
Merge pull request #2142 from smoogipoo/fix-catch-legacy-replays
Fix legacy catch replay input not being scaled to the playfield's width
2018-03-04 02:28:56 +09:00
Dean Herbert
ed8b7d12c4
Merge branch 'master' into fix-catch-legacy-replays 2018-03-04 02:21:10 +09:00
Dean Herbert
67952bbca9
Merge pull request #2137 from smoogipoo/ruleset-replayframes
Rewrite replay frame construction/handling and accommodate for conversion
2018-03-04 02:20:51 +09:00
Dean Herbert
8273288048 Add xmldoc 2018-03-04 02:12:45 +09:00
Dean Herbert
0e928429d4
Merge branch 'master' into ruleset-replayframes 2018-03-04 01:57:43 +09:00
Dean Herbert
659578e8fa Add rewind support for storyboards 2018-03-04 01:48:31 +09:00
Dean Herbert
26e50043b7 Fix parallax container during rewinds 2018-03-04 00:52:00 +09:00
jorolf
bd75422d88 Merge branch 'master' of git://github.com/ppy/osu into volume-control 2018-03-03 14:10:50 +01:00
Dean Herbert
0b2cbf88bb
Merge branch 'master' into clock-fixes 2018-03-02 22:18:32 +09:00
Dean Herbert
c8be224b5f
Merge pull request #2155 from smoogipoo/fix-perfectcurve
Fix linear perfect curves not using the linear curve approximator
2018-03-02 22:00:54 +09:00
Dean Herbert
06cf9cbd63
Merge branch 'master' into fix-perfectcurve 2018-03-02 21:49:33 +09:00