|
|
72ae22b0c4
|
Add support for creating new PM conversations
|
2018-11-13 17:24:11 +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 |
|
|
|
8b9f7f6691
|
Merge branch 'master' into Private_Messages
|
2018-11-12 20:43:10 +09:00 |
|
|
|
4b1282235a
|
Merge remote-tracking branch 'upstream/master' into Private_Messages
|
2018-11-12 20:41:10 +09:00 |
|
|
|
302196e985
|
Merge pull request #3705 from peppy/update-framework
Update framework and resources
|
2018-11-12 19:58:03 +09:00 |
|
|
|
e885c03cfa
|
Merge branch 'master' into update-framework
|
2018-11-12 17:45:16 +09:00 |
|
|
|
27a794f1d5
|
Merge pull request #3684 from peppy/better-rider-ignore
Change .idea ignore rules to not ignore run configurations
|
2018-11-12 17:41:31 +09:00 |
|
|
|
5051263106
|
Merge branch 'master' into better-rider-ignore
|
2018-11-12 17:19:39 +09:00 |
|
|
|
1101e161d9
|
Update framework and resources
|
2018-11-12 17:02:46 +09:00 |
|
|
|
0833ba2692
|
Merge pull request #3697 from peppy/fix-compose-mode
Fix compose mode not working
|
2018-11-09 12:33:17 +09:00 |
|
|
|
4783df1d4b
|
Fix compose mode not working
|
2018-11-09 11:36:06 +09:00 |
|
|
|
00749ffcec
|
Merge pull request #3693 from smoogipoo/manual-position-adjustments
Let selection blueprints handle positional adjustments
|
2018-11-09 11:22:13 +09:00 |
|
|
|
27549586e6
|
Merge branch 'master' into manual-position-adjustments
|
2018-11-09 10:53:41 +09:00 |
|
|
|
c6350c6efd
|
Remove IHasEditablePosition
|
2018-11-08 13:03:11 +09:00 |
|
|
|
c4be2af498
|
Merge pull request #3691 from smoogipoo/fix-hitobject-masking
Fix hitobjects not updating IsMaskedAway after being judged
|
2018-11-08 00:38:38 +09:00 |
|
|
|
f2e22e0fd1
|
Merge branch 'master' into fix-hitobject-masking
|
2018-11-08 00:26:38 +09:00 |
|
|
|
9467b055a5
|
Merge pull request #3690 from smoogipoo/cleanup-editor
Adjust some missed renames
|
2018-11-07 17:13:02 +09:00 |
|
|
|
5d51719572
|
Make selection blueprints handle position adjustments
|
2018-11-07 16:21:32 +09:00 |
|
|
|
2612fd3099
|
Adjust ruleset-specific namespaces
|
2018-11-07 16:10:21 +09:00 |
|
|
|
cf4dad0fe8
|
Fix hitobjects not updating IsMaskedAway after being judged
|
2018-11-07 15:42:40 +09:00 |
|
|
|
4277cb0d59
|
Adjust some missed renames
|
2018-11-07 15:04:48 +09:00 |
|
|
|
c142b86fd6
|
Merge pull request #3685 from smoogipoo/cleanup-editor
Re-namespace + rename compose-mode components
|
2018-11-07 13:55:27 +09:00 |
|
|
|
e9e50f41fb
|
Use Name/NameScreen format
|
2018-11-07 13:04:17 +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 |
|
|
|
27d82052f4
|
BorderLayer -> EditorPlayfieldBorder
|
2018-11-06 18:10:46 +09:00 |
|
|
|
85f96ad62f
|
Fix a few missed renames
|
2018-11-06 18:07:53 +09:00 |
|
|
|
b3fa7c111b
|
Rename testcases
|
2018-11-06 18:06:20 +09:00 |
|
|
|
bd775af274
|
PlacementMask -> PlacementBlueprint
|
2018-11-06 18:04:03 +09:00 |
|
|
|
11be820efe
|
CreateMaskFor -> CreateBlueprintFor
|
2018-11-06 18:03:21 +09:00 |
|
|
|
90c813618a
|
Merge PlacementContainer into BlueprintContainer
|
2018-11-06 18:02:55 +09:00 |
|
|
|
f2a5f28ea2
|
SelectionMask -> SelectionBlueprint
|
2018-11-06 17:56:04 +09:00 |
|
|
|
ad2836a61e
|
MaskSelection -> SelectionBox
|
2018-11-06 17:52:47 +09:00 |
|
|
|
65bb91dcf7
|
Merge MaskContainer into BlueprintContainer
|
2018-11-06 17:51:26 +09:00 |
|
|
|
26c9390c16
|
HitObjectMaskLayer -> BlueprintContainer
|
2018-11-06 17:36:10 +09:00 |
|
|
|
faab744cbd
|
DragLayer -> DragBox
|
2018-11-06 17:24:57 +09:00 |
|
|
|
779e57f0ca
|
Change .idea ignore rules to not ignore run configurations
|
2018-11-06 16:32:11 +09:00 |
|
|
|
5eecdffa5d
|
Merge pull request #3683 from peppy/build-executable-flag
Add executable flag to build.sh
|
2018-11-06 16:31:13 +09:00 |
|
|
|
2c4aa5af65
|
Add executable flag to build.sh
|
2018-11-06 16:16:15 +09:00 |
|
|
|
1fbf15d65c
|
Merge pull request #3681 from peppy/update-framework
Update framework and other dependencies
|
2018-11-05 18:33:31 +09:00 |
|
|
|
4554fc2c7b
|
Update framework and other dependencies
|
2018-11-05 18:22:16 +09:00 |
|
|
|
6aa61e1516
|
Merge pull request #3600 from smoogipoo/fix-slider-samples
Fix sliders using the wrong samples
|
2018-11-05 18:19:25 +09:00 |
|
|
|
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 |
|
|
|
697b1f6728
|
Merge pull request #3680 from smoogipoo/fix-add-bank
Fix sample additions not falling back to non-addition bank
|
2018-11-05 18:06:21 +09:00 |
|
|
|
92d570342c
|
Fix sample additions not falling back to non-addition bank
|
2018-11-05 17:35:24 +09:00 |
|
|
|
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 |
|
|
|
09b2710fbf
|
Merge pull request #3678 from smoogipoo/force-sort-objects
Sort nested hitobjects post-creation
|
2018-11-05 16:31:39 +09:00 |
|
|
|
998a540cf8
|
Merge branch 'master' into force-sort-objects
|
2018-11-05 16:23:11 +09:00 |
|
|
|
e600cbce80
|
Merge pull request #3679 from smoogipoo/debounce-seeks
Debounce editor summary timeline seeks
|
2018-11-05 16:21:57 +09:00 |
|
