Commit Graph

9761 Commits

Author SHA1 Message Date
aac7081580 Update package 2018-11-21 23:11:09 +01:00
39e9c61e24 OpenTK -> osuTK 2018-11-21 23:11:08 +01: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
285b199d7d Make IdleTracker IHandleGlobalInput 2018-11-19 20:50:46 +03:00
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
d5b937f88f Fix post-merge issue 2018-11-19 19:17:03 +09:00
8cee4141e8 Merge branch 'master' into note-placement 2018-11-19 19:08:53 +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
55edeb095d SelectionBox -> SelectionHandler 2018-11-19 16:58:11 +09:00
595e2ffbff Unbind event when column changes 2018-11-19 16:20:21 +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
4cbda97b1e Move positional adjustment to SelectionBox 2018-11-16 17:12:24 +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
df7515b66f Pass all selected hitobjects to the selection blueprints 2018-11-15 21:01:09 +09:00
d5464702fa Fix post-merge issue 2018-11-15 20:56:34 +09:00
eddba44d0f Merge branch 'note-placement' into inter-column-movements 2018-11-15 20:53:57 +09: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
81a3170e3b Merge branch 'master' into hold-for-menu-back 2018-11-14 19:13:07 +09:00
8ee81c4811 Merge branch 'master' into keypad-enter 2018-11-14 10:03:19 +00:00
61a62a4eae Merge branch 'master' into hold-for-menu-back 2018-11-14 18:35:08 +09:00
4b86c29f7b Merge remote-tracking branch 'origin/master' into placement-hiding 2018-11-14 18:34:45 +09:00
c963fc7cd2 Reduce chaining 2018-11-14 18:34:13 +09:00
4dec2d1db0 Merge remote-tracking branch 'upstream/master' into note-placement 2018-11-14 18:29:31 +09:00