Commit Graph

11152 Commits

Author SHA1 Message Date
b93e83e3d2 Merge branch 'master' into base-editor-testcase 2018-03-13 15:53:33 +09:00
c0248e1b23 Merge pull request #2205 from smoogipoo/test-beatmap
Move test beatmap from TestCasePlayer into an instantiable class
2018-03-13 15:52:46 +09:00
e9cd97c43a Merge branch 'master' into test-beatmap 2018-03-13 15:42:30 +09:00
e32eec9259 No more caching 2018-03-13 15:22:46 +09:00
afeab481ee Merge pull request #2209 from peppy/more-skinning
Update framework
2018-03-13 13:12:23 +09:00
6ecd2afd24 Update framework 2018-03-13 12:59:49 +09:00
f06f31a269 Merge pull request #2181 from peppy/more-skinning
Add skin support for hit judgements
2018-03-13 12:58:44 +09:00
706c26c32b Remove extra whitespace 2018-03-13 09:27:33 +09:00
107ad8cfff Merge remote-tracking branch 'FreezyLemon/master' into more-skinning 2018-03-12 22:01:59 +09:00
3354849cc9 Fix code formatting regression 2018-03-12 22:01:18 +09:00
3e313a1f44 Merge pull request #2204 from smoogipoo/fix-slider-circle-overlay
Fix slider circle overlays moving with the endpoints
2018-03-12 19:44:48 +09:00
d2859d779d Create a base TestCaseEditor for rulests to derive 2018-03-12 19:43:52 +09:00
13c20438ef Fix build issues 2018-03-12 19:41:51 +09:00
b91524dbba Give TestWorkingBeatmap's track a valid length 2018-03-12 19:41:15 +09:00
7406cb290f Split out test beatmap from TestCasePlayer into instantiable class 2018-03-12 19:41:09 +09:00
2d9fcdcbd0 Fix slider circle overlays moving with the endpoints 2018-03-12 17:18:50 +09:00
d88fb7608f Merge pull request #2124 from Poyo-SSB/mania-difficulty
Implement mania star difficulty calculation
2018-03-12 14:44:06 +09:00
8cbcdeb665 Merge branch 'master' into mania-difficulty 2018-03-12 14:07:14 +09:00
1af6a1c377 Merge pull request #2191 from peppy/decoders
Rework decoders to be more flexible
2018-03-12 14:04:24 +09:00
ab4c527ebc Merge branch 'master' into decoders 2018-03-12 13:38:22 +09:00
9f644571ea Merge branch 'master' into mania-difficulty 2018-03-12 13:31:48 +09:00
147396f9ca Merge pull request #2188 from tgi74/mania_mirror
Add Mirror Mod for Mania
2018-03-12 13:19:48 +09:00
3cd203699b Apply beatmap converter mods in PerformanceCalculator 2018-03-12 13:09:19 +09:00
f8eace352e Merge branch 'master' into mania_mirror 2018-03-12 13:08:01 +09:00
67212f3abe Merge pull request #2197 from peppy/update-issue
Update ISSUE_TEMPLATE
2018-03-12 13:07:25 +09:00
81186f8423 Apply beatmap converter mods in DifficultyCalculator 2018-03-12 13:06:42 +09:00
fbb80edde1 Minor cleanups 2018-03-12 13:01:29 +09:00
78ed8448e6 Merge branch 'master' into update-issue 2018-03-12 12:57:03 +09:00
c965f3af86 Merge pull request #2198 from peppy/fix-login-failure
Fix login failure for users with no country rank
2018-03-12 12:56:28 +09:00
282301e563 Merge branch 'master' into update-issue 2018-03-12 12:47:27 +09:00
1d0a44a0bb Merge branch 'master' into fix-login-failure 2018-03-12 12:41:45 +09:00
268ff49652 Merge pull request #2189 from peppy/smoother-parallax-scale
Interpolate ParallaxContainer's scale
2018-03-12 12:41:12 +09:00
fce61943bd Merge branch 'master' into smoother-parallax-scale 2018-03-12 12:12:01 +09:00
555e939933 Merge pull request #2185 from peppy/relative-date-drawable
Add drawable to display (and update) relative dates
2018-03-12 12:10:44 +09:00
46caab6310 Reorder arithmetic operation 2018-03-12 11:56:49 +09:00
eb643b690a Merge branch 'master' into more-skinning 2018-03-12 11:55:50 +09:00
dc85067b8c Merge branch 'master' into mania_mirror 2018-03-12 11:52:38 +09:00
1bcda4930e Add back beatmap version set 2018-03-12 11:33:12 +09:00
c70be29eda Move legacy conversion to LegacySkin 2018-03-12 11:30:13 +09:00
50acab8d86 Merge branch 'master' into relative-date-drawable 2018-03-12 11:28:43 +09:00
09b13ee618 Merge pull request #2182 from peppy/fix-duplicate-judgements
Remove judgements when deciding a new judgement for a HitObject
2018-03-12 11:28:34 +09:00
0da407f75c Merge branch 'master' into fix-duplicate-judgements 2018-03-12 11:02:54 +09:00
89582f7afe Merge pull request #2160 from peppy/rewrite-break-overlay
Rewrite BreakOverlay to work with rewinding
2018-03-12 11:02:40 +09:00
1447ca55a3 Add xmldoc, make restrictSize private 2018-03-12 11:02:02 +09:00
86d93ffe3c Fix tooltip not working due to not handling input 2018-03-12 10:49:50 +09:00
d27cf16bf9 Merge remote-tracking branch 'ppy/master' into more-skinning 2018-03-12 10:46:37 +09:00
96e2aca1ba Merge branch 'master' into relative-date-drawable 2018-03-12 10:36:43 +09:00
209d91fe21 Fix duplicate item in csproj 2018-03-12 10:35:37 +09:00
8ba87dfdbd Merge branch 'master' into fix-duplicate-judgements 2018-03-12 10:29:50 +09:00
33c721bcbb Fix post-merge errors 2018-03-12 09:51:32 +09:00