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

16962 Commits

Author SHA1 Message Date
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
Dean Herbert
3af7d4939c Add debounce testing 2019-02-27 19:11:09 +09:00
Dean Herbert
f942515fcd Add licence header 2019-02-27 18:59:45 +09:00
Dean Herbert
43a1df6e5c Inline cancellation token source creation 2019-02-27 18:58:53 +09:00
Dean Herbert
6f5d4ce2e2 Debounce SquareGraph some more 2019-02-27 18:58:45 +09:00
Dean Herbert
8c4a59e57e Fix SquareGraph more 2019-02-27 18:58:34 +09:00
Dean Herbert
b555f793d9 Fix whitespace 2019-02-27 18:57:27 +09:00
Dean Herbert
9473b53226 Avoid redundant (synchronous) skin change 2019-02-27 18:53:01 +09:00
Dean Herbert
a8bc87f5d8 Add basic skin tests
Should be expanded in the future. Bare minimum for now to test fail case.
2019-02-27 18:52:39 +09:00
David Zhao
246240e936 Remove unused includes 2019-02-27 18:04:33 +09:00
David Zhao
882fff1631 Assert storyboard visibilty at both steps of toggle 2019-02-27 17:56:44 +09:00
Dean Herbert
99d8d39ea1
Merge branch 'master' into fix-crossthread 2019-02-27 17:46:12 +09:00
smoogipoo
1006c539be Fix looping not being checked 2019-02-27 17:03:09 +09:00
David Zhao
14ffd9efe8 Add fake storyboard to visually assess storyboard dim 2019-02-27 17:02:04 +09:00
smoogipoo
30815ace62 Fix crossthread operations due to Track.Completed 2019-02-27 16:52:34 +09:00
Dan Balasescu
e5eab11a2a
Merge pull request #3851 from ekrctb/use-lifetime-optimization
Do less work for dead drawables in gameplay
2019-02-27 16:46:47 +09:00
smoogipoo
c13a5184f3 Add more explanation 2019-02-27 16:35:11 +09:00
smoogipoo
f66fefb818 Adjust comment + accessibility 2019-02-27 16:30:10 +09:00
Jamie Taylor
c59d84fd21
Add sanity check to prevent TimeshiftPlayer from starting with incorrect beatmap/ruleset/mods 2019-02-27 16:21:14 +09:00
Jamie Taylor
a3f71d69a9
Ensure ruleset and mods are set correctly when leaving MatchSongSelect 2019-02-27 16:16:13 +09:00
smoogipoo
32bf940aa5 Adjust comment for readability 2019-02-27 15:43:20 +09:00
Jamie Taylor
7c2ffb1826
Fix MatchSongSelect not handling beatmapset deletions 2019-02-27 14:34:39 +09:00
David Zhao
ebec944bb8 Use actual song select for test case with beatmap import 2019-02-27 14:15:45 +09:00
Joehu
5b4319a80f Fix home button being cancelled by mod select again 2019-02-26 21:01:28 -08:00
smoogipoo
a07d797d75 Merge remote-tracking branch 'Joehuu/master' into use-lifetime-optimization 2019-02-27 12:08:43 +09:00
Dean Herbert
109abf4d28
Merge pull request #4338 from jorolf/disable-auto-dectect
Add flag to osu.iOS.sln.DotSettings as well
2019-02-27 05:35:07 +09:00
jorolf
26b74ad46a Add flag to osu.iOS.sln.DotSettings 2019-02-26 16:24:23 +01:00
Dean Herbert
6f1a1432f5
Merge pull request #4337 from jorolf/disable-auto-dectect
Disable auto detected rules
2019-02-27 00:13:13 +09:00