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

1055 Commits

Author SHA1 Message Date
Poyo 08d7c2df70 Fix extra hard-rock flipping for sliders 2018-12-21 16:08:08 -08:00
Dean Herbert ef9d93ff6b Remove mod multipliers 
We decided that mods shouldn't be interacting with other mods. This can be added once we have the ability to have per-mod settings, as a difficulty setting local to blinds.
 2018-12-20 19:46:39 +09:00
Dean Herbert d3368df94d Simplify changes to RulesetContainer 2018-12-20 19:35:32 +09:00
Dean Herbert bb850da200 Remove skinnability for now 
Not sure if we want this going forward.
 2018-12-20 15:48:45 +09:00
Dean Herbert 4f34d42b33 Major code refactors 2018-12-07 21:11:35 +09:00
Dean Herbert d379d02761 Remove unnecessary base class 2018-12-07 20:12:56 +09:00
WebFreak001 6eff7d9acc Style fixes 2018-12-06 14:34:10 +01:00
WebFreak001 a14de5bd1b Remove blinds random NPC 2018-12-06 12:52:39 +01:00
WebFreak001 46b98702e1 make target animation call more obvious 2018-12-06 12:48:11 +01:00
WebFreak001 3cb91979bd Merge branch 'master' of https://github.com/ppy/osu into mod-fl2 2018-12-06 12:14:48 +01:00
smoogipoo 8eff49bccd Remove User from Replay 2018-11-30 18:25:14 +09:00
Dean Herbert d97a15a504 Add IMod and change ShortenedName to Acronym 2018-11-30 17:16:00 +09:00
Dean Herbert 831cd3ed59 ScoreInfo scoreInfo -> ScoreInfo score 2018-11-30 15:18:52 +09:00
Dean Herbert 271dcded3c
Merge branch 'master' into scoredatabase 2018-11-30 14:59:58 +09:00
Dean Herbert 5254b07680 Merge remote-tracking branch 'upstream/master' into inter-column-movements 2018-11-30 11:57:53 +09:00
smoogipoo aea84f737b Fix taiko hitobjects potentially disappearing before being judged 2018-11-29 12:12:29 +09:00
smoogipoo 52bc47499f Fix spinners not having proper lifetimes 2018-11-29 12:11:45 +09:00
smoogipoo b8e60afa69 Move replays to an wrapping Score class 2018-11-28 18:45:17 +09:00
smoogipoo 219929eb47 Score -> ScoreInfo 2018-11-28 18:33:01 +09:00
smoogipoo 2ee181daf7 Re-namespace replay-related classes 2018-11-28 17:20:37 +09:00
smoogipoo 09b79d736b Remove unused usings 2018-11-28 16:33:42 +09:00
smoogipoo 5fd6e6ca77 Re-namespacing 2018-11-28 16:12:57 +09:00
smoogipoo f9f300b215 Fix drag breaking if scrolling while dragging 2018-11-26 16:08:56 +09:00
smoogipoo 56032a4522 Merge branch 'mania-selection-movement' into inter-column-movements 
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
#	osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
 2018-11-26 11:45:48 +09:00
smoogipoo f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
smoogipoo 55edeb095d SelectionBox -> SelectionHandler 2018-11-19 16:58:11 +09:00
Dean Herbert dd21daa635
Merge branch 'master' into fix-mask-disposal 2018-11-18 21:18:00 +09:00
smoogipoo 4cbda97b1e Move positional adjustment to SelectionBox 2018-11-16 17:12:24 +09:00
smoogipoo df7515b66f Pass all selected hitobjects to the selection blueprints 2018-11-15 21:01:09 +09:00
jorolf 41a0f9896e
Merge branch 'master' into flashlight-mod 2018-11-15 00:35:42 +01:00
jorolf 7d2958b7b0 split shader, remove unnecessary clutter and fix some bugs 2018-11-15 00:33:13 +01:00
Dean Herbert 1501e05c04
Merge branch 'master' into fix-mask-disposal 2018-11-14 21:27:37 +09:00
Dean Herbert 84d16ee71b
Merge branch 'master' into placement-hiding 2018-11-14 16:59:41 +09:00
smoogipoo 050af88be9 Fix post-merge issues 2018-11-14 14:29:22 +09:00
smoogipoo 29422345f7 Merge remote-tracking branch 'origin/master' into fix-mask-disposal 
# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
#	osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
#	osu.Game.Rulesets.Osu/Objects/Slider.cs
 2018-11-14 14:03:25 +09:00
smoogipoo 819cba31ce Fix spinners not starting placement with the first click 2018-11-13 12:52:44 +09:00
smoogipoo fbc20d2d4d Hide placement when cursor is not in the playfield 2018-11-13 12:52:04 +09:00
smoogipoo f3ba429701 Make sure control points is internally initialised 2018-11-12 17:14:06 +09:00
smoogipoo d594ce3530 Revert "Make SliderPath.ControlPoints read-only" 
This reverts commit 3b88d94793.

# Conflicts:
#	osu.Game/Rulesets/Objects/SliderPath.cs
 2018-11-12 16:20:38 +09:00
smoogipoo 3aba462e52 Make Path.Distance a property again 2018-11-12 14:07:48 +09:00
smoogipoo 3b88d94793 Make SliderPath.ControlPoints read-only 2018-11-12 14:03:54 +09:00
smoogipoo 51e4feeda7 Adjust to new path structure 2018-11-12 13:55:14 +09:00
smoogipoo 54ab256c8e Instantiate a new path rather than setting properties on it 
# Conflicts:
#	osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
#	osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
#	osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
#	osu.Game/Rulesets/Objects/Legacy/Catch/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
#	osu.Game/Rulesets/Objects/SliderPath.cs
 2018-11-12 13:50:19 +09:00
jorolf 023924396d Move flashlight code from OsuModFlashlight to ModFlashlight and implement other modes and break time 2018-11-11 18:38:12 +01:00
smoogipoo 13279f707b Cleanups 2018-11-09 14:19:50 +09:00
smoogipoo cc8531790a Use bindables for hitobject events 2018-11-09 13:58:46 +09:00
smoogipoo c6350c6efd Remove IHasEditablePosition 2018-11-08 13:03:11 +09:00
jorolf 5c09662c14 Allow flashlight size to be variant 2018-11-07 23:40:33 +01:00
smoogipoo 5d51719572 Make selection blueprints handle position adjustments 2018-11-07 16:21:32 +09:00
smoogipoo 2612fd3099 Adjust ruleset-specific namespaces 2018-11-07 16:10:21 +09:00