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

933 Commits

Author SHA1 Message Date
Dean Herbert b574a07f23 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-15 13:31:34 +09:00
Dan Balasescu e9b47c6233
Merge branch 'master' into hold-for-menu-back 2018-11-14 18:22:34 +09:00
Dean Herbert a1dd1057ce
Merge branch 'master' into more-global-scrollalgo 2018-11-14 17:15:24 +09:00
Dean Herbert fb22fc11f6 Merge remote-tracking branch 'upstream/master' into Private_Messages 2018-11-14 13:59:17 +09:00
Dean Herbert 2ae139d260
Merge branch 'master' into more-global-scrollalgo 2018-11-14 13:54:53 +09:00
Dean Herbert 34973a3e9f
Merge branch 'master' into scrollalgorithm-timeat 2018-11-14 13:32:16 +09:00
Dean Herbert 8b190edde0
Merge branch 'master' into more-global-scrollalgo 2018-11-14 13:32:14 +09:00
Dean Herbert 396a5b3cd0
Merge branch 'master' into Private_Messages 2018-11-14 12:49:54 +09:00
Dean Herbert 3caf0cb0d9
Merge branch 'master' into no-drawable-speedchangevis 2018-11-13 19:42:04 +09:00
Dean Herbert 82ebc74eee Fix testcase 2018-11-13 15:36:36 +09:00
Dean Herbert f241fcdba1 Add back support for new API and private messages 2018-11-13 15:20:59 +09:00
Dean Herbert 4b1282235a Merge remote-tracking branch 'upstream/master' into Private_Messages 2018-11-12 20:41:10 +09:00
smoogipoo b9b20607af Add IScrollAlgorithm.TimeAt() 2018-11-12 17:43:22 +09:00
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 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
smoogipoo 8583fd1380 Fix testcase never working 2018-11-08 14:04:20 +09:00
Dean Herbert a8b1e509e7 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-07 17:30:52 +09:00
smoogipoo 2612fd3099 Adjust ruleset-specific namespaces 2018-11-07 16:10:21 +09:00
smoogipoo e9e50f41fb Use Name/NameScreen format 2018-11-07 13:04:17 +09:00
Dean Herbert 7f73fc2d39 Require holding back button to quit gameplay 
Avoids accidental presses and streamlines logic with on-screen element.
 2018-11-07 01:49:21 +09:00
smoogipoo 52f4923c8e Remove intermediate Screens namespace 2018-11-06 18:28:22 +09:00
smoogipoo ac25718c5a Renamespace compose-mode components 2018-11-06 18:14:46 +09:00
smoogipoo bd775af274 PlacementMask -> PlacementBlueprint 2018-11-06 18:04:03 +09:00
smoogipoo f2a5f28ea2 SelectionMask -> SelectionBlueprint 2018-11-06 17:56:04 +09:00
smoogipoo ad2836a61e MaskSelection -> SelectionBox 2018-11-06 17:52:47 +09:00
smoogipoo 26c9390c16 HitObjectMaskLayer -> BlueprintContainer 2018-11-06 17:36:10 +09:00
smoogipoo faab744cbd DragLayer -> DragBox 2018-11-06 17:24:57 +09:00
Dean Herbert 43c70d354d Merge tag '2018.1105.0' into tournament-tools 2018-11-06 00:35:21 +09:00
Dean Herbert 4554fc2c7b Update framework and other dependencies 2018-11-05 18:22:16 +09:00
smoogipoo ace1dce281 Merge remote-tracking branch 'origin/master' into fix-slider-samples 
# Conflicts:
#	osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
 2018-11-05 18:10:22 +09:00
smoogipoo 92d570342c Fix sample additions not falling back to non-addition bank 2018-11-05 17:35:24 +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 0f1ffe392f Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-01 17:52:24 +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 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 8a2a6a3ecb Preserve the beatmap's version 2018-10-23 14:59:21 +09:00
smoogipoo 0e841628b6 Implement hitobject deletion 2018-10-18 16:36:06 +09:00
Dean Herbert cd718812b2
Merge branch 'master' into tighten-diffcalc-tolerances 2018-10-18 14:01:47 +09:00
Dean Herbert 1a62283cb4 Merge branch 'master' into tournament-tools 2018-10-18 00:29:29 +09:00
smoogipoo 969477dadd Remove placement events, make everything pass top-down 2018-10-17 17:43:16 +09:00
smoogipoo 4ea4ec0d25 Move placement handling events to a higher level 2018-10-17 15:46: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
smoogipoo 2f943e77aa Make Velocity and TickDistance private set 2018-10-15 12:31:52 +09:00
Dean Herbert a314a561d0
Merge branch 'master' into playfield-scaling-rework 2018-10-12 19:32:43 +09:00