Commit Graph

14412 Commits

Author SHA1 Message Date
5e51a50658 Merge pull request #3469 from peppy/fix-import-buttons
Fix import buttons having incorrect mappings when setting disabled states
2018-09-21 21:18:26 +09:00
dafbabec31 Fix import buttons having incorrect mappings when setting disabled states 2018-09-21 21:08:21 +09:00
1eb0277ba3 Merge pull request #3461 from peppy/background-brightness
Fix global background brightness being unexpectedly dim
2018-09-21 17:26:39 +09:00
4380ef15bf Fix potential exception during async load callback 2018-09-21 16:31:09 +09:00
c1604145df Merge branch 'master' into background-brightness 2018-09-21 16:20:32 +09:00
7a58343201 Merge pull request #3436 from plankp/patch-2
Handle lack of skins directory when importing from osu!stable
2018-09-21 12:16:43 +09:00
293a5dd099 Use string interpolation 2018-09-21 11:50:36 +09:00
83bf38f4bc Make menu background blurrable
Not actually blurring yet, needs further testing.
2018-09-21 03:13:34 +09:00
78d78b5510 Fade menu background a bit when menu is active 2018-09-21 03:13:15 +09:00
07a1c39fe5 Use random default background on starting the game 2018-09-21 03:12:20 +09:00
fa33e0bd6b Fix background brightness being adjusted globally 2018-09-21 02:51:14 +09:00
199d76217e Merge branch 'master' into patch-2 2018-09-20 06:47:42 -04:00
7efaaceba5 Merge pull request #3456 from peppy/update-framework
Update framework
2018-09-20 19:41:39 +09:00
a28061d87a Merge branch 'master' into update-framework 2018-09-20 19:18:30 +09:00
42e87b553e Merge pull request #3454 from smoogipoo/fix-fullscreen-crash
Fix macOS crashing in fullscreen mode
2018-09-20 19:18:15 +09:00
aa453f8ff8 Merge remote-tracking branch 'smoogipoo/fix-fullscreen-crash' into update-framework 2018-09-20 19:03:49 +09:00
1861547c86 Apply review 2018-09-20 19:01:04 +09:00
37f3035437 Merge remote-tracking branch 'upstream/master' into update-framework 2018-09-20 18:39:48 +09:00
5ee4130351 Update framework reference 2018-09-20 18:39:44 +09:00
474f705309 Merge pull request #3458 from smoogipoo/fix-status-pill
Cleanup + adjust display of beatmap status pill
2018-09-20 18:17:34 +09:00
62135c39aa Cleanup 2018-09-20 12:56:39 +09:00
04cd68f970 Hide status pill when status is none 2018-09-20 12:53:45 +09:00
7b8094d731 Move text size/padding out of constructor 2018-09-20 12:53:45 +09:00
ae4c371bec Merge branch 'update-framework-event-handling' into update-framework 2018-09-20 00:29:42 +09:00
b2cf636ab5 Merge branch 'localisation-changes' into update-framework 2018-09-20 00:29:31 +09:00
73fb3fa3a4 Fix macOS crashing in fullscreen mode 2018-09-19 17:52:35 +09:00
0237153c27 Merge pull request #3452 from smoogipoo/fix-bufferedwedge-localisation
Fix songselect wedge sometimes not updating when localisation changes
2018-09-19 15:31:14 +09:00
38a3c2a820 Fix song select wedge sometimes not updating when localisation changes 2018-09-19 14:57:32 +09:00
28f31540c4 Apply changes in-line with framework localisation changes 2018-09-19 14:07:46 +09:00
b790e16217 Use Click instead of now removed TriggerOnClick 2018-09-19 11:42:32 +09:00
a3e6973b41 Replace usage of now removed TriggerKeyPress and similar methods. 2018-09-19 11:36:55 +09:00
c8e9d9375f Use new InputStateChangeEvent for RulesetInputManager 2018-09-19 11:36:55 +09:00
492b5edb02 Merge pull request #3425 from LastExceed/close-chattabs-with-Mclick
Close chat tabs with middle mouse button
2018-09-18 15:45:46 +09:00
ad31962643 Cleanup, use similar code to everywhere else 2018-09-18 15:27:21 +09:00
27ea6102bc only return true on Mclick 2018-09-18 08:07:19 +02:00
af6618a239 Merge branch 'master' into close-chattabs-with-Mclick 2018-09-18 14:52:56 +09:00
008bafae45 Merge pull request #3420 from Aergwyn/add-rank-status
Add rank status display in song select
2018-09-18 14:23:21 +09:00
d3bb78d139 Merge branch 'master' into add-rank-status 2018-09-18 14:10:42 +09:00
759633d4c8 Merge pull request #3396 from peppy/music-controller-topmost
Bring music controller in front of notification overlay
2018-09-18 14:03:44 +09:00
9f1f879f3d Merge branch 'master' into music-controller-topmost 2018-09-18 13:56:13 +09:00
3bd719072c Merge pull request #3424 from Hanamuke/fix_combo
Fruit type now depends on combo (osu!catch)
2018-09-18 13:17:52 +09:00
29e023b252 Merge branch 'master' into fix_combo 2018-09-18 12:54:51 +09:00
aba1de8b1a Cleanup 2018-09-18 12:54:07 +09:00
8bfd981a50 Handle directory checking before entering task 2018-09-17 21:05:28 -04:00
000beea01b Merge branch 'master' into patch-2 2018-09-17 15:20:54 -04:00
ed01f3067f Merge branch 'master' into close-chattabs-with-Mclick 2018-09-15 18:05:01 +02:00
fce9740f28 return true since we are handling the action 2018-09-15 18:00:47 +02:00
b17bd6aaaa Merge pull request #3438 from peppy/fix-new-inspections
Fix new resharper redundant parenthesis inspections
2018-09-16 00:16:39 +09:00
00d0613053 Fix new resharper redundant parenthesis inspections 2018-09-16 00:09:17 +09:00
a34b0d67f8 Merge pull request #3435 from plankp/patch-1
Make Transform and Wiggle incompatible with each other
2018-09-15 23:59:48 +09:00