1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 16:57:25 +08:00
Commit Graph

17256 Commits

Author SHA1 Message Date
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
Dean Herbert
dd1bba5ad2 Add nuget restore 2019-03-01 16:02:43 +09:00
build
f7b6c014e4 Fastlane initial setup 2019-03-01 15:35:40 +09:00
Dean Herbert
deb0c06021
Merge pull request #4366 from andy840119/andy840119/_fix_duel_stage_beatmap
Add support for dual (co-op) mode in mania beatmap
2019-03-01 14:42:46 +09:00
smoogipoo
c722ea0299 Add space 2019-03-01 14:30:58 +09:00
Dean Herbert
19ce1f2869 Remove second conditional 2019-03-01 13:43:16 +09:00
Dan Balasescu
cf83be1cd0
Merge pull request #4373 from swoolcock/ensure-focused-overlay-dim
Ensure all OsuFocusedOverlayContainers contribute to screen fading
2019-03-01 13:39:52 +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
Dean Herbert
06ae9d40cc
Merge pull request #4371 from nyquillerium/UserDimLogic
Fix song select blur potentially never being applied
2019-03-01 12:52:37 +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
c237c94a76
Merge pull request #4317 from nyquillerium/UserIDDBStore
Add UserID for databased scores where possible
2019-03-01 11:15:19 +09:00
Dean Herbert
6bccdd50ef
Merge branch 'master' into UserIDDBStore 2019-03-01 11:07:30 +09:00
Dean Herbert
f4697a88e7
Merge pull request #4367 from swoolcock/show-supported-window-modes
Only display SupportedWindowModes in settings
2019-03-01 11:06:56 +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
andy840119
e634475bf4 IsDuel -> Dual 2019-02-28 23:40:03 +09:00