Dean Herbert
|
46f5c0fc19
|
Merge branch 'master' into mod-fixes
|
2018-03-16 15:38:41 +09:00 |
|
Dan Balasescu
|
cdc61d5f0d
|
Merge branch 'master' into fix-combo-colours
|
2018-03-16 14:59:45 +09:00 |
|
Dean Herbert
|
7ed84465fb
|
Merge branch 'master' into mod-fixes
|
2018-03-16 11:27:39 +09:00 |
|
Dean Herbert
|
a42035f494
|
Make DrawableHitObject a CompositeDrawable
No reason for it to be a container.
|
2018-03-15 13:41:06 +09:00 |
|
Dean Herbert
|
8d433cb4bf
|
Merge branch 'master' into cursor-trail
|
2018-03-15 11:14:21 +09:00 |
|
Dean Herbert
|
a0691168cb
|
Merge remote-tracking branch 'upstream/master' into editor-hitobject-movement
|
2018-03-14 15:35:24 +09:00 |
|
Dean Herbert
|
81f82d98a1
|
Rework a lot of naming and structure
|
2018-03-14 15:18:21 +09:00 |
|
Joseph Madamba
|
d122aa80e4
|
Edit mods description, multiplier, and code
|
2018-03-13 20:07:03 -07:00 |
|
Dean Herbert
|
13f64a1d12
|
Merge branch 'master' into cursor-trail
|
2018-03-14 11:42:40 +09:00 |
|
Dean Herbert
|
c55d70ec13
|
Merge branch 'master' into fix-combo-colours
|
2018-03-13 19:19:45 +09:00 |
|
Dean Herbert
|
e43de68ad3
|
Move colour parsing to LegacyDecoder
|
2018-03-13 19:13:50 +09:00 |
|
smoogipoo
|
0c705b0397
|
Rename to EditorTestCase
|
2018-03-13 15:57:05 +09:00 |
|
Dean Herbert
|
b93e83e3d2
|
Merge branch 'master' into base-editor-testcase
|
2018-03-13 15:53:33 +09:00 |
|
Dean Herbert
|
107ad8cfff
|
Merge remote-tracking branch 'FreezyLemon/master' into more-skinning
|
2018-03-12 22:01:59 +09:00 |
|
smoogipoo
|
d2859d779d
|
Create a base TestCaseEditor for rulests to derive
|
2018-03-12 19:43:52 +09:00 |
|
smoogipoo
|
8c4bcb4a04
|
Only accept drag movement on the overlays
|
2018-03-12 17:33:10 +09:00 |
|
smoogipoo
|
212142429f
|
Derive from IHasPosition
|
2018-03-12 17:25:34 +09:00 |
|
smoogipoo
|
2d9fcdcbd0
|
Fix slider circle overlays moving with the endpoints
|
2018-03-12 17:18:50 +09:00 |
|
Dean Herbert
|
eb643b690a
|
Merge branch 'master' into more-skinning
|
2018-03-12 11:55:50 +09:00 |
|
Dean Herbert
|
d27cf16bf9
|
Merge remote-tracking branch 'ppy/master' into more-skinning
|
2018-03-12 10:46:37 +09:00 |
|
Dan Balasescu
|
8ba87dfdbd
|
Merge branch 'master' into fix-duplicate-judgements
|
2018-03-12 10:29:50 +09:00 |
|
Dean Herbert
|
ccc3c573ab
|
Fix resharper not fixing
|
2018-03-11 02:20:00 +09:00 |
|
Dean Herbert
|
5092fe5596
|
Adjust cursor trail display length
In line with shader change at ad5ddec7b2
|
2018-03-11 02:11:56 +09:00 |
|
Dean Herbert
|
df2815f19e
|
Add TestCase for GameplayCursor
|
2018-03-11 02:11:25 +09:00 |
|
Dean Herbert
|
487a03d0d7
|
Merge branch 'master' into cursor-trail
|
2018-03-11 02:07:05 +09:00 |
|
smoogipoo
|
92b302971f
|
Trim whitespace
|
2018-03-10 01:23:53 +09:00 |
|
smoogipoo
|
24501c37dd
|
Merge branch 'drawableslider-cleanup' into editor-hitobject-movement
|
2018-03-10 01:15:24 +09:00 |
|
smoogipoo
|
8ed5fce43a
|
Split out the slider head into a separate drawable hitobject
|
2018-03-10 01:13:59 +09:00 |
|
smoogipoo
|
376f6eec58
|
SetPosition -> OffsetPosition
|
2018-03-10 00:02:13 +09:00 |
|
smoogipoo
|
4a48136e4f
|
Make hitobject positions adjustable
|
2018-03-09 23:12:34 +09:00 |
|
Dean Herbert
|
81b778fdcf
|
Merge branch 'master' into cursor-trail
|
2018-03-08 09:31:42 +09:00 |
|
Dean Herbert
|
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 |
|
Dean Herbert
|
b62ed004f2
|
Remove judgements when deciding a new judgement for a HitObject
Generally happens when rewinding.
|
2018-03-07 19:14:42 +09:00 |
|
Dean Herbert
|
f2d7621df3
|
Add skin support for explode/flash layers
Basically to hide them for legacy skins, though.
|
2018-03-07 18:21:05 +09:00 |
|
Dean Herbert
|
05eb678654
|
Add skin support for judgements
|
2018-03-07 18:21:05 +09:00 |
|
Dan Balasescu
|
1375ee8408
|
Merge branch 'master' into slider-tick-transform-cleanup
|
2018-03-07 16:59:04 +09:00 |
|
Dean Herbert
|
4dfd3a61cc
|
Remove alpha setting
|
2018-03-06 18:40:39 +09:00 |
|
Dean Herbert
|
7cf1d4450a
|
SliderTick transform improvements
|
2018-03-06 18:28:36 +09:00 |
|
Dean Herbert
|
e82cadc811
|
Make LegacyID nullable
The -1 default was getting stored to the database.
|
2018-03-06 17:40:14 +09:00 |
|
Dean Herbert
|
d1a115f4ec
|
Merge remote-tracking branch 'upstream/master' into cursor-trail
|
2018-03-05 23:34:04 +09:00 |
|
Dean Herbert
|
3ddaf1879d
|
CursorTrail always present, just to be safe
|
2018-03-05 20:20:06 +09:00 |
|
Dean Herbert
|
f4965ee7d6
|
Use high precision updating on CursorTrail
Avoids bloackage
|
2018-03-05 20:20:06 +09:00 |
|
Dean Herbert
|
69c0e95d9d
|
Use a better fade effect for the gameplay cursor
|
2018-03-05 20:20:06 +09:00 |
|
Dean Herbert
|
60f851df3e
|
Add support for DrawInfo alpha when drawing CursorTrail
|
2018-03-05 20:15:07 +09: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
|
0e928429d4
|
Merge branch 'master' into ruleset-replayframes
|
2018-03-04 01:57:43 +09:00 |
|
Dean Herbert
|
06cf9cbd63
|
Merge branch 'master' into fix-perfectcurve
|
2018-03-02 21:49:33 +09:00 |
|
Dean Herbert
|
bd9d26921a
|
Less BeaIBeatmapConvertereatmapConverters
|
2018-03-02 20:39:43 +09:00 |
|
Dean Herbert
|
22cbbcc639
|
Merge branch 'master' into beatmap-conversion-testcases
|
2018-03-02 20:21:41 +09:00 |
|
smoogipoo
|
a2c239d5e3
|
Rename to IBeatmapConverter, move to separate file
|
2018-03-02 20:19:47 +09:00 |
|
smoogipoo
|
9fef8a3977
|
Prettify json
|
2018-03-02 20:13:48 +09:00 |
|
smoogipoo
|
71755f5363
|
Prettyfy some JSON
|
2018-03-02 20:12:29 +09:00 |
|
Dean Herbert
|
ca8e52289b
|
Merge branch 'master' into fix-hr
|
2018-03-02 19:37:48 +09:00 |
|
smoogipoo
|
401d3fff7b
|
Add colinear perfect curve test case
|
2018-03-02 18:38:57 +09:00 |
|
smoogipoo
|
820a852caf
|
Remove unnecessary .osu properties
|
2018-03-02 18:37:38 +09:00 |
|
smoogipoo
|
cdca7371a3
|
Replace testcases with a basic test suite
|
2018-03-02 18:20:33 +09:00 |
|
Dan Balasescu
|
4aff659272
|
Merge branch 'master' into beatmap-conversion-testcases
|
2018-03-02 16:04:32 +09:00 |
|
smoogipoo
|
3d5fefae8c
|
Add TestFixtureAttribute to all tests
|
2018-03-02 15:34:31 +09:00 |
|
smoogipoo
|
6fff6da751
|
Ignore broken testcases
|
2018-03-02 14:01:34 +09:00 |
|
smoogipoo
|
2e3ee00c19
|
Remove unnecessary changes
|
2018-03-02 13:13:01 +09:00 |
|
smoogipoo
|
573d6d1b5f
|
Allow multiple mappings to be generated for a single hitobject
|
2018-03-02 13:13:01 +09:00 |
|
smoogipoo
|
4e363664fd
|
Add beatmap parameter to beatmapconverter creation
|
2018-03-02 13:13:01 +09:00 |
|
smoogipoo
|
6f5acaa8f9
|
Remove unnecessary explicit JsonProperties
|
2018-03-02 13:13:01 +09:00 |
|
smoogipoo
|
e87be213d5
|
Adjust lenience a little bit
|
2018-03-02 13:13:01 +09:00 |
|
smoogipoo
|
797d03a65f
|
Implement basic structure for beatmap conversion testing
|
2018-03-02 13:13:00 +09:00 |
|
smoogipoo
|
cb39a88c51
|
Fix HR not affecting slider repeats and ticks
|
2018-03-02 00:25:14 +09:00 |
|
smoogipoo
|
49b24c2bbf
|
Fix HR not properly applying to sliders
|
2018-03-02 00:19:09 +09:00 |
|
Dean Herbert
|
c54c1699bf
|
Merge branch 'master' into ruleset-replayframes
|
2018-03-01 22:26:16 +09:00 |
|
Dean Herbert
|
0704d823a9
|
Fix slider selection point not being set to new origin
|
2018-03-01 22:03:00 +09:00 |
|
smoogipoo
|
e62fab6cc2
|
Fix overlay positions/sizes due to sliders now being fixed
|
2018-03-01 14:34:31 +09:00 |
|
smoogipoo
|
d5d4bcb558
|
Merge branch 'master' into editor-hitobject-overlays
|
2018-03-01 14:04:38 +09:00 |
|
smoogipoo
|
195b6642e6
|
Reimplement important frames
|
2018-03-01 02:28:15 +09:00 |
|
smoogipoo
|
cf42d5bbd5
|
Remove mostly-unused Score parameter
|
2018-03-01 02:28:14 +09:00 |
|
smoogipoo
|
c9c65cab53
|
CreateReplayFrame -> CreateConvertibleReplayFrame
|
2018-03-01 02:28:14 +09:00 |
|
smoogipoo
|
222ae70062
|
Populate rulesets with their replay frames
|
2018-03-01 02:28:14 +09:00 |
|
smoogipoo
|
a3c7755ade
|
Implement a conversion process for ReplayFrames
|
2018-03-01 02:28:14 +09:00 |
|
Dean Herbert
|
e2f57ae346
|
Merge branch 'master' into parser-sanity-checks
|
2018-03-01 00:38:44 +09:00 |
|
Dean Herbert
|
3609c685d1
|
Fix approach circle fading
|
2018-02-28 20:35:15 +09:00 |
|
Dean Herbert
|
065630487a
|
Fix slider heads fading out too late
|
2018-02-28 20:12:16 +09:00 |
|
Dean Herbert
|
5b4fef0180
|
Add bare minimum sanity checking of beatmap input values to make broken maps load
Resolves ppy/osu#1988.
|
2018-02-28 18:12:24 +09:00 |
|
Dean Herbert
|
bdd88303b3
|
Merge branch 'master' into editor-hitobject-overlays
|
2018-02-26 17:53:50 +09:00 |
|
Dean Herbert
|
1218a75b7f
|
Improve vector conditional
|
2018-02-26 16:11:26 +09:00 |
|
Dean Herbert
|
9cbed461c4
|
Merge branch 'master' into sliderbody-rework
|
2018-02-26 15:00:18 +09:00 |
|
Dean Herbert
|
f1ddfa0581
|
Fix sliders never getting a correct lifetime set
|
2018-02-25 16:25:56 +09:00 |
|
smoogipoo
|
50d1183ec2
|
Division-by-zero safety + reference our own size
|
2018-02-24 02:53:02 +09:00 |
|
smoogipoo
|
066abfbdbc
|
Rename PositionAt -> CurvePositionAt to represent its new meaning
|
2018-02-24 02:43:36 +09:00 |
|
smoogipoo
|
996e605e61
|
Remove temporary testcase
|
2018-02-24 02:39:44 +09:00 |
|
smoogipoo
|
1e1df2aaff
|
Fix up testcases
|
2018-02-23 21:04:19 +09:00 |
|
smoogipoo
|
8c90abe0dc
|
Make slider control points relative to start position
|
2018-02-23 20:59:27 +09:00 |
|
smoogipoo
|
08bb25347c
|
Make DrawableSlider contain the slider body
|
2018-02-23 20:27:05 +09:00 |
|
Dean Herbert
|
84b707f4f8
|
Add basic hitcircle skinning
|
2018-02-23 13:38:12 +09:00 |
|
Dan Balasescu
|
6cc54a464c
|
Merge branch 'master' into editor-hitobject-overlays
|
2018-02-22 14:25:27 +09:00 |
|
smoogipoo
|
844e87aafe
|
Use the true head position rather than capturing current position
|
2018-02-22 14:25:10 +09:00 |
|
Dean Herbert
|
a3336f2577
|
Merge branch 'master' into fix-editor-osu-scale
|
2018-02-22 14:14:41 +09:00 |
|
smoogipoo
|
604b0fa20a
|
Fix post-merge issues
|
2018-02-22 14:11:06 +09:00 |
|
smoogipoo
|
ded2644df8
|
Merge branch 'master' into editor-hitobject-overlays
|
2018-02-22 14:08:36 +09:00 |
|
Dean Herbert
|
b74cfffc6f
|
Merge branch 'master' into editor-hitobject-movement
|
2018-02-22 13:19:39 +09:00 |
|
Dean Herbert
|
3b4e4bd110
|
Merge remote-tracking branch 'upstream/master' into general-slider-improvements
|
2018-02-22 12:28:33 +09:00 |
|
smoogipoo
|
5faec5c2f1
|
Add a separate property to control playfield area
|
2018-02-21 20:54:33 +09:00 |
|
smoogipoo
|
08e52e8c15
|
Remove unnecessary schedules
|
2018-02-21 18:02:52 +09:00 |
|