Commit Graph

572 Commits

Author SHA1 Message Date
7e7f8ed7a2 Merge branch 'master' into drawable-composite-hit-object 2018-03-16 15:53:16 +09:00
23ffee3d38 Merge branch 'master' into drawable-composite-hit-object 2018-03-16 15:38:52 +09:00
46f5c0fc19 Merge branch 'master' into mod-fixes 2018-03-16 15:38:41 +09:00
cdc61d5f0d Merge branch 'master' into fix-combo-colours 2018-03-16 14:59:45 +09:00
7ed84465fb Merge branch 'master' into mod-fixes 2018-03-16 11:27:39 +09:00
a42035f494 Make DrawableHitObject a CompositeDrawable
No reason for it to be a container.
2018-03-15 13:41:06 +09:00
8d433cb4bf Merge branch 'master' into cursor-trail 2018-03-15 11:14:21 +09:00
a0691168cb Merge remote-tracking branch 'upstream/master' into editor-hitobject-movement 2018-03-14 15:35:24 +09:00
81f82d98a1 Rework a lot of naming and structure 2018-03-14 15:18:21 +09:00
d122aa80e4 Edit mods description, multiplier, and code 2018-03-13 20:07:03 -07:00
13f64a1d12 Merge branch 'master' into cursor-trail 2018-03-14 11:42:40 +09:00
c55d70ec13 Merge branch 'master' into fix-combo-colours 2018-03-13 19:19:45 +09:00
e43de68ad3 Move colour parsing to LegacyDecoder 2018-03-13 19:13:50 +09:00
0c705b0397 Rename to EditorTestCase 2018-03-13 15:57:05 +09:00
b93e83e3d2 Merge branch 'master' into base-editor-testcase 2018-03-13 15:53:33 +09:00
107ad8cfff Merge remote-tracking branch 'FreezyLemon/master' into more-skinning 2018-03-12 22:01:59 +09:00
d2859d779d Create a base TestCaseEditor for rulests to derive 2018-03-12 19:43:52 +09:00
8c4bcb4a04 Only accept drag movement on the overlays 2018-03-12 17:33:10 +09:00
212142429f Derive from IHasPosition 2018-03-12 17:25:34 +09:00
2d9fcdcbd0 Fix slider circle overlays moving with the endpoints 2018-03-12 17:18:50 +09:00
eb643b690a Merge branch 'master' into more-skinning 2018-03-12 11:55:50 +09:00
d27cf16bf9 Merge remote-tracking branch 'ppy/master' into more-skinning 2018-03-12 10:46:37 +09:00
8ba87dfdbd Merge branch 'master' into fix-duplicate-judgements 2018-03-12 10:29:50 +09: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
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
376f6eec58 SetPosition -> OffsetPosition 2018-03-10 00:02:13 +09:00
4a48136e4f Make hitobject positions adjustable 2018-03-09 23:12:34 +09:00
81b778fdcf Merge branch 'master' into cursor-trail 2018-03-08 09:31:42 +09:00
04f5563238 Match HP drain harshness closer to stable
Based on number of misses before fail on two arbitrary tests. Obviously not final, just making the game more playable for the time being.
2018-03-07 19:37:26 +09:00
b62ed004f2 Remove judgements when deciding a new judgement for a HitObject
Generally happens when rewinding.
2018-03-07 19:14:42 +09:00
f2d7621df3 Add skin support for explode/flash layers
Basically to hide them for legacy skins, though.
2018-03-07 18:21:05 +09:00
05eb678654 Add skin support for judgements 2018-03-07 18:21:05 +09:00
1375ee8408 Merge branch 'master' into slider-tick-transform-cleanup 2018-03-07 16:59:04 +09:00
4dfd3a61cc Remove alpha setting 2018-03-06 18:40:39 +09:00
7cf1d4450a SliderTick transform improvements 2018-03-06 18:28:36 +09:00
e82cadc811 Make LegacyID nullable
The -1 default was getting stored to the database.
2018-03-06 17:40:14 +09:00
d1a115f4ec Merge remote-tracking branch 'upstream/master' into cursor-trail 2018-03-05 23:34:04 +09:00
3ddaf1879d CursorTrail always present, just to be safe 2018-03-05 20:20:06 +09:00
f4965ee7d6 Use high precision updating on CursorTrail
Avoids bloackage
2018-03-05 20:20:06 +09:00
69c0e95d9d Use a better fade effect for the gameplay cursor 2018-03-05 20:20:06 +09:00
60f851df3e Add support for DrawInfo alpha when drawing CursorTrail 2018-03-05 20:15:07 +09:00
ea6e3938c0 Fix hard crash due to spinner spin requirement being zero
Resolves #2133.
2018-03-04 03:01:47 +09:00
0e928429d4 Merge branch 'master' into ruleset-replayframes 2018-03-04 01:57:43 +09:00
06cf9cbd63 Merge branch 'master' into fix-perfectcurve 2018-03-02 21:49:33 +09:00
bd9d26921a Less BeaIBeatmapConvertereatmapConverters 2018-03-02 20:39:43 +09:00