1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 12:33:01 +08:00
Commit Graph

16863 Commits

Author SHA1 Message Date
andy840119
e634475bf4 IsDuel -> Dual 2019-02-28 23:40:03 +09:00
為什麼
0e30bf902d
Merge branch 'master' into andy840119/_fix_duel_stage_beatmap 2019-02-28 18:23:16 +08:00
Dean Herbert
79ec85c7dd
Merge pull request #4353 from swoolcock/hide-desktop-only-elements
Conditionally add some UI elements only on desktop
2019-02-28 19:18:04 +09:00
andy840119
4b2be4612f support duel mode in mania beatmap 2019-02-28 19:07:43 +09:00
Dean Herbert
d10ad3c8a7 Fix warnings 2019-02-28 18:59:05 +09:00
Dean Herbert
5b53cf0961
Merge branch 'master' into hide-desktop-only-elements 2019-02-28 18:50:16 +09:00
Dean Herbert
48fcaf34e6 Update framework 2019-02-28 18:49:59 +09:00
Dan Balasescu
bfe3d5708d
Merge pull request #4341 from nekodex/better-mp-songselect-deletion-handling
Better beatmap deletion handling while in multiplayer song select
2019-02-28 17:50:47 +09:00
Dan Balasescu
a37445a938
Merge branch 'master' into better-mp-songselect-deletion-handling 2019-02-28 17:35:08 +09:00
smoogipoo
921346d303 Rename a few more members 2019-02-28 17:27:28 +09:00
Jamie Taylor
4c8aa65200
private + renaming 2019-02-28 17:02:45 +09:00
Dean Herbert
93a4229ba6
Merge pull request #4357 from Joehuu/toquantity-1
Use ToQuantity instead for words with number prefixes
2019-02-28 16:37:36 +09:00
Dan Balasescu
1eafc9d4c1
Merge pull request #4362 from nekodex/fix-download-button
Fix download buttons displaying wrong state for deleted beatmapsets
2019-02-28 16:33:06 +09:00
Jamie Taylor
8cf83e2f4a
Fix the check of beatmapset local availability 2019-02-28 16:14:50 +09:00
Dan Balasescu
3a1066ff02
Merge branch 'master' into toquantity-1 2019-02-28 15:57:51 +09:00
Dean Herbert
3a3c2ae21a
Merge pull request #4356 from peppy/use-pattern-matching
Use pattern matching wherever possible
2019-02-28 15:34:04 +09:00
Jamie Taylor
6e821a426d
Fix restoration of enabled mods when cancelling song select 2019-02-28 15:06:11 +09:00
Jamie Taylor
cf2feec7df
Fix multiplayer enabled mods check 2019-02-28 15:02:22 +09:00
Joehu
2241e1af9d Use ToQuantity for words with number prefixes 2019-02-27 21:55:45 -08:00
Dean Herbert
2dbf7d122c
Merge branch 'master' into use-pattern-matching 2019-02-28 14:53:07 +09:00
Dean Herbert
e39604619d
Merge pull request #4349 from peppy/more-inspections
Enable more stringent inspectcode style inspections
2019-02-28 14:52:52 +09:00
Dean Herbert
99e2e6cf1c Align text 2019-02-28 14:46:52 +09:00
Dean Herbert
774116923b A few fixes 2019-02-28 14:45:59 +09:00
Dean Herbert
e2c6a8bc07 Use pattern matching wherever possible 2019-02-28 14:35:00 +09:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dan Balasescu
9fa8e6f3b9
Merge pull request #4355 from peppy/expression-body
Use expression body for property get/set where possible
2019-02-28 14:23:11 +09:00
Dean Herbert
42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Shane Woolcock
ce17e37c74 Conditionally add some UI elements only on desktop
Prevents crashes from trying to access features that are not applicable to mobile.
2019-02-28 13:10:53 +09:00
Dean Herbert
3e1f283281 Merge remote-tracking branch 'upstream/master' into more-inspections 2019-02-28 13:09:18 +09:00
Dan Balasescu
94a389319d
Merge pull request #4335 from peppy/fix-osugame-test-case
Fix OsuGame test case not working
2019-02-28 12:50:31 +09:00
Dean Herbert
83e9dfda75
Merge branch 'master' into fix-osugame-test-case 2019-02-28 12:33:00 +09:00
Dean Herbert
9b989514bb
Merge pull request #4347 from peppy/fix-square-graph-overhead
Reduce square graph overhead
2019-02-28 12:32:51 +09:00
Dean Herbert
43b02212ce Add disposal check in single file load path 2019-02-28 12:24:56 +09:00
Dan Balasescu
76ec5868da
Merge branch 'master' into fix-square-graph-overhead 2019-02-28 12:23:37 +09:00
Dean Herbert
0faf83f7d1 Fix nullref in tests 2019-02-27 23:30:13 +09:00
Dean Herbert
42442edf5a Update framework 2019-02-27 22:41:46 +09:00
Dean Herbert
5f6ad51e7e
Merge branch 'master' into fix-osugame-test-case 2019-02-27 22:36:13 +09:00
Dean Herbert
05aa80b184
Merge pull request #4340 from Joehuu/fix-home-button-cancel-2
Fix home button being cancelled by mod select again
2019-02-27 22:20:58 +09:00
Dean Herbert
d3a304c233
Merge branch 'master' into fix-home-button-cancel-2 2019-02-27 22:02:37 +09:00
Dean Herbert
53865c6857
Merge branch 'master' into better-mp-songselect-deletion-handling 2019-02-27 21:55:22 +09:00
Dean Herbert
abf12a9a1b
Merge pull request #4348 from smoogipoo/fix-nasty-unbind
Clear delegate list rather than relying on unbinds
2019-02-27 21:54:39 +09:00
Dean Herbert
ccb00b932b
Merge branch 'master' into fix-nasty-unbind 2019-02-27 21:44:54 +09:00
Dean Herbert
c8793911a8 Enable more stringent inspectcode style inspections 2019-02-27 21:25:40 +09:00
smoogipoo
7fa4262207 Clear delegate list rather than relying on unbinds 2019-02-27 21:04:47 +09:00
Dean Herbert
9f8d03e1b6 Remove excess newlines 2019-02-27 21:03:35 +09:00
Dean Herbert
5c6db17865 Merge remote-tracking branch 'upstream/master' into fix-square-graph-overhead 2019-02-27 21:02:28 +09:00
Dan Balasescu
861d5eeb65
Merge pull request #4346 from peppy/excess-skin-change
Avoid redundant (synchronous) skin change
2019-02-27 20:48:28 +09:00
Dan Balasescu
d2c2e41e0c
Merge branch 'master' into excess-skin-change 2019-02-27 20:30:18 +09:00
Dan Balasescu
374750eef1
Merge pull request #4343 from smoogipoo/fix-crossthread
Fix crossthread access + music looping not working
2019-02-27 19:27:36 +09:00