1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 08:22:56 +08:00
Commit Graph

14424 Commits

Author SHA1 Message Date
Dean Herbert
b8f19f8640
Merge branch 'master' into judgement-size-fix 2018-09-26 19:42:09 +09:00
Dean Herbert
5197bf77e4
Merge pull request #3478 from peppy/fix-case-sensitivity-import-extensions
Fix files with upper-case extensions failing to import correctly
2018-09-26 19:40:00 +09:00
smoogipoo
e259911875 Use invariant tolower 2018-09-26 18:44:03 +09:00
Dan Balasescu
3a5e380e46
Merge branch 'master' into judgement-size-fix 2018-09-26 18:36:12 +09:00
Dan Balasescu
901a7445fa
Merge pull request #3488 from plankp/dnd-osr-files
Handle external files with File instead
2018-09-26 18:21:27 +09:00
Paul Teng
319ed1bf0f Reorder if statement 2018-09-24 21:35:13 -04:00
Kyle Chang
2069467434 Use HitObject scale to determine judgement size 2018-09-24 21:18:55 -04:00
Paul Teng
dd36b6a381 Remove unused field storage 2018-09-24 21:08:58 -04:00
Paul Teng
b95cc798b2 Remove unused fallback 2018-09-24 20:56:18 -04:00
Paul Teng
62df0ec7d4 Handle external files with File instead 2018-09-24 07:16:19 -04:00
Kyle Chang
7a43677849 Make judgements scale with cs 2018-09-22 22:54:38 -04:00
Dean Herbert
6efecc4b35 Fix files with upper-case extensions failing to import correctly 2018-09-23 05:23:49 +09:00
ekrctb
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
Dean Herbert
dafbabec31 Fix import buttons having incorrect mappings when setting disabled states 2018-09-21 21:08:21 +09:00
Dean Herbert
1eb0277ba3
Merge pull request #3461 from peppy/background-brightness
Fix global background brightness being unexpectedly dim
2018-09-21 17:26:39 +09:00
smoogipoo
4380ef15bf Fix potential exception during async load callback 2018-09-21 16:31:09 +09:00
Dan Balasescu
c1604145df
Merge branch 'master' into background-brightness 2018-09-21 16:20:32 +09:00
Dean Herbert
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
Dean Herbert
293a5dd099 Use string interpolation 2018-09-21 11:50:36 +09:00
Dean Herbert
83bf38f4bc Make menu background blurrable
Not actually blurring yet, needs further testing.
2018-09-21 03:13:34 +09:00
Dean Herbert
78d78b5510 Fade menu background a bit when menu is active 2018-09-21 03:13:15 +09:00
Dean Herbert
07a1c39fe5 Use random default background on starting the game 2018-09-21 03:12:20 +09:00
Dean Herbert
fa33e0bd6b Fix background brightness being adjusted globally 2018-09-21 02:51:14 +09:00
Paul Teng
199d76217e
Merge branch 'master' into patch-2 2018-09-20 06:47:42 -04:00
Dean Herbert
7efaaceba5
Merge pull request #3456 from peppy/update-framework
Update framework
2018-09-20 19:41:39 +09:00
Dean Herbert
a28061d87a
Merge branch 'master' into update-framework 2018-09-20 19:18:30 +09:00
Dean Herbert
42e87b553e
Merge pull request #3454 from smoogipoo/fix-fullscreen-crash
Fix macOS crashing in fullscreen mode
2018-09-20 19:18:15 +09:00
Dean Herbert
aa453f8ff8 Merge remote-tracking branch 'smoogipoo/fix-fullscreen-crash' into update-framework 2018-09-20 19:03:49 +09:00
Dean Herbert
1861547c86 Apply review 2018-09-20 19:01:04 +09:00
Dean Herbert
37f3035437 Merge remote-tracking branch 'upstream/master' into update-framework 2018-09-20 18:39:48 +09:00
Dean Herbert
5ee4130351 Update framework reference 2018-09-20 18:39:44 +09:00
Dean Herbert
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
smoogipoo
62135c39aa Cleanup 2018-09-20 12:56:39 +09:00
smoogipoo
04cd68f970 Hide status pill when status is none 2018-09-20 12:53:45 +09:00
smoogipoo
7b8094d731 Move text size/padding out of constructor 2018-09-20 12:53:45 +09:00
Dean Herbert
ae4c371bec Merge branch 'update-framework-event-handling' into update-framework 2018-09-20 00:29:42 +09:00
Dean Herbert
b2cf636ab5 Merge branch 'localisation-changes' into update-framework 2018-09-20 00:29:31 +09:00
smoogipoo
73fb3fa3a4 Fix macOS crashing in fullscreen mode 2018-09-19 17:52:35 +09:00
Dean Herbert
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
smoogipoo
38a3c2a820 Fix song select wedge sometimes not updating when localisation changes 2018-09-19 14:57:32 +09:00
smoogipoo
28f31540c4 Apply changes in-line with framework localisation changes 2018-09-19 14:07:46 +09:00
ekrctb
b790e16217 Use Click instead of now removed TriggerOnClick 2018-09-19 11:42:32 +09:00
ekrctb
a3e6973b41 Replace usage of now removed TriggerKeyPress and similar methods. 2018-09-19 11:36:55 +09:00
ekrctb
c8e9d9375f Use new InputStateChangeEvent for RulesetInputManager 2018-09-19 11:36:55 +09:00
Dan Balasescu
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
Dan Balasescu
ad31962643
Cleanup, use similar code to everywhere else 2018-09-18 15:27:21 +09:00
LastExceed
27ea6102bc only return true on Mclick 2018-09-18 08:07:19 +02:00
Dan Balasescu
af6618a239
Merge branch 'master' into close-chattabs-with-Mclick 2018-09-18 14:52:56 +09:00
Dan Balasescu
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
Dan Balasescu
d3bb78d139
Merge branch 'master' into add-rank-status 2018-09-18 14:10:42 +09:00