1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-29 18:12:55 +08:00
Commit Graph

17485 Commits

Author SHA1 Message Date
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
4c67d27e84 Merge branch 'master' of https://github.com/ppy/osu 2019-03-03 16:22:43 +08:00
LeNitrous
ecc2c28a62 mod rule changes 2019-03-03 16:22:00 +08:00
Dean Herbert
1ea4781188
Fix code styling 2019-03-03 13:50:36 +09:00
Dean Herbert
fdf346e1a2
Merge branch 'master' into ctb-hyperdash-fix 2019-03-03 13:07:24 +09:00
Dean Herbert
c7da18f500
Merge pull request #4369 from Joehuu/taskbar-tooltip-fade-out
Fade out taskbar tooltip after clicking
2019-03-03 13:01:13 +09: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
HoLLy
5ff47924ab Add missing grace time in hyperdash calculation 2019-03-02 14:06:53 +01:00
HoLLy
73ba91bbad Add failing test case 2019-03-02 14:05:56 +01:00
Dean Herbert
c8cf966e81
Merge pull request #4386 from Joehuu/readme-format-1
Normalize repo readme format
2019-03-02 20:21:07 +09: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
e0add7abba
Merge pull request #4390 from peppy/fix-mod-overlay-dim
Fix mod select overlay dimming itself
2019-03-02 16:11:34 +09:00
Dan Balasescu
f13901cc19
Merge branch 'master' into fix-mod-overlay-dim 2019-03-02 16:04:44 +09:00
Dan Balasescu
7f6e084d40
Merge pull request #4389 from peppy/fix-rider-inspections
Fix some inspections rider isn't able to deal with automatically
2019-03-02 16:04:15 +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
7151fe06dc Normalize repo readme format 2019-03-01 19:24:28 -08: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
c5011de774
Merge pull request #4382 from peppy/update-framework
Update framework
2019-03-01 23:58:43 +09:00
Dean Herbert
180aee6048 Fix iOS build 2019-03-01 23:20:34 +09:00
Dean Herbert
7f1f812f29 Update framework 2019-03-01 22:06:42 +09:00
Dean Herbert
c9bd4f6c4c
Merge pull request #4380 from peppy/fastlane
Add iOS build automation via fastlane
2019-03-01 21:44:53 +09:00
Dan Balasescu
10a3b409b2
Merge pull request #4000 from m2307/master
Implement clear scores on beatmap
2019-03-01 21:39:21 +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
810828e807
Merge pull request #4378 from peppy/fix-ios-versioning
Fix iOS builds not being able to read their deploy version
2019-03-01 20:30:24 +09:00
Dean Herbert
add181f3c4
Merge pull request #4379 from smoogipoo/fix-override-inspection
Use style heuristics for method bodies
2019-03-01 20:19:22 +09:00
smoogipoo
02fb41a312 Use style heuristics 2019-03-01 20:17:39 +09: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
LeNitrous
467f71598b Merge remote-tracking branch 'upstream/master' 2019-03-01 18:37:16 +08:00
Dean Herbert
521e2a30ae Update readme 2019-03-01 18:16:17 +09:00
Dean Herbert
0df49e6df3 Clean up config further 2019-03-01 17:37:41 +09:00
Dean Herbert
70d1c6fba4 Wait longer 2019-03-01 17:37:28 +09:00
smoogipoo
bf8360636a Adjust drawnodes to use the new shared data structure 2019-03-01 17:25:15 +09:00
Dean Herbert
c0440ca4fe Always update version number in beta lane 2019-03-01 17:20:28 +09:00
Dean Herbert
2dacd754a3 Update fastlane version 2019-03-01 17:20:13 +09:00
Dean Herbert
a6ed64754c Reset bundle version 2019-03-01 17:20:03 +09:00
Dean Herbert
43f1099e77 Automate change notes 2019-03-01 17:19:41 +09:00