Commit Graph

10963 Commits

Author SHA1 Message Date
0d817e8e98 Merge remote-tracking branch 'ppy/master' into fix-skin-performance 2018-03-05 21:23:18 +09:00
2519b8edfd Merge pull request #2162 from peppy/storyboard-rewind-support
Add rewind support for storyboards
2018-03-05 21:21:07 +09:00
25e2844e49 Merge branch 'master' into storyboard-rewind-support 2018-03-05 21:11:00 +09:00
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
59c887cd8e Merge branch 'master' into fix-spinner-crash 2018-03-05 20:51:19 +09:00
d7c6998409 Merge pull request #2161 from peppy/fix-parallax-during-rewind
Fix parallax container during rewinds
2018-03-05 20:47:21 +09:00
56550e4dd8 Merge branch 'master' into fix-parallax-during-rewind 2018-03-05 20:39:16 +09:00
34a8fbe77c Merge pull request #2166 from peppy/add-internal-legacy-offsets
Add legacy timing offsets
2018-03-05 20:39:06 +09:00
65d510baf2 Merge branch 'master' into add-internal-legacy-offsets 2018-03-05 20:27:27 +09:00
0e2a7bf680 Merge pull request #2126 from peppy/clock-fixes
Improve clock handling logic for gameplay
2018-03-05 17:55:10 +09:00
2003887cc8 Merge branch 'master' into clock-fixes 2018-03-05 17:45:08 +09:00
e46f363fdc Fix failing unit test 2018-03-04 22:46:50 +09:00
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
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
ea6e3938c0 Fix hard crash due to spinner spin requirement being zero
Resolves #2133.
2018-03-04 03:01:47 +09:00
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
ed8b7d12c4 Merge branch 'master' into fix-catch-legacy-replays 2018-03-04 02:21:10 +09:00
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
8273288048 Add xmldoc 2018-03-04 02:12:45 +09:00
0e928429d4 Merge branch 'master' into ruleset-replayframes 2018-03-04 01:57:43 +09:00
659578e8fa Add rewind support for storyboards 2018-03-04 01:48:31 +09:00
26e50043b7 Fix parallax container during rewinds 2018-03-04 00:52:00 +09:00
0b2cbf88bb Merge branch 'master' into clock-fixes 2018-03-02 22:18:32 +09:00
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
06cf9cbd63 Merge branch 'master' into fix-perfectcurve 2018-03-02 21:49:33 +09:00
a71dacc58a Update framework 2018-03-02 21:48:36 +09:00
bd510e5356 Merge remote-tracking branch 'upstream/master' into clock-fixes 2018-03-02 21:01:53 +09:00
29aa7107aa Merge pull request #2153 from smoogipoo/beatmap-conversion-testcases
Implement an interface for beatmap conversion tests
2018-03-02 20:59:43 +09:00
46d018922e Ignore catch conversion failures 2018-03-02 20:50:12 +09:00
bd9d26921a Less BeaIBeatmapConvertereatmapConverters 2018-03-02 20:39:43 +09:00
22cbbcc639 Merge branch 'master' into beatmap-conversion-testcases 2018-03-02 20:21:41 +09:00
a2c239d5e3 Rename to IBeatmapConverter, move to separate file 2018-03-02 20:19:47 +09:00
9fef8a3977 Prettify json 2018-03-02 20:13:48 +09:00
71755f5363 Prettyfy some JSON 2018-03-02 20:12:29 +09:00
0e669d56a3 Merge pull request #2146 from smoogipoo/fix-hr
Fix HR not properly applying to sliders
2018-03-02 19:53:58 +09:00
ca8e52289b Merge branch 'master' into fix-hr 2018-03-02 19:37:48 +09:00
401d3fff7b Add colinear perfect curve test case 2018-03-02 18:38:57 +09:00
820a852caf Remove unnecessary .osu properties 2018-03-02 18:37:38 +09:00
8a15d4e677 Fix linear perfect-curves not being cased to CurveType.Linear
Fixes #2151.
2018-03-02 18:21:40 +09:00
cdca7371a3 Replace testcases with a basic test suite 2018-03-02 18:20:33 +09:00
1f21ccffb0 Add lenience to start times 2018-03-02 18:20:12 +09:00
4aff659272 Merge branch 'master' into beatmap-conversion-testcases 2018-03-02 16:04:32 +09:00
e7b99a97c3 Merge pull request #2154 from smoogipoo/fix-nunit-duplication
Only use osu.Desktop to determine test assemblies
2018-03-02 15:56:23 +09:00
1f834825dc Add testcase to osu.Game in-case nunit tries to discover tests in it 2018-03-02 15:43:55 +09:00
3d5fefae8c Add TestFixtureAttribute to all tests 2018-03-02 15:34:31 +09:00
0ec462b98d Only use osu.Desktop to determine test assemblies 2018-03-02 14:58:14 +09:00
6fff6da751 Ignore broken testcases 2018-03-02 14:01:34 +09:00
2e3ee00c19 Remove unnecessary changes 2018-03-02 13:13:01 +09:00
0145ef5277 Fix mania using the wrong validation data 2018-03-02 13:13:01 +09:00
bae598b9f4 Add a catch beatmap conversion testcase 2018-03-02 13:13:01 +09:00