Commit Graph

13611 Commits

Author SHA1 Message Date
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
6e51b74890 Merge remote-tracking branch 'origin/master' into rewrite-break-overlay 2018-03-12 09:47:05 +09:00
7bf38eb1ad Merge pull request #2200 from HoLLy-HaCKeR/fix-legacyid-check
Fix check against LegacyID for non-default rulesets
2018-03-12 09:06:53 +09:00
6d9e78a3a3 Review changes 2018-03-11 22:40:49 +01:00
802a6870c4 Chesterton's fence 2018-03-11 22:09:16 +01:00
9516bec13d Fix naming rule 2018-03-11 21:45:15 +01:00
6a8bc067cd Add license header 2018-03-11 21:30:48 +01:00
9c75c392f2 Only check by null instead of sign 2018-03-11 21:27:49 +01:00
ea6434a7a0 Why this line got deleted 🤔 2018-03-11 21:19:34 +01:00
eed0f3a1de Added setting to not hide the first object in Hidden mod 2018-03-11 21:02:14 +01:00
a321bcf3af Fix check against LegacyID for non-default rulesets 2018-03-11 20:19:03 +01:00
e6c22e2287 Taking screenshot support initial commit 2018-03-10 21:59:20 +03:00
ccc3c573ab Fix resharper not fixing 2018-03-11 02:20:00 +09:00
5092fe5596 Adjust cursor trail display length
In line with shader change at ad5ddec7b2
2018-03-11 02:11:56 +09:00
df2815f19e Add TestCase for GameplayCursor 2018-03-11 02:11:25 +09:00
487a03d0d7 Merge branch 'master' into cursor-trail 2018-03-11 02:07:05 +09:00
3a5283f96d Merge pull request #2159 from naoey/fix-unplayable-beatmaps
Make song select ensure current beatmap is always playable in the active ruleset
2018-03-11 01:38:11 +09:00
db2a663234 Use private instead of protected 2018-03-11 01:26:03 +09:00
d1ab52e7bc Merge branch 'master' into fix-unplayable-beatmaps 2018-03-11 01:19:54 +09:00
c346638459 Merge branch 'master' into decoders 2018-03-11 01:04:28 +09:00
9233266fe1 Fix login failure for users with no country rank
Closes #2148.
2018-03-11 00:44:16 +09:00
19436842de Merge branch 'master' into editor-hitobject-movement 2018-03-10 23:44:22 +09:00
709fcf9552 Update ISSUE_TEMPLATE 2018-03-10 20:01:36 +09:00
a9327eac8f Merge pull request #2194 from smoogipoo/drawableslider-cleanup
Split out the slider head into a separate drawable hitobject
2018-03-10 18:50:55 +09:00
a29189ff84 Merge remote-tracking branch 'upstream/master' 2018-03-10 08:46:00 +01:00
a4dfeff2d7 Renamed ManiaMirrorMod to ManiaModMirror 2018-03-10 08:44:46 +01:00
ed20e31bbe Removed redundant parentheses 2018-03-10 08:39:11 +01:00
ac5a2f18c4 Merge branch 'master' into drawableslider-cleanup 2018-03-10 16:34:15 +09:00
92b302971f Trim whitespace 2018-03-10 01:23:53 +09:00
24501c37dd Merge branch 'drawableslider-cleanup' into editor-hitobject-movement 2018-03-10 01:15:24 +09:00
8ed5fce43a Split out the slider head into a separate drawable hitobject 2018-03-10 01:13:59 +09:00
5727965431 Merge pull request #2193 from peppy/update-framework-again
Fix major regression (framework revert)
2018-03-10 01:08:17 +09:00
4103c66cff Move selection overlay to HitObjectOverlayLayer for extensibility 2018-03-10 00:48:57 +09:00
7cabc54f64 Fix major regression (framework revert) 2018-03-10 00:48:48 +09:00
0e8fbc47b7 Give HitObjectOverlayLayer full input state information 2018-03-10 00:03:02 +09:00
376f6eec58 SetPosition -> OffsetPosition 2018-03-10 00:02:13 +09:00