1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-12 14:17:20 +08:00

10887 Commits

Author SHA1 Message Date
LeNitrous
74a23edaf7 no longer adjust the clock rate 2019-03-04 17:48:51 +08:00
LeNitrous
86e861ddeb update mod descriptions 2019-03-04 17:39:13 +08:00
Dean Herbert
3f197935d7 Fix remaining case 2019-03-04 14:03:59 +09:00
Dean Herbert
08e153208d Unbinds are automatic 2019-03-03 20:03:22 +09:00
Dean Herbert
6ffa139ea8 Adjust transition length slightly 2019-03-03 20:02:56 +09:00
Dean Herbert
46b618d80c Merge remote-tracking branch 'Joehuu/master' into supporter-disclaimer 2019-03-03 19:18:16 +09:00
LeNitrous
b83d44c316 use ternary operator instead 2019-03-03 16:50:31 +08:00
LeNitrous
a1a8246c05 trim whitespace 2019-03-03 16:30:08 +08:00
LeNitrous
5af5a76e87 Merge branch 'master' of https://github.com/LeNitrous/osu into mod-wind 2019-03-03 16:25:49 +08:00
LeNitrous
ecc2c28a62 mod rule changes 2019-03-03 16:22:00 +08:00
Dean Herbert
456c5be50c
Merge branch 'master' into taskbar-tooltip-fade-out 2019-03-03 12:47:37 +09:00
jorolf
e8d568470d use a bindable instead 2019-03-02 19:13:38 +01:00
jorolf
176cbc7f2e Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer 2019-03-02 19:04:48 +01:00
Dean Herbert
687d5d5ff1
Merge pull request #4387 from smoogipoo/fix-fonts
Fix a few incorrect fonts
2019-03-02 20:07:26 +09:00
Dan Balasescu
f13901cc19
Merge branch 'master' into fix-mod-overlay-dim 2019-03-02 16:04:44 +09:00
Dean Herbert
b7126b3efb Fix mod select overlay dimming itself 2019-03-02 14:48:05 +09:00
Dean Herbert
5487b011d6 Fix some inspections rider isn't able to deal with automatically 2019-03-02 14:34:56 +09:00
smoogipoo
268ea6a836 Wrong line 2019-03-02 13:28:16 +09:00
smoogipoo
83a02d32f7 Fix a few incorrect fonts 2019-03-02 13:25:59 +09:00
Joehu
7077e405ab Use same size labels from song select 2019-03-01 15:48:58 -08:00
Nitrous
0be9f81310
Merge branch 'master' into show-mods-on-loader 2019-03-02 06:40:45 +08:00
Dean Herbert
7f1f812f29 Update framework 2019-03-01 22:06:42 +09:00
Dean Herbert
1871e8bb2c
Merge branch 'master' into master 2019-03-01 21:22:34 +09:00
Dean Herbert
c01990d005 Fix callback potentially not getting fired 2019-03-01 20:52:34 +09:00
Nitrous
7a47173f3e
Merge branch 'master' into show-mods-on-loader 2019-03-01 19:30:46 +08:00
Dean Herbert
431d439500 Make attribute public 2019-03-01 20:15:09 +09:00
LeNitrous
cf51c8aa31 attempt to comply with appveyor 2019-03-01 19:10:32 +08:00
Dean Herbert
9885913fff Fix iOS builds not being able to read their deploy version 2019-03-01 20:01:16 +09:00
LeNitrous
4e081fe1fc Merge branch 'show-mods-on-loader' of https://github.com/LeNitrous/osu into show-mods-on-loader 2019-03-01 18:41:41 +08:00
smoogipoo
bf8360636a Adjust drawnodes to use the new shared data structure 2019-03-01 17:25:15 +09:00
Dean Herbert
19ce1f2869 Remove second conditional 2019-03-01 13:43:16 +09:00
Dan Balasescu
952c435f3c
Merge branch 'master' into ensure-focused-overlay-dim 2019-03-01 13:31:56 +09:00
smoogipoo
7583279e08 Remove unnecessary precondition 2019-03-01 13:29:02 +09:00
Joehu
e5bc927354 Add beatmap status on direct list panels 2019-02-28 19:38:05 -08:00
Shane Woolcock
5d1eacf1c1 Ensure all OsuFocusedOverlayContainers contribute to screen fading 2019-03-01 12:20:31 +09:00
David Zhao
b97b12debf
Merge branch 'master' into UserDimLogic 2019-03-01 12:11:53 +09:00
David Zhao
f6303a2855 Fix songselect blur potentially never being applied 2019-03-01 11:52:51 +09:00
Dean Herbert
6bccdd50ef
Merge branch 'master' into UserIDDBStore 2019-03-01 11:07:30 +09:00
Dean Herbert
49cbaecf4c Update licence header 2019-03-01 10:52:53 +09:00
Dean Herbert
0300f0d665 Ensure deletions are correct without relying on FK cascade rule 2019-03-01 10:47:45 +09:00
Dean Herbert
d4041d5d42 Automate includes of files in ArchiveModelManager use cases 2019-03-01 10:25:21 +09:00
Dean Herbert
acc2113027 Make operation run asynchronously 2019-03-01 10:09:03 +09:00
Dean Herbert
798bc1306b Merge remote-tracking branch 'upstream/master' into m2307-master
# Conflicts:
#	osu.Game/Screens/Select/SongSelect.cs
2019-03-01 10:08:35 +09:00
Dean Herbert
80b5f1c523 Fix code formatting issues 2019-03-01 09:49:36 +09:00
Dean Herbert
67928ac1fe Remove pointless check 2019-03-01 09:49:11 +09:00
Joehu
f4a6612d48 Fade out taskbar tooltip after clicking 2019-02-28 15:43:04 -08:00
Dean Herbert
aad53fa861
Merge branch 'master' into show-supported-window-modes 2019-02-28 22:47:33 +09:00
Shane Woolcock
f1912a281c Use Count property 2019-02-28 21:46:49 +09:00
Shane Woolcock
dfb3fef9e1 Hide WindowMode dropdown if only one is selectable 2019-02-28 21:38:55 +09:00
Shane Woolcock
b159e3ec31 Fix headless tests 2019-02-28 20:39:55 +09:00