|
|
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 |
|
|
|
0bc4a01a6b
|
Merge remote-tracking branch 'upstream/master' into tournament-tools
|
2018-11-24 20:03:25 +09:00 |
|
|
|
cadfe41f83
|
Merge remote-tracking branch 'origin/master' into external_link_warning
|
2018-11-23 15:19:52 +09:00 |
|
|
|
f91d2e2e07
|
Merge remote-tracking branch 'upstream/master' into tournament-tools
|
2018-11-22 10:25:30 +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 |
|
|
|
b574a07f23
|
Merge remote-tracking branch 'upstream/master' into tournament-tools
|
2018-11-15 13:31:34 +09: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 |
|
|
|
a8b1e509e7
|
Merge remote-tracking branch 'upstream/master' into tournament-tools
|
2018-11-07 17:30:52 +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 |
|
|
|
0f1ffe392f
|
Merge remote-tracking branch 'upstream/master' into tournament-tools
|
2018-11-01 17:52:24 +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 |
|
|
|
e14719e440
|
Mask -> Piece for non-mask components
|
2018-10-25 18:28:10 +09:00 |
|
|
|
d19f80835b
|
Adjust namespaces
|
2018-10-25 18:26:28 +09:00 |
|
|
|
b4c68f4cf7
|
Show a warning prior to opening external links
|
2018-10-22 23:16:57 +03:00 |
|
|
|
b8ac328ae9
|
Rename APIChangelog to APIChangelogBuild
|
2018-10-18 21:04:21 +02:00 |
|
|
|
7cc5128353
|
Merge branch 'master' into changelog-overlay
|
2018-10-18 20:26:56 +02:00 |
|
|
|
0e841628b6
|
Implement hitobject deletion
|
2018-10-18 16:36:06 +09:00 |
|
|
|
cd718812b2
|
Merge branch 'master' into tighten-diffcalc-tolerances
|
2018-10-18 14:01:47 +09:00 |
|
|
|
1a62283cb4
|
Merge branch 'master' into tournament-tools
|
2018-10-18 00:29:29 +09:00 |
|
|
|
969477dadd
|
Remove placement events, make everything pass top-down
|
2018-10-17 17:43:16 +09:00 |
|
|
|
4ea4ec0d25
|
Move placement handling events to a higher level
|
2018-10-17 15:46:30 +09:00 |
|
