h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-30 07:07:25 +08:00
Code Issues Releases Wiki Activity
17,921 Commits 3 Branches 647 Tags 363 MiB
910b9df2d5
Commit Graph

1297 Commits

Author SHA1 Message Date
Dean Herbert
e6ee3dc73e Use framework helper functions for path approximation 2018-11-02 19:26:29 +09:00
Dean Herbert
7f1ee3bcb4 Disallow spinner movement for now 2018-11-02 12:06:53 +09:00
smoogipoo
2ac4f2b6af Lock spinners to centre of screen 2018-11-01 19:24:58 +09:00
smoogipoo
d78348f178 Reduce duplicate code 2018-11-01 19:23:37 +09:00
smoogipoo
1aae123ff5 Make approximators share an interface 2018-11-01 19:16:44 +09:00
Dean Herbert
1265d5ac0b
Merge branch 'master' into spinner-placement-2 2018-11-01 18:05:44 +09:00
Dean Herbert
c1304eca1b Merge remote-tracking branch 'upstream/master' into slider-placement 2018-11-01 17:59:37 +09:00
Dean Herbert
5fd21d35dc
Merge branch 'master' into spinner-selection 2018-11-01 17:47:59 +09:00
Dean Herbert
bb2f8deb18 ControlPoint -> PathControlPoint 
Also Curve -> Path.
 2018-11-01 03:56:51 +09:00
smoogipoo
ffec532079 Fix segment control points not changing in unison 2018-10-31 19:02:47 +09:00
smoogipoo
d2fbf05137 Reduce size of control point 2018-10-31 18:01:53 +09:00
WebFreak001
cbd14d5b0e Merge branch 'master' of https://github.com/ppy/osu into mod-fl2 2018-10-29 19:28:21 +01:00
smoogipoo
aec1d95f04 Implement spinner placement 2018-10-29 18:37:28 +09:00
smoogipoo
e04ad8357d Make spinner piece respond to scale changes 2018-10-29 18:37:12 +09:00
smoogipoo
af1de01ed6 Add a spinner selection mask 2018-10-29 18:23:23 +09:00
smoogipoo
2ae7b42244 Fix control points disappearing if moved offscreen 2018-10-29 16:15:15 +09:00
smoogipoo
5998d6454b Use ControlPointVisualiser instead of custom implementation 2018-10-29 15:56:17 +09:00
smoogipoo
08b16be3b8 Merge branch 'slider-controlpoint-masks' into slider-placement 
# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/Components/SliderBodyPiece.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
 2018-10-29 15:55:38 +09:00
smoogipoo
c1fffde10d Fix broken conditional 2018-10-29 15:52:28 +09:00
smoogipoo
acd703c27b Make sliders respond to control point changes 2018-10-29 15:36:43 +09:00
smoogipoo
b0f5ace0e8 Implement slider control point visualisation 2018-10-29 15:29:34 +09:00
smoogipoo
660cd24750 Make sliders respond to scale changes 2018-10-29 15:26:28 +09:00
smoogipoo
a9f1484e8b Fix some post-rebase issues 2018-10-29 15:26:28 +09:00
smoogipoo
4fa511043e Use common body piece 2018-10-29 15:26:28 +09:00
smoogipoo
b28f44087d Bring up to date with further placement changes 2018-10-29 15:26:28 +09:00
smoogipoo
6310c183fa Modify slider position directly 2018-10-29 15:26:07 +09:00
smoogipoo
8fa783b4c5 Use begin/end placement methods 2018-10-29 15:26:07 +09:00
smoogipoo
a491fb42df Set slider start time when head is placed 2018-10-29 15:26:07 +09:00
smoogipoo
9540e53e32 Initial controlpoint implementation 2018-10-29 15:26:07 +09:00
smoogipoo
2c4616dbb1 Adjust visual display of the placement curve 2018-10-29 15:26:07 +09:00
smoogipoo
402950b132 Implement path drawing 2018-10-29 15:26:07 +09:00
smoogipoo
bd915e8dca Implement initial slider placement (linear) 2018-10-29 15:26:06 +09:00
smoogipoo
38ce8f8af1 Refactor SliderSelectionMask 2018-10-29 15:26:06 +09:00
smoogipoo
9b19050faf Update with slider body changes 2018-10-29 15:25:20 +09:00
smoogipoo
619a0dfd59 Merge branch 'separate-slider-body' into editor-mask-placement 
# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs
 2018-10-29 15:24:15 +09:00
smoogipoo
dd5a3ad59c Fix SliderMask not working 2018-10-29 15:17:45 +09:00
smoogipoo
86e09a68f7 Separate slider body to bypass snaking logic 
The snaking logic contains a lot of caching/optimisations and offsetting of the path which is tedious to re-compute when the path changes.
 2018-10-29 15:15:29 +09:00
Dean Herbert
4f65d67e2b
Merge branch 'master' into skinnable-spritetext 2018-10-28 08:35:25 -07:00
WebFreak001
72e82b660d Adjust blinds animations based on player feedback 2018-10-28 01:14:16 +02:00
WebFreak001
3b08ad0742 Merge branch 'master' of https://github.com/ppy/osu into mod-fl2 
Changes how OsuModBlinds passes the playfield and how DrawableOsuBlinds
handles the restrictTo parameter.
 2018-10-27 16:34:48 +02:00
smoogipoo
22c545ea8c Make circle piece respond to hitobject scale 2018-10-26 15:26:19 +09:00
smoogipoo
4a507c66ee Cleanup 2018-10-26 15:26:08 +09:00
smoogipoo
f674fcf2c8 Merge branch 'mask-separation' into editor-mask-placement 
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
#	osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
#	osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
 2018-10-26 14:05:30 +09:00
smoogipoo
ea3c960b5b Mask -> Piece for components 2018-10-26 13:51:03 +09:00
smoogipoo
9656186b64 Make the hitobject masks move within their placement/selection 
# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/Components/HitCircleMask.cs
#	osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/HitCircleSelectionMask.cs
#	osu.Game.Rulesets.Osu/Edit/Masks/HitCirclePlacementMask.cs
#	osu.Game/Rulesets/Edit/PlacementMask.cs
 2018-10-26 13:45:31 +09:00
smoogipoo
4051864bb4 Re-namespace 2018-10-26 13:39:19 +09:00
smoogipoo
e1db2bbc25 Split visuals of HitCircleSelectionMask into HitCircleMask 2018-10-26 13:31:44 +09:00
smoogipoo
677d0d4a19 Renamespace ruleset masks 2018-10-26 13:31:38 +09:00
smoogipoo
8703db5cc1 Rename HitObjectMask -> SelectionMask 2018-10-26 13:31:23 +09:00
smoogipoo
e14719e440 Mask -> Piece for non-mask components 2018-10-25 18:28:10 +09:00
smoogipoo
d19f80835b Adjust namespaces 2018-10-25 18:26:28 +09:00
smoogipoo
ea6db8b793 Make the hitobject masks move within their placement/selection 2018-10-25 18:16:25 +09:00
Dean Herbert
a9e5a4351e
Merge branch 'master' into fix-diffcalc-slider-distance 2018-10-21 20:33:50 +09:00
Dean Herbert
f19cc98e6a Add slightly more explanation 2018-10-20 23:10:33 +09:00
Dean Herbert
0952c20c84
Adjust comment slightly 2018-10-20 23:06:48 +09:00
Dan Balasescu
d284f29637
Add comment describing the speed multiplier 2018-10-18 14:16:46 +09:00
Dean Herbert
cd718812b2
Merge branch 'master' into tighten-diffcalc-tolerances 2018-10-18 14:01:47 +09:00
smoogipoo
1cf6cd10bb Fix slider travel distances sometimes not being considered 2018-10-18 11:29:50 +09:00
smoogipoo
f42f9cffe3 Make HitCirclePlacementMask directly modify hitcircle position 2018-10-17 18:16:34 +09:00
smoogipoo
d36ac59ca2 Reduce complexity of creating edit ruleset containers 2018-10-17 18:06:00 +09:00
smoogipoo
08e3fe1def Add PlacementStarted event, rename placement methods 2018-10-17 14:37:45 +09:00
smoogipoo
e8ce5a7e6c Fix crashes when manually creating sliders 2018-10-16 18:27:09 +09:00
smoogipoo
f384c7228e Fix post-merge issues 2018-10-16 17:28:23 +09:00
smoogipoo
70f1d17b7e Merge remote-tracking branch 'origin/master' into editor-mask-placement 
# Conflicts:
#	osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
#	osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
#	osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
#	osu.Game/Rulesets/UI/RulesetContainer.cs
 2018-10-16 17:28:16 +09:00
smoogipoo
47be95ce0b Fix slider nodes using the wrong samples 2018-10-16 17:10:24 +09:00
smoogipoo
5095fbcdf7 Merge remote-tracking branch 'origin/master' into optimise-diffcalc 2018-10-16 10:27:18 +09:00
smoogipoo
657bd5e371 Add some xmldocs 2018-10-15 12:32:59 +09:00
smoogipoo
2f943e77aa Make Velocity and TickDistance private set 2018-10-15 12:31:52 +09:00
smoogipoo
26b91c96fb Fix wrong number of ticks on some legacy beatmaps 2018-10-15 12:27:58 +09:00
Dean Herbert
468f7fd1ea Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework 2018-10-12 19:25:08 +09:00
Jan Jurzitza
460c943958
Merge branch 'master' into mod-fl2 2018-10-12 11:44:55 +02:00
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
e0a8157d92
Merge branch 'master' into mod-fl2 2018-10-10 19:48:46 +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
WebFreak001
8a01fc1bff Make random in blinds mod the same every replay 2018-09-17 20:31:50 +02:00
WebFreak001
2de3b33780 Readonly fixes 2018-09-16 16:57:43 +02:00
WebFreak001
c9ea5ce817 Made blinds open during breaks and start 2018-09-16 16:51:18 +02:00
WebFreak001
633e8fafee Style & const fix 2018-09-16 12:57:54 +02:00
WebFreak001
91b25870ef Make fruit catcher enter and leave what's behind the blinds 2018-09-16 12:48:36 +02:00
Fayne Aldan
d855e5957a Don't wiggle repeat points independently 2018-09-15 16:16:37 -06:00
WebFreak001
5f3c0549c9 Sprites in blinds mod & gameplay improvements 
There are now skinnable actual blinds (shoji screen panels)
The black overlay is still behind them to avoid cheating with skins
The blinds don't open linearly anymore, they are health squared now
When easy mod is on, there is always a little gap open
 2018-09-15 23:44:22 +02:00
WebFreak001
040a44d42c Merge branch 'master' of github.com:WebFreak001/osu into mod-fl2 2018-09-15 20:12:06 +02: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
WebFreak001
b33954d9db Implement blinds mod 2018-08-05 14:20:56 +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
Dean Herbert
d868d81b59
Merge branch 'master' into centralise-judgement-display 2018-07-23 02:58:49 +09:00
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
Dean Herbert
3fc7f33e90
Merge branch 'master' into centralise-judgement-display 2018-07-20 17:29:15 +09:00
smoogipoo
1139f0dbf2 Centralise method of disabling playfield judgements 2018-07-20 17:04:33 +09:00
Dean Herbert
ffd3040fe2 Fix GameplayCursor state not restoring correctly after Show/Hide 2018-07-18 19:59:04 +09:00
Dan Balasescu
64cde1ebad
Merge branch 'master' into use-switch-over-if 2018-07-17 16:44:57 +09:00
Dean Herbert
825941aff1 Use switch with type matching in place of if-else where possible 2018-07-17 14:35:09 +09:00
Dean Herbert
b967fe714b Fix lead-in time now being long enough in many cases 2018-07-17 14:29:22 +09:00
smoogipoo
2d8e2dc5f7 Merge remote-tracking branch 'origin/master' into osu-default-bindings 2018-07-13 19:32:40 +09:00
Ethan Yang
157ca8b2a4 Change osu key bindings 2018-07-08 11:47:39 -07:00
Dean Herbert
79af5cb0a0 Limit shake duration to ensure it doesn't overlap miss window 2018-07-06 17:24:30 +09:00
Dean Herbert
e041352690 Add comment regarding add/clear/remove overrides 2018-07-06 13:19:43 +09:00
Dean Herbert
48d90a67ae xmldoc and formatting 2018-07-06 12:13:23 +09:00
Dean Herbert
aa96d91762 Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake 2018-07-06 11:57:32 +09:00
Dean Herbert
d453414070 Forward shakes from slider head objects to sliders 2018-07-06 11:52:58 +09:00
tgi74000
558b2622a7 Move the Shake logic to a new ShakeContainer 2018-07-05 15:48:54 +02:00
Dean Herbert
1d6609d9f3 Add common custom words to dotsettings dictionary 
Also fixes some typos and reduces spelling suggestions to hints.
 2018-07-05 15:54:41 +09:00
smoogipoo
45a4187923 Tidy up lookups to NestedHitObjects 2018-07-02 16:10:56 +09:00
Dean Herbert
831b11ff97 Remove unnecessary null checks 2018-07-02 14:28:56 +09:00
Dean Herbert
c04bfb96e1 Merge remote-tracking branch 'upstream/master' into UselessToucan-null_coalescing_quickfix 2018-07-02 14:26:41 +09:00
Dean Herbert
812929fa05 Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess 2018-07-02 13:10:42 +09:00
Dan Balasescu
f35ea18755
Merge branch 'master' into hit-shake 2018-06-29 17:38:02 +09:00
tgi74000
3d50050089 Move shake duration to a constant 2018-06-29 10:36:00 +02:00
Dan Balasescu
e3317b5145
Make method protected 2018-06-29 17:31:13 +09:00
Dean Herbert
098aeabc9e
Merge branch 'master' into catch-scoring 2018-06-29 17:16:14 +09:00
Dean Herbert
c0b65a6a73 Change default IsBonus definition and remove unnecessary overrides 2018-06-29 17:07:08 +09:00
Dean Herbert
cacabeb67e Remove unused field 2018-06-29 17:00:41 +09:00
Dean Herbert
0940715631
Merge branch 'master' into catch-scoring 2018-06-29 14:59:15 +09:00
smoogipoo
756cabd5d0 Add a preprocess method to BeatmapProcessor 2018-06-29 12:45:48 +09:00
Dean Herbert
9d4bc7b630 Fix combo index being wrong 2018-06-29 01:34:47 +09:00
Dean Herbert
0a945e4709 Check whether initialised first 2018-06-28 22:44:40 +09:00
tgi74000
59e03fa528 Move Shake to DrawableOsuHitObject, Clean up Shake() 2018-06-28 15:33:59 +02:00
tgi74000
61c416dc16 Trigger Shake if HitCircles are hit too early 2018-06-28 13:41:23 +02:00
Dean Herbert
e197ebe4c5 Fix slider heads displaying in incorrect colour 2018-06-28 01:55:09 +09:00
Dean Herbert
10220a61a5 Use playfield size constants where possible 2018-06-27 12:18:00 +09:00
smoogipoo
0e6cc78d9a Add slider ticks conversion test 2018-06-27 12:09:40 +09:00
smoogipoo
6f65ad33f0 Output one value per slider nested hitobject 2018-06-27 12:09:40 +09:00
smoogipoo
0366b0f081 The tail circle will always be the last hitobject 2018-06-27 12:09:40 +09:00
smoogipoo
80501de4b9 Add legacy slider offsets 2018-06-27 12:09:21 +09:00
Roman Kapustin
2a72062c33 Perhaps the '??' operator works in a different way than it was expected. Its priority is lower than priority of other operators in its left part. 2018-06-26 00:53:31 +03:00
Dean Herbert
22138d39ca
Merge branch 'master' into more-diffcalc-attributes 2018-06-25 19:53:22 +09:00
ekrctb
d6084c0b30 Adapt to new input handling changes 2018-06-22 18:10:27 +09:00
smoogipoo
48989df6eb Make sure that 0 SR is returned when there are no hitobjects 2018-06-21 12:04:14 +09:00
Dan Balasescu
bf11a61d52
Merge branch 'master' into more-diffcalc-attributes 2018-06-21 09:26:50 +09:00
Dan Balasescu
77e03a59a9
Merge branch 'master' into ruleset-container 2018-06-19 21:47:10 +09:00
Tom Arrow
ad883e087a RulesetContainer<TObject> cannot be derived 2018-06-19 14:31:24 +02:00
Dan Balasescu
0b1b3319aa
Merge branch 'master' into update-framework 2018-06-19 20:57:19 +09:00
Dean Herbert
3819ecb2be Update framework 2018-06-19 20:19:52 +09:00
Tom Arrow
4aa89de2d7 Fix reverse arrow displayed with incorrect angle 2018-06-18 17:22:01 +02:00
smoogipoo
41abd5990c Move osu! difficulty attributes to OsuDifficultyCalculator 2018-06-14 16:27:05 +09:00
smoogipoo
af218b3d8d No need to use properties 2018-06-14 16:13:21 +09:00
smoogipoo
8f7334874c Fix up performance calculators 2018-06-14 16:04:48 +09:00
smoogipoo
47fc18d7c4 Adjust OsuDifficultyCalculator in-line with changes 2018-06-14 15:45:16 +09:00
Dean Herbert
f4cb0d7d8d Fix memory leak due to incorrect binding 2018-06-13 14:16:58 +09:00
Dean Herbert
ae136e89a4
Merge branch 'master' into ruleset-configs 2018-06-12 13:13:18 +09:00
Dan Balasescu
9994c69d58
Merge branch 'master' into fix-object-ordering 2018-06-11 17:53:33 +09:00
smoogipoo
f4fbf27d42 Give ruleset settings a ruleset-specific config manager 2018-06-11 13:28:50 +09:00
Crusensis
fbc0cd6f5f Split AffectsCombo into IsBonus 2018-06-09 18:14:33 -07:00
Dean Herbert
aaa65c428f
Merge branch 'master' into diffcalc-modtypes 2018-06-09 23:35:17 +09:00
smoogipoo
ff60f69f47 Explicitly construct local beatmaps rather than using GetBoundCopy 2018-06-06 20:19:30 +09:00
smoogipoo
72cc53aded Rename GameBeatmap -> BindableBeatmap 2018-06-06 20:16:20 +09:00
smoogipoo
4086ff7313 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change 
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
#	osu.Game/Screens/Menu/Intro.cs
#	osu.Game/Screens/Menu/MenuSideFlashes.cs
 2018-06-06 18:26:51 +09:00
smoogipoo
83ff47ec80 Rewrite difficulty mod combinations 2018-06-06 16:20:17 +09:00
Dean Herbert
3567823759 Reverse order of exposed objects in HitObjectContainer 
Closes #2740.
 2018-06-06 15:03:47 +09:00
smoogipoo
8274623ad6 Cleanup multi mod constructions 2018-06-06 14:07:50 +09:00
Dean Herbert
f253828d49 Fix regressions 2018-06-06 13:51:51 +09:00
Dean Herbert
ee92986494
Merge branch 'master' into osu-hd-setting 2018-06-06 12:09:12 +09:00
Dean Herbert
4b604bf055
Merge branch 'master' into disallow-beatmap-change 2018-06-04 10:53:04 +09:00
smoogipoo
2ccffb9ac4 Add difficulty calculation mod types 2018-06-03 10:59:56 +09:00
Dean Herbert
2f21b9c4ea Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits 2018-05-31 12:36:37 +09:00
smoogipoo
a3470f9ec3 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change 
# Conflicts:
#	osu.Game/Overlays/Music/PlaylistOverlay.cs
#	osu.Game/Screens/OsuScreen.cs
 2018-05-28 18:01:15 +09:00
smoogipoo
d850e34003 Actually cast to int 2018-05-26 09:25:16 +09:00
smoogipoo
215cc9fba7 Change all performance calculators to use int hitwindows 
Has a pretty large (>6) effect on pp for some maps.
 2018-05-25 20:07:14 +09:00
smoogipoo
765a50d007 Remove 0.5 offsets 
Checked up against DB values + server-side build versions, and these 0.5s don't seem to exist. Brings calculations more in-line with osu!stable.
 2018-05-25 20:05:53 +09:00
smoogipoo
8004b8af4d Privatise the OsuGame beatmap, add local beatmap to OsuTestCase 2018-05-23 17:38:02 +09:00
Dean Herbert
cea935ea40
Merge branch 'master' into osu-hd-setting 2018-05-21 15:21:09 +09:00
smoogipoo
1f37dca7b7 Fix HR / EZ being applied twice to AR 2018-05-19 14:47:06 +09:00
Dean Herbert
8e784d9104
Merge branch 'master' into fix-conversion-hitwindows 2018-05-18 11:59:16 +09:00
Vidalee
6a1abf4084
Merge branch 'master' into osu-hd-setting 2018-05-17 19:39:17 +02:00
smoogipoo
eba1d309b6 Fix incorrect namespace of OsuPerformanceCalculator 2018-05-17 16:58:22 +09:00
smoogipoo
f67d263596 Move ruleset-specific hitwindows to post-converted hitobjects 2018-05-17 13:35:15 +09:00
smoogipoo
c1d9fcc140 Make OsuPerformanceCalculator use the new hitresult namings 2018-05-16 12:46:31 +09:00
smoogipoo
cf08293be1 Remove extra newline 2018-05-15 21:49:44 +09:00
smoogipoo
4101b8ddde Merge remote-tracking branch 'origin/master' into more-diffcalc-improvements 2018-05-15 21:31:58 +09:00
smoogipoo
22f3bee55a Fix incorrect iteration over difficulty sections 2018-05-15 21:26:06 +09:00
smoogipoo
bc197a88e1 Fix slider length calculation including slider head 2018-05-15 21:25:33 +09:00
smoogipoo
1b5c151e0e Fix DeltaTime being capped incorrectly 2018-05-15 21:25:02 +09:00
smoogipoo
49c36787d7 Remove triangle pattern and remove not-implemented reading strain 2018-05-15 21:24:41 +09:00
Dean Herbert
0e0cc8bb69
Merge branch 'master' into namespace-cleanup 2018-05-15 18:10:48 +09:00
smoogipoo
995fda9b6f Move base classes to osu.Game.Rulesets.Difficulty namespace 2018-05-15 17:38:08 +09:00
smoogipoo
9fd972e0a3 Rename OsuDifficulty -> Difficulty 2018-05-15 17:36:29 +09:00
Dean Herbert
e39af1c906
Merge branch 'master' into convert-object-hitwindows 2018-05-15 17:33:27 +09:00
smoogipoo
10e2f74538 Port osu-performance HD AR fix 2018-05-15 11:53:11 +09:00
smoogipoo
a81921118d Strip whitespaces 2018-05-14 11:54:11 +09:00
smoogipoo
6e1d651087 Merge remote-tracking branch 'origin/master' into convert-object-hitwindows 2018-05-14 11:17:39 +09:00
smoogipoo
ce6b4cc2d3 Add more attributes to OsuPerformanceCalculator's output 2018-05-14 11:15:37 +09:00
smoogipoo
e1b8a1589b Fix TimeRate not being considered for performance calculation 2018-05-14 11:15:14 +09:00
Dean Herbert
f6df704deb
Merge branch 'master' into diffcalc-fixes 2018-05-12 22:16:20 +09:00
smoogipoo
416ed72597 Port osu-performance changes into OsuPerformanceCalculator 2018-05-12 15:46:25 +09:00
smoogipoo
a337248999 Fix incorrect count 2018-05-11 22:06:16 +09:00
smoogipoo
224f1a0810 Fix incorrect osu! difficulty calculator combo count 2018-05-11 21:49:16 +09:00
smoogipoo
faa82f17cc Pass original hitobject HitWindows during conversion 2018-05-11 15:30:50 +09:00
Vidalee
16bcd6c3ed
Appvtests (#1) 
* Resolving AppVeyor's errors
 2018-05-08 14:33:26 +02:00
smoogipoo
251bdfdee8 Simplify statistics in osu ruleset 2018-05-07 15:51:08 +09:00
smoogipoo
5f74dc2c17 Simplify osu-ruleset statistics 2018-05-07 15:51:08 +09:00
smoogipoo
5489976c20 Implement ruleset-specific beatmap statistics 2018-05-07 15:51:08 +09:00
smoogipoo
268c14813b Fix resharper warnings 2018-05-07 11:38:41 +09:00
smoogipoo
9128e64c9a Rename OriginalBeatmap back to Beatmap 2018-05-07 10:29:38 +09:00
smoogipoo
4ecdea8b2e Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer 2018-05-07 10:17:54 +09:00
smoogipoo
77e661489d Merge branch 'i-beatmap' into beatmap-conversion-rework 2018-05-07 10:00:24 +09:00
smoogipoo
1aefd71b65 Merge remote-tracking branch 'origin/master' into i-beatmap 2018-05-07 09:58:53 +09:00
Vidalee
393c01ba90 Made the changes requested 2018-05-06 12:38:25 +02:00
Dean Herbert
76e58a51b9 Merge remote-tracking branch 'upstream/master' into Vidalee-osu-hd-setting 2018-04-25 17:28:21 +09:00
smoogipoo
0dce7a5b61 Update framework + fix CI errors 2018-04-20 18:19:17 +09:00
smoogipoo
c9e4a07e12 Merge remote-tracking branch 'origin/master' into remove-approachcircle-hax 
# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/OsuEditPlayfield.cs
#	osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
 2018-04-20 18:04:43 +09:00
smoogipoo
03a5df84c6 Initial rework of beatmap conversion process 2018-04-19 22:04:12 +09:00
smoogipoo
66b3b295e7 Use IBeatmap wherever possible 2018-04-19 20:44:38 +09:00
tgi74000
9b36cf2066 Review changes 2018-04-16 14:14:40 +02:00
tgi74000
b23b0a445b Add support for replay mods 2018-04-13 15:41:35 +02:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00