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 |
|
Dean Herbert
|
6cd69b794d
|
Fix leaderboard accessing drawables in a possibly invalid state
|
2018-11-22 19:08:46 +09:00 |
|
Dean Herbert
|
a144e97568
|
Fix crash on creating two new PM channels
|
2018-11-22 18:27:22 +09:00 |
|
smoogipoo
|
d1ec9fc294
|
Merge remote-tracking branch 'Joehuu/master' into fix-channel-presence
|
2018-11-22 13:04:32 +09:00 |
|
smoogipoo
|
5caa67d735
|
Hide playlist when MusicController is hidden
|
2018-11-22 12:12:34 +09:00 |
|
Dan Balasescu
|
304a731d2e
|
Merge pull request #3754 from peppy/match-framework-inspections
Change for-loop inspection to match framework
|
2018-11-22 11:15:23 +09:00 |
|
Dean Herbert
|
bbb36198a4
|
Change for-loop inspection to match framework
|
2018-11-22 10:26:05 +09:00 |
|
miterosan
|
f8809505d9
|
Merge remote-tracking branch 'origin/master' into ChatManager_with_BindableCollection
# Conflicts:
# osu.Game/Overlays/ChatOverlay.cs
|
2018-11-21 23:24:07 +01:00 |
|
miterosan
|
4f41512265
|
Lowercase the references to joinedChannel and availableChannels
|
2018-11-21 23:21:27 +01:00 |
|
miterosan
|
21c9353fee
|
Remove not used usings
|
2018-11-21 23:15:45 +01:00 |
|
miterosan
|
7f1f7300d3
|
Add channels to chatManager.AvailableChannels by using a hack.
|
2018-11-21 23:15:44 +01:00 |
|
miterosan
|
a14b6ac9df
|
Replace ObservableCollection with BindableCollection
|
2018-11-21 23:15:44 +01:00 |
|
smoogipoo
|
cd2737156f
|
Fix crashes when importing/deleting from model managers
|
2018-11-21 23:11:09 +01:00 |
|
smoogipoo
|
aac7081580
|
Update package
|
2018-11-21 23:11:09 +01:00 |
|
smoogipoo
|
39e9c61e24
|
OpenTK -> osuTK
|
2018-11-21 23:11:08 +01:00 |
|
Dean Herbert
|
2126cf0d9a
|
Fix join process for PMs being incorrect
|
2018-11-21 20:44:41 +09:00 |
|
Dean Herbert
|
b31efb7bb9
|
Fix PM channel type
|
2018-11-21 20:34:36 +09:00 |
|
Dean Herbert
|
7de85659ba
|
Merge branch 'master' into mania-selection-movement
|
2018-11-21 20:00:46 +09:00 |
|
Dean Herbert
|
65f4a01081
|
Merge pull request #3743 from smoogipoo/osuTK
OpenTK -> osuTK everywhere
|
2018-11-21 19:18:33 +09:00 |
|
Dean Herbert
|
d677921680
|
Remove excess newline
|
2018-11-21 18:53:50 +09:00 |
|
Dean Herbert
|
7755242a43
|
Merge branch 'master' into osuTK
|
2018-11-21 18:53:11 +09:00 |
|
Dean Herbert
|
ecd7deaf1e
|
Merge pull request #3746 from smoogipoo/fix-threaded-callback-crashes
Fix crashes when importing/deleting from model managers
|
2018-11-21 18:52:20 +09:00 |
|
Dean Herbert
|
88f82eb722
|
Fix instabilities in channel join logic
|
2018-11-21 17:15:15 +09:00 |
|
Dean Herbert
|
4cde66240d
|
Fix default channels not being joined
|
2018-11-21 17:15:15 +09:00 |
|
Dean Herbert
|
eab2776755
|
Fix a crash on leaving the selected channel
|
2018-11-21 17:15:15 +09:00 |
|
Dean Herbert
|
68621fbd0e
|
Merge pull request #3748 from smoogipoo/add-private-channels
Add private channel types
|
2018-11-21 13:12:48 +09:00 |
|
smoogipoo
|
ab2c969122
|
Add private channel types
|
2018-11-21 12:58:45 +09:00 |
|
smoogipoo
|
5ad96afea0
|
Fix crashes when importing/deleting from model managers
|
2018-11-20 18:09:23 +09:00 |
|
smoogipoo
|
2a41c38294
|
Update package
|
2018-11-20 17:30:03 +09:00 |
|