1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 06:00:05 +08:00
Commit Graph

15449 Commits

Author SHA1 Message Date
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
smoogipoo
dc8cd51e15 Implement mania note deletion 2018-11-20 17:26:00 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Dan Balasescu
51c192d4b7
Merge pull request #3742 from peppy/support-all-channels
Add support for all channel types
2018-11-20 16:00:19 +09:00
Dean Herbert
23a446bab2 Add support for all channel types 2018-11-20 15:03:55 +09:00
Dan Balasescu
1b86318ab4
Merge pull request #3741 from peppy/increase-squirrel-logging
Add squirrel update log output
2018-11-20 14:29:22 +09:00
Dan Balasescu
777b33b30e
Trim newline 2018-11-20 13:36:50 +09:00
Dean Herbert
375543c644 Add squirrel update log output
Also updates squirrel to latest version.
2018-11-20 13:29:24 +09:00
Dean Herbert
6c9d1e6cf8
Merge pull request #3726 from smoogipoo/fix-taiko-lifetimes
Fix taiko proxies not receiving the correct lifetimes
2018-11-20 04:16:11 +09:00
Dean Herbert
ed26d8ebec
Merge branch 'master' into fix-taiko-lifetimes 2018-11-20 04:05:05 +09:00
Roman Kapustin
285b199d7d Make IdleTracker IHandleGlobalInput 2018-11-19 20:50:46 +03:00
Roman Kapustin
3c0ce2b615 Revert "Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle""
This reverts commit bcdaee7d39.
2018-11-19 20:48:59 +03:00
smoogipoo
d5b937f88f Fix post-merge issue 2018-11-19 19:17:03 +09:00
Dean Herbert
12e0d8761d
Merge pull request #3737 from smoogipoo/revert-idletracker
Revert idletracker changes
2018-11-19 19:08:58 +09:00
Dan Balasescu
8cee4141e8
Merge branch 'master' into note-placement 2018-11-19 19:08:53 +09:00
smoogipoo
c84f49addf Add testcase 2018-11-19 19:02:59 +09:00
smoogipoo
2ee56e4a78 Add a body piece 2018-11-19 18:59:05 +09:00
smoogipoo
ad950cfc90 Implement hold note placement 2018-11-19 18:40:43 +09:00
smoogipoo
8071244d97 Make sizing happen per-blueprint 2018-11-19 18:40:27 +09:00
Dan Balasescu
d9b8d2d15c
Trim whitespace 2018-11-19 18:05:21 +09:00
Dan Balasescu
079230d9ed
Merge branch 'master' into mania-selection-movement 2018-11-19 18:03:12 +09:00
smoogipoo
d1cbaa9612 Use the column width 2018-11-19 18:02:01 +09:00
smoogipoo
52309465eb Apply some simple fixes 2018-11-19 17:59:52 +09:00
smoogipoo
bcdaee7d39 Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle"
This reverts commit 3e2e2a7000, reversing
changes made to d94801b6c6.
2018-11-19 17:52:31 +09:00
smoogipoo
08ffa18936 Fix nullref 2018-11-19 17:05:51 +09:00
smoogipoo
55edeb095d SelectionBox -> SelectionHandler 2018-11-19 16:58:11 +09:00
smoogipoo
595e2ffbff Unbind event when column changes 2018-11-19 16:20:21 +09:00
smoogipoo
ce956d7fd4 Fix exception when order of objects changes 2018-11-19 16:19:56 +09:00
Dan Balasescu
11b13d1a5f
Merge pull request #3735 from peppy/fix-hold-menu-disappearing
Fix hold for menu button occasionally disappearing
2018-11-19 12:24:41 +09:00
Dean Herbert
970ea928ae Fix hold for menu button occasionally disappearing 2018-11-19 12:06:47 +09:00
Dean Herbert
a57f98ed4d
Merge branch 'master' into fix-taiko-lifetimes 2018-11-19 08:41:19 +09:00
Dean Herbert
eb5cb44a60
Merge pull request #3729 from UselessToucan/improve_hud_overlay_colour_setting
Set AccentColour in concrete counters
2018-11-19 08:30:44 +09:00