RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,923 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

442 Commits

Author SHA1 Message Date
smoogipoo d8e7ad8241 Fix post-rebase issues 2018-11-12 17:36:19 +09:00
smoogipoo 10543cf1b6 Move rest of ScrollingPlayfield into ScrollingRulesetContainer 2018-11-12 17:34:35 +09:00
smoogipoo ad45bc7666 Move scroll direction to scrollinginfo 2018-11-12 17:34:35 +09:00
smoogipoo 7f0f143a1b Move IScrollAlgorithm to ScrollingRulesetContainer + use DI 2018-11-12 17:34:35 +09:00
smoogipoo aee7a80e71 ScrollAlgorithm -> ScrollVisualisationMethod 2018-11-12 17:26:37 +09:00
smoogipoo f66a9f4f1e Rename IScrollChangeVisualiser -> IScrollAlgorithm 2018-11-08 14:04:21 +09:00
smoogipoo a4caaf56ef Merge remote-tracking branch 'origin/master' into fix-slider-samples 
# Conflicts:
#	osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
#	osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
 2018-11-05 16:38:28 +09:00
Dean Herbert bb2f8deb18 ControlPoint -> PathControlPoint 
Also Curve -> Path.
 2018-11-01 03:56:51 +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 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
Dean Herbert ffbc88c1bf
Merge branch 'master' into fix-catch-scale 2018-10-12 20:56:37 +09:00
smoogipoo 83fd251c7b Pass sub-controlpoints as span slices 2018-10-11 17:44:25 +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 540a010fbb Implement an intermediary EditRulesetContainer 2018-10-03 15:36:24 +09:00
Hanamuke 08f58047c2 Remade measurements, turns out the correction was not needed 2018-09-30 16:08:17 +02:00
Hanamuke b983e20067 Merge branch 'master' into AR_Catch 2018-09-30 16:01:55 +02:00
smoogipoo cdeb4913c4 Adjust catcher size to match stable 2018-09-21 15:53:15 +09:00
smoogipoo c3fa7f167f Move aspect adjustments out of CatchPlayfield 2018-09-21 15:53:06 +09: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 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
Hanamuke 309d8c8cb4 CI 2018-09-19 18:43:39 +02:00
Hanamuke e7d78b94ae Remove ScrollingVisualisation from settings 2018-09-19 18:30:25 +02:00
Hanamuke e3cc25a96a Implement ConstantScrollingSpeedVisualiser 2018-09-18 20:21:10 +02:00
Dan Balasescu 29e023b252
Merge branch 'master' into fix_combo 2018-09-18 12:54:51 +09:00
Dean Herbert 2d74c088ce Add newline 2018-09-15 17:03:51 +09:00
Hanamuke dd7f667fe3 Disable scrolling speed control for osu!catch 2018-09-15 00:18:42 +02:00
Hanamuke a17200a66a Merge branch 'master' into fix_combo 2018-09-14 18:48:13 +02:00
Hanamuke 1c2cc3837a Compute combo for nested Objects. Display fruit depending on Combo for 
osu!catch
 2018-09-13 21:52:15 +02:00
Hanamuke 9b6f5c9097 Fix redundant paranthesis 2018-09-13 17:29:10 +02:00
Hanamuke 7e07a07c01 Fix HitObjects being out of order because of nested objects 2018-09-13 17:15:46 +02:00
Hanamuke 7d3380db66 Fixed comment. Created static CatchArea.GetCatcheWidth method 2018-09-13 17:01:33 +02:00
Hanamuke a3c3bfb1a8 Fixes hyperdash computation (for nested objects) 2018-09-12 19:48:35 +02:00
Dean Herbert 65018705f4
Restore IsLoaded check 2018-09-06 13:09:57 +09:00
Dean Herbert c03d1d9566 Attempt to fix CI failures on CatcherArea.Explode 2018-09-06 10:14:23 +09:00
Dean Herbert 03084aa04b Revert async changes 2018-08-31 07:07:10 +09:00
smoogipoo 1b279d383f Use GetAsync on all textures 2018-08-27 17:26:44 +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
Dan Balasescu c1517e1521
Merge branch 'master' into judgement-rework 2018-08-06 12:30:46 +09:00
smoogipoo 35b5aeb99a Fix missed rename 2018-08-06 12:23:08 +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 5fd4ed2f4e Rename judgement-related methods/events + commenting 2018-08-06 10:55:25 +09:00
smoogipoo 2a4994e5ce Make hitobjects only have one judgement + result 2018-08-03 15:38:48 +09:00
smoogipoo 9dff5cea07 Make Rulesets.Catch use the new judgement result structure 2018-08-02 20:37:07 +09:00