Commit Graph

9577 Commits

Author SHA1 Message Date
c944e8bb29 Merge branch 'master' into fix-deletion-crash 2018-11-26 14:20:02 +09:00
c71fc0b800 Don't focus overlay again after set is fetched 2018-11-25 14:49:09 +05:30
cadfe41f83 Merge remote-tracking branch 'origin/master' into external_link_warning 2018-11-23 15:19:52 +09:00
df004d7a49 Adjust dialog text 2018-11-23 15:19:15 +09:00
ac73844fe0 Fix header potentially overflowing the dialog 2018-11-23 15:19:09 +09:00
afa547af84 Fix order of ChannelManager dependency caching 2018-11-23 11:00:17 +09:00
b446a73c0c Add brackets
Co-Authored-By: peppy <pe@ppy.sh>
2018-11-23 10:06:06 +09:00
1b76e2faf5 Merge branch 'master' into fix-editor-precise-scroll 2018-11-23 09:57:35 +09:00
a4259261e3 Merge branch 'master' into fix-channel-presence 2018-11-23 08:11:46 +09:00
2f368a32d4 Merge branch 'master' into fix-invalid-cached 2018-11-22 23:56:20 +09:00
0ee4b1c4ac Merge branch 'master' into fix-channel-presence 2018-11-22 21:52:16 +09:00
10047e6815 Adjust tick-based wheel control to be more correct 2018-11-22 20:13:40 +09:00
a48c26d999 Fix precision scroll events being handled incorrectly by editor 2018-11-22 19:40:44 +09:00
61fdfe39fd Add comment 2018-11-22 19:21:32 +09:00
6cd69b794d Fix leaderboard accessing drawables in a possibly invalid state 2018-11-22 19:08:46 +09:00
a144e97568 Fix crash on creating two new PM channels 2018-11-22 18:27:22 +09:00
d1ec9fc294 Merge remote-tracking branch 'Joehuu/master' into fix-channel-presence 2018-11-22 13:04:32 +09:00
5caa67d735 Hide playlist when MusicController is hidden 2018-11-22 12:12:34 +09:00
2126cf0d9a Fix join process for PMs being incorrect 2018-11-21 20:44:41 +09:00
b31efb7bb9 Fix PM channel type 2018-11-21 20:34:36 +09:00
d677921680 Remove excess newline 2018-11-21 18:53:50 +09:00
7755242a43 Merge branch 'master' into osuTK 2018-11-21 18:53:11 +09:00
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
88f82eb722 Fix instabilities in channel join logic 2018-11-21 17:15:15 +09:00
4cde66240d Fix default channels not being joined 2018-11-21 17:15:15 +09:00
eab2776755 Fix a crash on leaving the selected channel 2018-11-21 17:15:15 +09:00
ab2c969122 Add private channel types 2018-11-21 12:58:45 +09:00
5ad96afea0 Fix crashes when importing/deleting from model managers 2018-11-20 18:09:23 +09:00
2a41c38294 Update package 2018-11-20 17:30:03 +09:00
dc8cd51e15 Implement mania note deletion 2018-11-20 17:26:00 +09:00
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
23a446bab2 Add support for all channel types 2018-11-20 15:03:55 +09:00
ed26d8ebec Merge branch 'master' into fix-taiko-lifetimes 2018-11-20 04:05:05 +09:00
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
970ea928ae Fix hold for menu button occasionally disappearing 2018-11-19 12:06:47 +09:00
a57f98ed4d Merge branch 'master' into fix-taiko-lifetimes 2018-11-19 08:41:19 +09:00
72c9c66461 Merge branch 'master' into improve_hud_overlay_colour_setting 2018-11-19 08:14:51 +09:00
376e76e00d Resolve merge conflicts 2018-11-18 16:10:36 +03:00
ecf8a89f26 Set AccentColour and GlowColour in StandardHealthDisplay 2018-11-16 19:30:58 +03:00
57c1ddb1e0 Merge branch 'master' into flashlight-mod 2018-11-16 18:45:15 +09:00
37b19f78ae Set AccentColour in concrete counters 2018-11-15 23:37:21 +03:00
80bd98bb9d apply suggestions 2018-11-15 17:38:38 +01:00
e207dd728b Fix taiko proxies not receiving the correct lifetimes 2018-11-15 20:26:12 +09:00
e8f34ddff0 Merge branch 'master' into return_to_large_logo_after_idle 2018-11-15 15:16:10 +09:00
41a0f9896e Merge branch 'master' into flashlight-mod 2018-11-15 00:35:42 +01:00
7d2958b7b0 split shader, remove unnecessary clutter and fix some bugs 2018-11-15 00:33:13 +01:00
9dd3d28436 Fix SettingsTextBox having width of 0 2018-11-14 22:29:11 +01:00
caaa5645e3 Correct framework version 2018-11-14 21:16:08 +09:00
30547ac064 Merge remote-tracking branch 'upstream/master' into dropdown-updates 2018-11-14 20:03:45 +09:00
f1f2fc133a Use SkinInfo directly 2018-11-14 19:29:20 +09:00