Dean Herbert
|
626048038c
|
Handle the null case
|
2018-11-26 16:50:41 +09:00 |
|
Dan Balasescu
|
38ef1d1f03
|
Merge branch 'master' into multiplayer-room-settings
|
2018-11-26 16:46:27 +09:00 |
|
Dean Herbert
|
b751a0d918
|
Merge branch 'master' into fix_idle_tracker
|
2018-11-26 16:44:04 +09:00 |
|
Dean Herbert
|
87da7b05a6
|
Remove unnecessarily specified RelativeSizeAxes
|
2018-11-26 16:39:11 +09:00 |
|
Dean Herbert
|
68f0d25550
|
Mvoe private method to bottom
|
2018-11-26 16:33:58 +09:00 |
|
Dean Herbert
|
8d65d49126
|
Use bindable flow for checking idle time
|
2018-11-26 16:32:59 +09:00 |
|
smoogipoo
|
dea387c31e
|
Fix post-merge issues
|
2018-11-26 16:29:56 +09:00 |
|
smoogipoo
|
dcf740e5d3
|
Merge remote-tracking branch 'origin/master' into multiplayer-room-settings
|
2018-11-26 16:27:22 +09:00 |
|
Dan Balasescu
|
f58f3e22c7
|
Merge pull request #3753 from miterosan/ChatManager_with_BindableCollection
Chat manager with bindable collection
|
2018-11-26 16:24:41 +09:00 |
|
smoogipoo
|
efdad3a3a7
|
Merge remote-tracking branch 'origin/master' into ChatManager_with_BindableCollection
|
2018-11-26 16:12:55 +09:00 |
|
smoogipoo
|
f9f300b215
|
Fix drag breaking if scrolling while dragging
|
2018-11-26 16:08:56 +09:00 |
|
Dean Herbert
|
fe5b043a59
|
Merge branch 'master' into fix_idle_tracker
|
2018-11-26 15:24:44 +09:00 |
|
Dean Herbert
|
4cfeb1b9a1
|
Merge branch 'master' into note-placement
|
2018-11-26 14:35:31 +09:00 |
|
Dean Herbert
|
e94c5dfabe
|
Merge pull request #3744 from smoogipoo/fix-deletion-crash
Implement mania note deletion
|
2018-11-26 14:28:39 +09:00 |
|
Dean Herbert
|
c944e8bb29
|
Merge branch 'master' into fix-deletion-crash
|
2018-11-26 14:20:02 +09:00 |
|
Dean Herbert
|
bfebed053d
|
Merge branch 'master' into note-placement
|
2018-11-26 14:19:46 +09:00 |
|
Dean Herbert
|
c854ab498a
|
Merge pull request #3716 from smoogipoo/mania-selection-movement
Implement mania selection blueprint movements
|
2018-11-26 14:13:16 +09:00 |
|
smoogipoo
|
60ffad169f
|
Fix post-merge errors
|
2018-11-26 11:47:48 +09:00 |
|
smoogipoo
|
c0fcbc283e
|
Merge branch 'note-placement' into inter-column-movements
# Conflicts:
# osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
|
2018-11-26 11:47:22 +09:00 |
|
smoogipoo
|
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 |
|
smoogipoo
|
5d6a438f98
|
Make selected mania hitobjects always alive
|
2018-11-26 11:34:25 +09:00 |
|
smoogipoo
|
7229559cf7
|
Merge remote-tracking branch 'origin/master' into mania-selection-movement
|
2018-11-26 10:56:54 +09:00 |
|
smoogipoo
|
91aa00b0e9
|
Add helper method to get column by position
|
2018-11-26 10:54:54 +09:00 |
|
smoogipoo
|
4ba3fa4ab6
|
osuTK
|
2018-11-26 10:44:48 +09:00 |
|
smoogipoo
|
4fbe28e98f
|
Merge remote-tracking branch 'origin/master' into note-placement
|
2018-11-26 10:42:20 +09:00 |
|
Dean Herbert
|
83b040fddc
|
Merge pull request #3765 from 123tris/master
Correct typo in function name
|
2018-11-25 21:32:03 +09:00 |
|
Dean Herbert
|
54a10c1284
|
Merge branch 'master' into master
|
2018-11-25 20:45:18 +09:00 |
|
Dean Herbert
|
99fd9e0b83
|
Merge pull request #3768 from naoey/fix-beatmapset-overlay-double-focus
Fix BeatmapSetOverlay focusing twice when loading from API
|
2018-11-25 20:44:06 +09:00 |
|
naoey
|
c71fc0b800
|
Don't focus overlay again after set is fetched
|
2018-11-25 14:49:09 +05:30 |
|
Dan Balasescu
|
b5fdbe8d87
|
Merge branch 'master' into master
|
2018-11-25 01:38:19 +09:00 |
|
123tris
|
b2d21e4ee0
|
* Corrected misspelling of function in DrawableFruit.cs and refactored all of its use cases
|
2018-11-24 16:50:23 +01:00 |
|
Dan Balasescu
|
c22ab0a529
|
Merge pull request #3625 from UselessToucan/external_link_warning
Show a warning prior to opening external links
|
2018-11-23 15:28:50 +09:00 |
|
smoogipoo
|
cadfe41f83
|
Merge remote-tracking branch 'origin/master' into external_link_warning
|
2018-11-23 15:19:52 +09:00 |
|
smoogipoo
|
df004d7a49
|
Adjust dialog text
|
2018-11-23 15:19:15 +09:00 |
|
smoogipoo
|
ac73844fe0
|
Fix header potentially overflowing the dialog
|
2018-11-23 15:19:09 +09:00 |
|
Dean Herbert
|
4c0c9f0aa7
|
Merge pull request #3761 from peppy/fix-channelmanager-cache
Fix order of ChannelManager dependency caching
|
2018-11-23 11:09:23 +09:00 |
|
Dean Herbert
|
afa547af84
|
Fix order of ChannelManager dependency caching
|
2018-11-23 11:00:17 +09:00 |
|
Dan Balasescu
|
91b484a643
|
Merge pull request #3759 from peppy/fix-editor-precise-scroll
Fix precision scroll events being handled incorrectly by editor
|
2018-11-23 10:34:42 +09:00 |
|
Dan Balasescu
|
b446a73c0c
|
Add brackets
Co-Authored-By: peppy <pe@ppy.sh>
|
2018-11-23 10:06:06 +09:00 |
|
Dean Herbert
|
1b76e2faf5
|
Merge branch 'master' into fix-editor-precise-scroll
|
2018-11-23 09:57:35 +09:00 |
|
Dean Herbert
|
b77228a338
|
Merge pull request #3749 from peppy/fix-channel-presence
Fix channel presence being handled incorrectly
|
2018-11-23 08:46:35 +09:00 |
|
Dean Herbert
|
a4259261e3
|
Merge branch 'master' into fix-channel-presence
|
2018-11-23 08:11:46 +09:00 |
|
Dan Balasescu
|
2271ca5e35
|
Merge pull request #3758 from peppy/fix-invalid-cached
Fix leaderboard accessing drawables in a possibly invalid state
|
2018-11-23 00:19:52 +09:00 |
|
Dan Balasescu
|
2f368a32d4
|
Merge branch 'master' into fix-invalid-cached
|
2018-11-22 23:56:20 +09:00 |
|
Dan Balasescu
|
0ee4b1c4ac
|
Merge branch 'master' into fix-channel-presence
|
2018-11-22 21:52:16 +09:00 |
|
Dean Herbert
|
10047e6815
|
Adjust tick-based wheel control to be more correct
|
2018-11-22 20:13:40 +09:00 |
|
Dean Herbert
|
1da2006dea
|
Merge branch 'master' into note-placement
|
2018-11-22 19:44:39 +09:00 |
|
Dean Herbert
|
a48c26d999
|
Fix precision scroll events being handled incorrectly by editor
|
2018-11-22 19:40:44 +09:00 |
|
Dean Herbert
|
72dba5d7ac
|
Merge pull request #3755 from smoogipoo/hide-playlist-popout
Hide playlist when MusicController is hidden
|
2018-11-22 19:37:07 +09:00 |
|
Dean Herbert
|
61fdfe39fd
|
Add comment
|
2018-11-22 19:21:32 +09:00 |
|