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

16816 Commits

Author SHA1 Message Date
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
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
smoogipoo
7fa4262207 Clear delegate list rather than relying on unbinds 2019-02-27 21:04:47 +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
f942515fcd Add licence header 2019-02-27 18:59:45 +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
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
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
smoogipoo
32bf940aa5 Adjust comment for readability 2019-02-27 15:43:20 +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
jorolf
2784df3b68 Disable auto detected rules 2019-02-26 15:36:07 +01:00
Dean Herbert
bf6815b2a7 Fix OsuGame test case not working 2019-02-26 18:02:24 +09:00
Dean Herbert
a11a7fa6f1
Merge pull request #4240 from ThePyrotechnic/MissingSource
Improve layout of beatmap details pane when source is unknown
2019-02-26 16:20:23 +09:00
Dean Herbert
5b88c2ea0f Add visual test 2019-02-26 16:12:40 +09:00
Dean Herbert
d9872dda12 Use fade instead of negative margin 2019-02-26 16:10:06 +09:00
Dean Herbert
2d6d9dd723 Add better easing 2019-02-26 16:09:45 +09:00
Dean Herbert
c1432b2ed5
Add back newline 2019-02-26 15:48:34 +09:00
Dean Herbert
2fc34496fd
Merge branch 'master' into MissingSource 2019-02-26 15:38:51 +09:00
Dean Herbert
19d62f76ba
Merge pull request #4329 from swoolcock/hide-exit-button
Hide exit button if the host does not support exiting
2019-02-26 13:42:13 +09:00
Dean Herbert
d2dc38f298
Merge branch 'master' into hide-exit-button 2019-02-26 13:25:47 +09:00
Dean Herbert
3213a9a443
Merge pull request #4334 from smoogipoo/fix-negative-score
Fix scores being stored as ints
2019-02-26 13:18:47 +09:00
smoogipoo
8a943a6e65 Fix scores being stored as ints 2019-02-26 13:10:59 +09:00
Shane Woolcock
e91c07209f Move MainMenu initialisation from ctor to load 2019-02-26 09:54:42 +09:00
Shane Woolcock
bebb635ca1 Merge branch 'master' into hide-exit-button
# Conflicts:
#	osu.Game/Screens/Menu/MainMenu.cs
2019-02-25 21:48:42 +09:00
Shane Woolcock
2bd5bb3f69 Move all MainMenu button creation into load 2019-02-25 21:41:41 +09:00
Dean Herbert
d6cfce8bce
Merge pull request #3732 from UselessToucan/notify_track_completion_failure
Use `Track.Completed` event
2019-02-25 20:48:03 +09:00
Dean Herbert
97dc7f9819
Merge branch 'master' into MissingSource 2019-02-25 19:35:44 +09:00
Dean Herbert
2fbb0b4e6f Don't use this 2019-02-25 19:34:03 +09:00
Dean Herbert
140de26a56 Merge remote-tracking branch 'upstream/master' into notify_track_completion_failure 2019-02-25 19:30:35 +09:00
Dean Herbert
638e89effa
Merge pull request #4331 from nyquillerium/ScrollingExitFix
Fix song select background not being exited in time for main menu
2019-02-25 19:29:23 +09:00
Dean Herbert
ed10024b22 Fix some formatting / variable naming 2019-02-25 19:29:09 +09:00
Dean Herbert
a4e119786f Fix some weird formatting 2019-02-25 19:19:28 +09:00
Dean Herbert
6881563346
Merge branch 'master' into ScrollingExitFix 2019-02-25 19:11:05 +09:00
David Zhao
59ad470eed Clean up test code 2019-02-25 18:41:13 +09:00