Dean Herbert
|
8e66f9a85d
|
Merge branch 'master' into tighten-diffcalc-tolerances
|
2018-10-12 17:35:33 +09:00 |
|
smoogipoo
|
f585684038
|
Merge branch 'tighten-diffcalc-tolerances' into optimise-diffcalc
|
2018-10-12 16:51:37 +09:00 |
|
smoogipoo
|
72c8ae8705
|
Port the old stacking algorithm
|
2018-10-12 16:47:27 +09:00 |
|
Dean Herbert
|
d6043a6cd3
|
Merge remote-tracking branch 'upstream/master' into smooth-path
|
2018-10-12 16:03:36 +09:00 |
|
smoogipoo
|
e130204a3b
|
Merge remote-tracking branch 'origin/master' into optimise-diffcalc
|
2018-10-12 12:26:15 +09:00 |
|
smoogipoo
|
ec9f23ab73
|
Make IBeatmap.HitObjects an IReadOnlyList
|
2018-10-11 19:53:07 +09:00 |
|
smoogipoo
|
83fd251c7b
|
Pass sub-controlpoints as span slices
|
2018-10-11 17:44:25 +09:00 |
|
smoogipoo
|
7d20efed2c
|
Fix missing stack position
|
2018-10-11 13:53:29 +09:00 |
|
smoogipoo
|
f675c93935
|
Stably-sort hitobjects
|
2018-10-10 23:11:28 +09:00 |
|
Dean Herbert
|
aac95523ec
|
Merge branch 'master' into skinnable-spritetext
|
2018-10-10 20:26:27 +09:00 |
|
Dean Herbert
|
1b6f37f3eb
|
Merge branch 'master' into wiggle-repeat-points
|
2018-10-10 19:42:10 +09:00 |
|
Dean Herbert
|
841b2e8692
|
Merge branch 'master' into consistent-terminology-format
|
2018-10-10 19:19:36 +09:00 |
|
smoogipoo
|
4e37b5c4a7
|
50ms cap shouldn't be included in the strain decay
|
2018-10-10 18:53:54 +09:00 |
|
smoogipoo
|
d8f77feddd
|
Fix using the wrong slider's travel distance
|
2018-10-10 18:52:57 +09:00 |
|
smoogipoo
|
03a9511399
|
Apparently stable does use stacking
|
2018-10-10 18:08:46 +09:00 |
|
smoogipoo
|
b56d09c83b
|
Set hitobject placement time manually
|
2018-10-10 15:32:59 +09:00 |
|
smoogipoo
|
d6784c818e
|
Fix jump/travel distances in some scenarios
|
2018-10-10 11:49:54 +09:00 |
|
Dan Balasescu
|
a2838d32bf
|
Merge branch 'master' into skinnable-spritetext
|
2018-10-09 16:23:43 +09:00 |
|
smoogipoo
|
0a3be0d253
|
Adjust comments slightly
|
2018-10-09 12:03:47 +09:00 |
|
smoogipoo
|
9facf707be
|
Add diffcalc beatmap decoder
|
2018-10-09 11:49:24 +09:00 |
|
Fayne Aldan
|
edf87bfdd8
|
Merge branch 'master' into wiggle-repeat-points
|
2018-10-08 15:23:45 -06:00 |
|
smoogipoo
|
f8eaccddda
|
Stable doesn't use stacked positions
|
2018-10-08 18:37:49 +09:00 |
|
smoogipoo
|
0116db95d0
|
Fix progress calculation
|
2018-10-08 18:37:30 +09:00 |
|
smoogipoo
|
35f45e74dc
|
Calculate scaled positions prior to square-rooting
|
2018-10-08 17:39:10 +09:00 |
|
smoogipoo
|
1ad5090ad6
|
Separate travel distance from jump distance
|
2018-10-08 17:38:12 +09:00 |
|
smoogipoo
|
61e7ada977
|
Use ints + fix position calculation
|
2018-10-08 17:36:06 +09:00 |
|
smoogipoo
|
da97600076
|
Fix inaccurate section lengths for first hitobject
|
2018-10-08 16:46:58 +09:00 |
|
smoogipoo
|
42664f1c19
|
Make SliderBody use the new SmoothPath
|
2018-10-05 15:45:45 +09:00 |
|
smoogipoo
|
ff559a3a1b
|
Merge remote-tracking branch 'origin/master' into playfield-scaling-rework
# Conflicts:
# osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
# osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
|
2018-10-05 10:40:16 +09:00 |
|
smoogipoo
|
d0007c047a
|
PlayfieldLayer -> PlayfieldAdjustmentContainer
|
2018-10-05 10:39:18 +09:00 |
|
smoogipoo
|
e931aa3d9e
|
Move positional modifications to HitCirclePlacementMask
|
2018-10-04 13:43:50 +09:00 |
|
smoogipoo
|
6a65802528
|
Fix hitcircle selections not responding to stacking changes
|
2018-10-04 12:19:11 +09:00 |
|
smoogipoo
|
1cd11a6e5b
|
Fix StackHeight changes not causing position updates
|
2018-10-03 17:06:18 +09:00 |
|
smoogipoo
|
3420e0c7eb
|
Re-implement composition tools + implement placement masks
|
2018-10-03 16:27:26 +09:00 |
|
smoogipoo
|
540a010fbb
|
Implement an intermediary EditRulesetContainer
|
2018-10-03 15:36:24 +09:00 |
|
smoogipoo
|
28b0ab6123
|
Split visuals of HitCircleSelectionMask into HitCircleMask
|
2018-10-03 14:35:26 +09:00 |
|
smoogipoo
|
1164108a95
|
Renamespace ruleset masks
|
2018-10-03 13:45:41 +09:00 |
|
smoogipoo
|
4cdb6dcea5
|
Rename HitObjectMask -> SelectionMask
|
2018-10-03 13:28:00 +09:00 |
|
ekrctb
|
68980fc477
|
Adjust usage of Handle(Non)PositionalInput to follow framework update
|
2018-10-02 14:45:33 +09:00 |
|
ekrctb
|
50091252e2
|
Adapt signature change of event handlers
|
2018-10-02 12:02:55 +09:00 |
|
ekrctb
|
99fc04c8af
|
Change signature to new event handler
|
2018-10-02 12:02:47 +09:00 |
|
smoogipoo
|
0d8276c5f8
|
Implement skinnable sprite text
|
2018-09-27 17:40:28 +09:00 |
|
Dean Herbert
|
2ed7785cfc
|
Merge remote-tracking branch 'upstream/master' into update-framework
|
2018-09-26 19:50:48 +09:00 |
|
smoogipoo
|
a8f156584b
|
Update framework with positional/non-positional changes
|
2018-09-26 14:01:15 +09:00 |
|
Kyle Chang
|
2069467434
|
Use HitObject scale to determine judgement size
|
2018-09-24 21:18:55 -04:00 |
|
Kyle Chang
|
7a43677849
|
Make judgements scale with cs
|
2018-09-22 22:54:38 -04:00 |
|
smoogipoo
|
0bc2bcaf14
|
Remove GetAspectAdjustedSize() and PlayfieldArea
|
2018-09-21 15:14:49 +09:00 |
|
smoogipoo
|
26094ea325
|
Simplify + rename playfield layers in Osu/Catch
|
2018-09-21 15:01:58 +09:00 |
|
smoogipoo
|
a166d03ede
|
Remove duplicate implementation of the Osu playfield layer
|
2018-09-21 14:43:38 +09:00 |
|
smoogipoo
|
368ceec47c
|
Simplify creation of a playfield
|
2018-09-21 14:35:50 +09:00 |
|
smoogipoo
|
826dc6ceb7
|
Make Playfield not a ScalableContainer
|
2018-09-21 14:02:32 +09:00 |
|
ekrctb
|
a3e6973b41
|
Replace usage of now removed TriggerKeyPress and similar methods.
|
2018-09-19 11:36:55 +09:00 |
|
Fayne Aldan
|
d855e5957a
|
Don't wiggle repeat points independently
|
2018-09-15 16:16:37 -06:00 |
|
Joehu
|
f99eff1192
|
Use consistent terminology format
|
2018-09-15 07:30:11 -07:00 |
|
Paul Teng
|
1a8665864c
|
Remove redundant explicit array type info
|
2018-09-15 08:55:29 -04:00 |
|
Paul Teng
|
3e02a36938
|
Make Wiggle incompatible with Transform
|
2018-09-15 08:43:22 -04:00 |
|
Paul Teng
|
92c6b570ea
|
Make Transform incompatible with Wiggle
|
2018-09-15 08:42:04 -04:00 |
|
Dean Herbert
|
14c2aec53e
|
Merge remote-tracking branch 'upstream/master' into ArrangeMod
|
2018-09-14 18:48:32 +09:00 |
|
Dean Herbert
|
ec6185cd31
|
Reduce random allocations
|
2018-09-14 18:21:12 +09:00 |
|
Dean Herbert
|
ef31698f56
|
Further code tidying
|
2018-09-14 18:21:12 +09:00 |
|
Dean Herbert
|
00daaef27a
|
Use a slightly more suiting icon
|
2018-09-14 18:21:12 +09:00 |
|
Dean Herbert
|
9d94aa4e62
|
Fix formatting and constants
|
2018-09-14 18:21:12 +09:00 |
|
MaxOhn
|
b1f6828a1a
|
Added OsuModWiggle class and adjusted OsuRuleset.cs
|
2018-09-14 18:21:11 +09:00 |
|
Dean Herbert
|
da8b838438
|
Merge branch 'master' into ArrangeMod
|
2018-09-14 17:20:04 +09:00 |
|
Dean Herbert
|
7cca990be4
|
Merge remote-tracking branch 'upstream/master' into framework-image-changes
|
2018-09-07 18:56:00 +09:00 |
|
Dean Herbert
|
a1780fddc9
|
DrawInfo -> DrawColourInfo
|
2018-09-06 18:02:04 +09:00 |
|
Dean Herbert
|
9f67119ba9
|
Fix potential nullref in IsPresent override
|
2018-09-06 18:01:32 +09:00 |
|
Dean Herbert
|
4ff66bf531
|
Update in line with framework Image changes
|
2018-09-06 13:28:44 +09:00 |
|
miterosan
|
4c42d40314
|
Correct the comment from explosion to object
|
2018-09-05 21:09:09 +02:00 |
|
Dean Herbert
|
34c42aed89
|
Merge branch 'master' into ArrangeMod
|
2018-09-05 02:33:00 +09:00 |
|
Dean Herbert
|
03084aa04b
|
Revert async changes
|
2018-08-31 07:07:10 +09:00 |
|
Dean Herbert
|
68a79f895a
|
Fix mania throwing an exception on start of map
|
2018-08-30 14:58:00 +09:00 |
|
smoogipoo
|
1b279d383f
|
Use GetAsync on all textures
|
2018-08-27 17:26:44 +09:00 |
|
miterosan
|
726a510189
|
remove not needed usings
|
2018-08-24 22:33:14 +02:00 |
|
miterosan
|
8b016f05e6
|
Remove unessesary nl
|
2018-08-24 22:24:57 +02:00 |
|
miterosan
|
8112a51d5f
|
Only apply the transformation once and make the distance and theta dynamic.
|
2018-08-24 22:23:27 +02:00 |
|
Dean Herbert
|
ffcad6e0f1
|
Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake
# Conflicts:
# osu.Game.Rulesets.Osu.Tests/TestCaseHitCircle.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
|
2018-08-24 15:26:36 +09:00 |
|
miterosan
|
0a48f8eadd
|
remove empty object ctar args
|
2018-08-22 21:39:59 +02:00 |
|
miterosan
|
6600f7b30e
|
correct the namings and styling
|
2018-08-22 21:27:20 +02:00 |
|
miterosan
|
957a026c08
|
Merge branch 'ArrangeMod' of https://github.com/miterosan/osu into ArrangeMod
|
2018-08-22 21:20:49 +02:00 |
|
miterosan
|
5c5191b9c3
|
Rename the mod class to transform.
|
2018-08-22 21:19:28 +02:00 |
|
miterosan
|
173d12c1ec
|
rename arrange to transform
|
2018-08-22 21:17:18 +02:00 |
|
miterosan
|
c374755cc8
|
only affect spinner, hitcircle and slider and nothing else.
|
2018-08-22 21:16:45 +02:00 |
|
miterosan
|
d070a3e2d8
|
Only affect hitcicles, slider and spinner
|
2018-08-22 20:46:03 +02:00 |
|
smoogipoo
|
d14dad64e8
|
Fix hitobject stacking being applied too early
|
2018-08-21 16:01:28 +09:00 |
|
Dean Herbert
|
1984ae6d0b
|
Merge pull request #3266 from smoogipoo/remove-override
Remove sliderball's ReceiveMouseInput override
|
2018-08-21 13:04:04 +09:00 |
|
smoogipoo
|
34b1abeca3
|
Remove sliderball's input override
|
2018-08-21 12:24:48 +09:00 |
|
Dan Balasescu
|
c4264794e0
|
Merge branch 'master' into relax
|
2018-08-21 12:11:10 +09:00 |
|
Dean Herbert
|
e628e78f24
|
Update uniform usage
|
2018-08-20 13:39:22 +09:00 |
|
Dean Herbert
|
6a4ff19c90
|
Merge branch 'master' into relax
|
2018-08-17 23:17:07 +09:00 |
|
Dean Herbert
|
41f8609e0f
|
Also handle OnScroll
|
2018-08-17 20:13:14 +09:00 |
|
Dean Herbert
|
442f6795bc
|
Block user input
|
2018-08-17 19:33:14 +09:00 |
|
smoogipoo
|
557a2ee39d
|
Add more comprehensive tests
|
2018-08-17 10:04:00 +09:00 |
|
smoogipoo
|
eb6f1ae72c
|
Fix spinners providing one extra combo
|
2018-08-17 09:16:28 +09:00 |
|
Dean Herbert
|
bc22a28fef
|
Clean up logic and variables
|
2018-08-16 18:18:15 +09:00 |
|
Dean Herbert
|
870f6bea47
|
Only process alive objects
|
2018-08-16 18:18:08 +09:00 |
|
Dean Herbert
|
ff0dfa7acf
|
Merge branch 'master' into relax
|
2018-08-16 17:36:24 +09:00 |
|
smoogipoo
|
31f324945e
|
Implement combo offsets
|
2018-08-15 11:47:31 +09:00 |
|
smoogipoo
|
da3e2cfee2
|
Catch/osu! spinners should have combo
|
2018-08-15 11:13:23 +09:00 |
|
miterosan
|
82054cde38
|
Merge branch 'master' into ArrangeMod
|
2018-08-14 21:57:10 +02:00 |
|
Dan Balasescu
|
c1517e1521
|
Merge branch 'master' into judgement-rework
|
2018-08-06 12:30:46 +09:00 |
|
smoogipoo
|
3a7488767c
|
Make HitObject not store the judgement
|
2018-08-06 11:50:18 +09:00 |
|
smoogipoo
|
741ec0021e
|
Rename more judgement-related methods to "result"
|
2018-08-06 11:31:46 +09:00 |
|
smoogipoo
|
ab642b563f
|
CreateJudgementResult -> CreateResult
|
2018-08-06 11:07:41 +09:00 |
|
smoogipoo
|
5fd4ed2f4e
|
Rename judgement-related methods/events + commenting
|
2018-08-06 10:55:25 +09:00 |
|
miterosan
|
89a18e4aac
|
remove nl and add comment for -1 and +1
|
2018-08-05 15:39:12 +02:00 |
|
miterosan
|
d1ffb7c2d7
|
Use timepreempt and put appeartime and move duration into their own vars.
|
2018-08-05 15:38:27 +02:00 |
|
miterosan
|
8ad8c2b6d0
|
Reset the ScoreMultiplier to 1
|
2018-08-05 15:16:25 +02:00 |
|
miterosan
|
7653ce80cd
|
add a period after EVERYTHING
|
2018-08-05 15:16:10 +02:00 |
|
miterosan
|
d32ffc1ebc
|
Swtich order of the moveto and the movetooffset.
|
2018-08-05 15:14:52 +02:00 |
|
miterosan
|
876d410fa1
|
Add missing ;
|
2018-08-05 15:13:04 +02:00 |
|
miterosan
|
f02d1f9013
|
move the 250 appear disance to a const var.
|
2018-08-05 15:10:42 +02:00 |
|
tgi74000
|
924bf9174c
|
Fix overclick in certain situations
|
2018-08-05 09:58:15 +02:00 |
|
tgi74000
|
b1d1a2400b
|
Remove IUpdatableByHitObject completely
|
2018-08-05 09:52:19 +02:00 |
|
miterosan
|
546bdf0618
|
remove default value init .-.
|
2018-08-04 00:36:59 +02:00 |
|
miterosan
|
25791b6317
|
remove space.
|
2018-08-04 00:30:46 +02:00 |
|
miterosan
|
159ce8e93e
|
Add license header
|
2018-08-04 00:29:32 +02:00 |
|
miterosan
|
67c64ac459
|
Put the arrange mod into the fun section.
|
2018-08-04 00:26:26 +02:00 |
|
miterosan
|
5bb12b574b
|
The arrange mod is not ranked I think.
|
2018-08-04 00:26:06 +02:00 |
|
miterosan
|
3457bc08e5
|
Merge branch 'master' of https://github.com/ppy/osu into ArrangeMod
|
2018-08-04 00:21:48 +02:00 |
|
tgi74000
|
07d6a75e23
|
Rename variables to be human readable
|
2018-08-04 00:18:09 +02:00 |
|
tgi74000
|
7310c38df9
|
Add relax mod
|
2018-08-03 14:03:11 +02:00 |
|
smoogipoo
|
2a4994e5ce
|
Make hitobjects only have one judgement + result
|
2018-08-03 15:38:48 +09:00 |
|
smoogipoo
|
8d81e66f88
|
Fix osu score processor crashing
|
2018-08-02 21:07:11 +09:00 |
|
smoogipoo
|
4548d2c87f
|
Make Rulesets.Osu use the new judgement result structure
|
2018-08-02 20:36:38 +09:00 |
|
smoogipoo
|
462f1033c0
|
Migrate Rulesets.Osu to the new judgement system
|
2018-08-02 15:21:23 +09:00 |
|
Dean Herbert
|
3c06655672
|
Split out Special mods into Automation and Conversion
|
2018-07-31 18:00:42 +09:00 |
|
Dean Herbert
|
51506efd1a
|
Merge remote-tracking branch 'upstream/master' into peppy-fix-repeat-arrow-interpolation
|
2018-07-31 16:49:31 +09:00 |
|
Dean Herbert
|
ea6cab498e
|
Add comment
|
2018-07-31 16:47:13 +09:00 |
|
Dan Balasescu
|
04252293a7
|
Merge branch 'master' into fix-repeat-arrow-interpolation
|
2018-07-31 16:21:15 +09:00 |
|
Dean Herbert
|
874b5636e4
|
Merge remote-tracking branch 'upstream/master' into tgi74-more-skinning
|
2018-07-31 16:15:27 +09:00 |
|
Dean Herbert
|
976653fdf9
|
Minor formatting fixes
|
2018-07-31 16:13:52 +09:00 |
|
Dean Herbert
|
132241424d
|
Apply FollowPoint alpha to inner container (should not affect legacy skins)
|
2018-07-31 15:59:06 +09:00 |
|
Dan Balasescu
|
0a7a2c83a8
|
Merge branch 'master' into fix-follow-circle-size
|
2018-07-31 15:41:15 +09:00 |
|
Dean Herbert
|
a98bb057e2
|
Fix follow circle being scaled far larger than it should be
|
2018-07-31 15:27:21 +09:00 |
|
tgi74000
|
36afae5a24
|
Remove the inner followcircle fade, Fade the entire followcircle instead
|
2018-07-30 13:43:02 +02:00 |
|
Dean Herbert
|
21f3ff6e77
|
Fix slider repeat points appearing far too late
|
2018-07-30 18:51:25 +09:00 |
|
Dean Herbert
|
f4cda695e6
|
Improve rotation handling in edge cases
|
2018-07-30 18:50:59 +09:00 |
|
miterosan
|
4d306ef837
|
Add comments and clean up code.
|
2018-07-30 11:39:21 +02:00 |
|
miterosan
|
23a37d06cf
|
Implement the arrange mod.
|
2018-07-30 11:34:20 +02:00 |
|
tgi74000
|
c6aabc6d2d
|
Move the FollowCircle border to its own container
|
2018-07-30 10:52:37 +02:00 |
|
Dean Herbert
|
a39188f762
|
Merge remote-tracking branch 'upstream/master' into peppy-fix-repeat-arrow-interpolation
|
2018-07-30 17:29:21 +09:00 |
|
tgi74000
|
84135c49ca
|
Fix small FollowPoint rotation bug
|
2018-07-29 23:21:05 +02:00 |
|
tgi74000
|
18096490b6
|
Add support for followpoint skinning
|
2018-07-29 23:20:37 +02:00 |
|
tgi74000
|
4322475ad2
|
Add support for sliderb skinning (single frame only)
|
2018-07-29 22:29:07 +02:00 |
|
tgi74000
|
257c035f30
|
Add support for sliderfollowcircle skinning
|
2018-07-29 21:28:13 +02:00 |
|
tgi74000
|
52d9461f03
|
Add support for reversearrow skinning
|
2018-07-29 20:51:06 +02:00 |
|
tgi74000
|
2a9818a128
|
Add support for sliderscorepoint skinning
|
2018-07-29 20:42:05 +02:00 |
|
smoogipoo
|
ff2a3a6e92
|
Fix hitobjects not properly expiring if scrolling in the editor
|
2018-07-26 20:07:16 +09:00 |
|
Dean Herbert
|
10656be954
|
Add interpolation to repeat point during sliding
|
2018-07-23 16:55:38 +02:00 |
|