Commit Graph

669 Commits

Author SHA1 Message Date
d42c45c87e Add full tests 2018-12-07 14:01:51 +09:00
94045413ce Change statistics to be int for now 2018-12-05 19:44:01 +09:00
bc9290bfcb Schedule cross thread access in test case 2018-12-03 18:43:51 +09:00
8eff49bccd Remove User from Replay 2018-11-30 18:25:14 +09:00
d97a15a504 Add IMod and change ShortenedName to Acronym 2018-11-30 17:16:00 +09:00
271dcded3c Merge branch 'master' into scoredatabase 2018-11-30 14:59:58 +09:00
5254b07680 Merge remote-tracking branch 'upstream/master' into inter-column-movements 2018-11-30 11:57:53 +09:00
219929eb47 Score -> ScoreInfo 2018-11-28 18:33:01 +09:00
09b79d736b Remove unused usings 2018-11-28 16:33:42 +09:00
5fd6e6ca77 Re-namespacing 2018-11-28 16:12:57 +09:00
da79292250 Merge branch 'master' into fix_idle_tracker 2018-11-26 17:41:45 +09:00
77090500e8 Merge branch 'fix_idle_tracker' of https://github.com/UselessToucan/osu into fix_idle_tracker 2018-11-26 17:41:22 +09:00
bf2ecef6d8 Add comprehensive tests 2018-11-26 17:40:25 +09:00
38ef1d1f03 Merge branch 'master' into multiplayer-room-settings 2018-11-26 16:46:27 +09:00
dea387c31e Fix post-merge issues 2018-11-26 16:29:56 +09:00
dcf740e5d3 Merge remote-tracking branch 'origin/master' into multiplayer-room-settings 2018-11-26 16:27:22 +09:00
efdad3a3a7 Merge remote-tracking branch 'origin/master' into ChatManager_with_BindableCollection 2018-11-26 16:12:55 +09:00
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
cadfe41f83 Merge remote-tracking branch 'origin/master' into external_link_warning 2018-11-23 15:19:52 +09:00
7f1f7300d3 Add channels to chatManager.AvailableChannels by using a hack. 2018-11-21 23:15:44 +01:00
39e9c61e24 OpenTK -> osuTK 2018-11-21 23:11:08 +01:00
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
55edeb095d SelectionBox -> SelectionHandler 2018-11-19 16:58:11 +09:00
376e76e00d Resolve merge conflicts 2018-11-18 16:10:36 +03:00
e9b47c6233 Merge branch 'master' into hold-for-menu-back 2018-11-14 18:22:34 +09:00
a1dd1057ce Merge branch 'master' into more-global-scrollalgo 2018-11-14 17:15:24 +09:00
fb22fc11f6 Merge remote-tracking branch 'upstream/master' into Private_Messages 2018-11-14 13:59:17 +09:00
8b190edde0 Merge branch 'master' into more-global-scrollalgo 2018-11-14 13:32:14 +09:00
396a5b3cd0 Merge branch 'master' into Private_Messages 2018-11-14 12:49:54 +09:00
3caf0cb0d9 Merge branch 'master' into no-drawable-speedchangevis 2018-11-13 19:42:04 +09:00
82ebc74eee Fix testcase 2018-11-13 15:36:36 +09:00
f241fcdba1 Add back support for new API and private messages 2018-11-13 15:20:59 +09:00
4b1282235a Merge remote-tracking branch 'upstream/master' into Private_Messages 2018-11-12 20:41:10 +09:00
d8e7ad8241 Fix post-rebase issues 2018-11-12 17:36:19 +09:00
10543cf1b6 Move rest of ScrollingPlayfield into ScrollingRulesetContainer 2018-11-12 17:34:35 +09:00
ad45bc7666 Move scroll direction to scrollinginfo 2018-11-12 17:34:35 +09:00
7f0f143a1b Move IScrollAlgorithm to ScrollingRulesetContainer + use DI 2018-11-12 17:34:35 +09:00
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
8583fd1380 Fix testcase never working 2018-11-08 14:04:20 +09:00
2612fd3099 Adjust ruleset-specific namespaces 2018-11-07 16:10:21 +09:00
e9e50f41fb Use Name/NameScreen format 2018-11-07 13:04:17 +09:00
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
52f4923c8e Remove intermediate Screens namespace 2018-11-06 18:28:22 +09:00
ac25718c5a Renamespace compose-mode components 2018-11-06 18:14:46 +09:00
bd775af274 PlacementMask -> PlacementBlueprint 2018-11-06 18:04:03 +09:00
f2a5f28ea2 SelectionMask -> SelectionBlueprint 2018-11-06 17:56:04 +09:00
ad2836a61e MaskSelection -> SelectionBox 2018-11-06 17:52:47 +09:00
26c9390c16 HitObjectMaskLayer -> BlueprintContainer 2018-11-06 17:36:10 +09:00
faab744cbd DragLayer -> DragBox 2018-11-06 17:24:57 +09:00
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