Dean Herbert
|
1da2006dea
|
Merge branch 'master' into note-placement
|
2018-11-22 19:44:39 +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 |
|
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 |
|
Dean Herbert
|
65f4a01081
|
Merge pull request #3743 from smoogipoo/osuTK
OpenTK -> osuTK everywhere
|
2018-11-21 19:18:33 +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
|
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
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
Dean Herbert
|
72c9c66461
|
Merge branch 'master' into improve_hud_overlay_colour_setting
|
2018-11-19 08:14:51 +09:00 |
|
Dean Herbert
|
5ec28c31ca
|
Merge pull request #3699 from smoogipoo/fix-mask-disposal
Use bindables for hitobject events
|
2018-11-18 22:42:21 +09:00 |
|
Dean Herbert
|
dd21daa635
|
Merge branch 'master' into fix-mask-disposal
|
2018-11-18 21:18:00 +09:00 |
|
Roman Kapustin
|
ecf8a89f26
|
Set AccentColour and GlowColour in StandardHealthDisplay
|
2018-11-16 19:30:58 +03:00 |
|
Dan Balasescu
|
974873f5b4
|
Merge pull request #3688 from jorolf/flashlight-mod
Add flashlight mod
|
2018-11-16 18:57:14 +09:00 |
|
Dan Balasescu
|
57c1ddb1e0
|
Merge branch 'master' into flashlight-mod
|
2018-11-16 18:45:15 +09:00 |
|
smoogipoo
|
92b1c56aed
|
Update osu-resources
|
2018-11-16 18:31:37 +09:00 |
|
Roman Kapustin
|
37b19f78ae
|
Set AccentColour in concrete counters
|
2018-11-15 23:37:21 +03:00 |
|
jorolf
|
80bd98bb9d
|
apply suggestions
|
2018-11-15 17:38:38 +01:00 |
|
smoogipoo
|
e207dd728b
|
Fix taiko proxies not receiving the correct lifetimes
|
2018-11-15 20:26:12 +09:00 |
|
Dan Balasescu
|
3e2e2a7000
|
Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle
Return to large logo after idle period
|
2018-11-15 15:40:15 +09:00 |
|
Dan Balasescu
|
e8f34ddff0
|
Merge branch 'master' into return_to_large_logo_after_idle
|
2018-11-15 15:16:10 +09:00 |
|
Dan Balasescu
|
d94801b6c6
|
Merge pull request #3720 from HoLLy-HaCKeR/fix-settingstextbox
Fix SettingsTextBox having width of 0
|
2018-11-15 12:15:11 +09:00 |
|
jorolf
|
f0f7b15edc
|
remove unused using
|
2018-11-15 00:45:27 +01:00 |
|
jorolf
|
41a0f9896e
|
Merge branch 'master' into flashlight-mod
|
2018-11-15 00:35:42 +01:00 |
|
jorolf
|
7d2958b7b0
|
split shader, remove unnecessary clutter and fix some bugs
|
2018-11-15 00:33:13 +01:00 |
|