Dean Herbert
|
a1dd1057ce
|
Merge branch 'master' into more-global-scrollalgo
|
2018-11-14 17:15:24 +09:00 |
|
Dean Herbert
|
84d16ee71b
|
Merge branch 'master' into placement-hiding
|
2018-11-14 16:59:41 +09:00 |
|
Dean Herbert
|
4a28d66d2d
|
Merge pull request #3694 from smoogipoo/fix-mania-selections
Fix mania selection blueprint sizing
|
2018-11-14 16:59:26 +09:00 |
|
Dan Balasescu
|
4fbad65e3d
|
Merge pull request #2371 from miterosan/Private_Messages
Add framework for private messaging support
|
2018-11-14 15:43:46 +09:00 |
|
smoogipoo
|
7274908059
|
Implement interface
|
2018-11-14 15:33:09 +09:00 |
|
smoogipoo
|
050af88be9
|
Fix post-merge issues
|
2018-11-14 14:29:22 +09:00 |
|
Dean Herbert
|
1b2924ea4a
|
Merge branch 'master' into fix-mania-selections
|
2018-11-14 14:24:45 +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 |
|
Dean Herbert
|
fb22fc11f6
|
Merge remote-tracking branch 'upstream/master' into Private_Messages
|
2018-11-14 13:59:17 +09:00 |
|
Dean Herbert
|
9a9d5e60af
|
More refactors
|
2018-11-14 13:59:02 +09:00 |
|
Dean Herbert
|
2ae139d260
|
Merge branch 'master' into more-global-scrollalgo
|
2018-11-14 13:54:53 +09:00 |
|
Dean Herbert
|
5c66547c18
|
Merge pull request #3709 from smoogipoo/scrollalgorithm-timeat
Implement IScrollAlgorithm.TimeAt()
|
2018-11-14 13:50:48 +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
|
1b936dfc17
|
Merge pull request #3706 from smoogipoo/no-drawable-speedchangevis
Make scroll algorithms not tied to drawable hitobjects
|
2018-11-14 13:31:35 +09:00 |
|
Dean Herbert
|
8d59b7299f
|
Merge branch 'master' into no-drawable-speedchangevis
|
2018-11-14 13:22:01 +09:00 |
|
Dean Herbert
|
c4769f6802
|
Refactors
|
2018-11-14 13:19:51 +09:00 |
|
Dean Herbert
|
396a5b3cd0
|
Merge branch 'master' into Private_Messages
|
2018-11-14 12:49:54 +09:00 |
|
Dean Herbert
|
059f1d9bcb
|
Merge pull request #3671 from gotopie/hide-seekbar-with-no-song
Hide seekbar when no song is playing
|
2018-11-14 12:16:42 +09:00 |
|
Dean Herbert
|
b9278b3488
|
Fix brackets
|
2018-11-14 12:05:07 +09:00 |
|
Dean Herbert
|
161d476091
|
Merge remote-tracking branch 'upstream/master' into hide-seekbar-with-no-song
|
2018-11-14 11:53:43 +09:00 |
|
Dean Herbert
|
c77412992e
|
Merge conditionals
|
2018-11-14 11:53:34 +09:00 |
|
Jack Scotson
|
0bced171e7
|
Merge branch 'master' into keypad-enter
|
2018-11-13 17:11:21 +00:00 |
|
Scotsoo
|
4dab5db2e5
|
Allowing keypad enter to be used along with normal enter
|
2018-11-13 17:09:28 +00:00 |
|
Dean Herbert
|
3caf0cb0d9
|
Merge branch 'master' into no-drawable-speedchangevis
|
2018-11-13 19:42:04 +09:00 |
|
Dean Herbert
|
da3c4bc050
|
Merge branch 'master' into fix-mania-selections
|
2018-11-13 18:33:53 +09:00 |
|
Dean Herbert
|
7a918b06d9
|
Merge pull request #3704 from smoogipoo/immutable-sliderpath
Make SliderPath immutable
|
2018-11-13 18:27:36 +09:00 |
|
Dean Herbert
|
e7d984415b
|
Merge branch 'master' into immutable-sliderpath
|
2018-11-13 18:06:14 +09:00 |
|
Dean Herbert
|
93fe3ae333
|
Merge branch 'master' into tournament-tools
|
2018-11-13 17:49:12 +09:00 |
|
Dean Herbert
|
72ae22b0c4
|
Add support for creating new PM conversations
|
2018-11-13 17:24:11 +09:00 |
|
smoogipoo
|
a9a33b1fcb
|
Implement mania selection movements
|
2018-11-13 16:42:40 +09:00 |
|
smoogipoo
|
fc0030a391
|
Use common positional adjustment for note blueprints
|
2018-11-13 15:45:06 +09:00 |
|
smoogipoo
|
0f755c814c
|
Fix post-merge issue
|
2018-11-13 15:44:37 +09:00 |
|
smoogipoo
|
2c277545e0
|
Merge branch 'add-mania-selection-testcase' into mania-selection-movement
|
2018-11-13 15:40:51 +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 |
|
smoogipoo
|
25101ecd2c
|
Snap placement blueprint to columns
|
2018-11-13 14:13:29 +09:00 |
|
smoogipoo
|
6d43baf4bf
|
Make show/hide only invoked once each
|
2018-11-13 13:12:11 +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 |
|
Dean Herbert
|
8b9f7f6691
|
Merge branch 'master' into Private_Messages
|
2018-11-12 20:43:10 +09:00 |
|
Dean Herbert
|
4b1282235a
|
Merge remote-tracking branch 'upstream/master' into Private_Messages
|
2018-11-12 20:41:10 +09:00 |
|
Dean Herbert
|
302196e985
|
Merge pull request #3705 from peppy/update-framework
Update framework and resources
|
2018-11-12 19:58:03 +09:00 |
|
smoogipoo
|
3d8ef97e81
|
Add testcase
|
2018-11-12 19:41:06 +09:00 |
|
smoogipoo
|
1403fa26cf
|
Fix placement not working correctly for downwards scroll
|
2018-11-12 19:40:57 +09:00 |
|
smoogipoo
|
1d40a042f6
|
Extract common methods into ManiaPlacementBlueprint
|
2018-11-12 18:32:44 +09:00 |
|
smoogipoo
|
3a1fee59fb
|
Implement note placement
|
2018-11-12 18:24:18 +09:00 |
|
smoogipoo
|
a0c75a0597
|
Merge branch 'notepieces' into note-placement
|
2018-11-12 17:59:54 +09:00 |
|
smoogipoo
|
e302d5d005
|
Separate NoteSelectionBlueprint into a note piece
|
2018-11-12 17:59:39 +09:00 |
|
smoogipoo
|
9e1b54f1ef
|
Merge branch 'more-global-scrollalgo' into note-placement
|
2018-11-12 17:47:02 +09:00 |
|