HoLLy
|
9dd3d28436
|
Fix SettingsTextBox having width of 0
|
2018-11-14 22:29:11 +01:00 |
|
Dean Herbert
|
1501e05c04
|
Merge branch 'master' into fix-mask-disposal
|
2018-11-14 21:27:37 +09:00 |
|
Dean Herbert
|
92adcb7613
|
Merge pull request #3719 from smoogipoo/dropdown-updates
Update with osu!-side dropdown changes
|
2018-11-14 21:27:16 +09:00 |
|
Dean Herbert
|
caaa5645e3
|
Correct framework version
|
2018-11-14 21:16:08 +09:00 |
|
Dean Herbert
|
30547ac064
|
Merge remote-tracking branch 'upstream/master' into dropdown-updates
|
2018-11-14 20:03:45 +09:00 |
|
Dan Balasescu
|
287d7043f8
|
Merge pull request #3686 from peppy/hold-for-menu-back
Require holding back button to quit gameplay
|
2018-11-14 19:32:24 +09:00 |
|
smoogipoo
|
f1f2fc133a
|
Use SkinInfo directly
|
2018-11-14 19:29:20 +09:00 |
|
Dan Balasescu
|
81a3170e3b
|
Merge branch 'master' into hold-for-menu-back
|
2018-11-14 19:13:07 +09:00 |
|
Dean Herbert
|
e34881c2c0
|
Merge pull request #3714 from smoogipoo/placement-hiding
Hide the placement blueprint when cursor is outside the playfield
|
2018-11-14 18:54:26 +09:00 |
|
Dan Balasescu
|
61a62a4eae
|
Merge branch 'master' into hold-for-menu-back
|
2018-11-14 18:35:08 +09:00 |
|
smoogipoo
|
4b86c29f7b
|
Merge remote-tracking branch 'origin/master' into placement-hiding
|
2018-11-14 18:34:45 +09:00 |
|
smoogipoo
|
c963fc7cd2
|
Reduce chaining
|
2018-11-14 18:34:13 +09:00 |
|
Dean Herbert
|
4dec2d1db0
|
Merge remote-tracking branch 'upstream/master' into note-placement
|
2018-11-14 18:29:31 +09:00 |
|
Dean Herbert
|
996e51db11
|
Merge pull request #3708 from smoogipoo/add-mania-selection-testcase
Add mania selection blueprint testcases
|
2018-11-14 18:28:30 +09:00 |
|
Dan Balasescu
|
e9b47c6233
|
Merge branch 'master' into hold-for-menu-back
|
2018-11-14 18:22:34 +09:00 |
|
Dean Herbert
|
a83efe225e
|
Merge remote-tracking branch 'upstream/master' into add-mania-selection-testcase
|
2018-11-14 18:11:53 +09:00 |
|
Dean Herbert
|
9e24266934
|
Merge pull request #3710 from smoogipoo/notepieces
Separate note selection mask into a note piece
|
2018-11-14 18:11:07 +09:00 |
|
smoogipoo
|
aff5fa6169
|
Update with osu!-side dropdown changes
|
2018-11-14 18:02:38 +09:00 |
|
Dean Herbert
|
3fbabdfed2
|
Merge branch 'master' into notepieces
|
2018-11-14 17:30:39 +09:00 |
|
Dean Herbert
|
635c1bf833
|
Merge pull request #3707 from smoogipoo/more-global-scrollalgo
Move scroll algorithm to a more global location
|
2018-11-14 17:27:32 +09:00 |
|
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 |
|
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
|
72ae22b0c4
|
Add support for creating new PM conversations
|
2018-11-13 17:24:11 +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 |
|