1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 16:07:24 +08:00
Commit Graph

23425 Commits

Author SHA1 Message Date
Dean Herbert
5b405abc52 Schedule forcefullyExit call for safety
Screen state may have changed at an inopportune moment. Run on local scheduler, not API scheduler to avoid any weirdness.
2019-10-31 13:43:25 +09:00
Dean Herbert
32dabf80a6 Ensure forceful exit completely exits from mutliplayer
Previously it may have gotten blocked by being in a sub screen.
2019-10-31 13:42:28 +09:00
Dean Herbert
5b5703544b
Fix crash when quickly exiting multiplayer after joining a room (#6666)
Fix crash when quickly exiting multiplayer after joining a room
2019-10-31 13:15:46 +09:00
Andrei Zavatski
4730453083 Apply suggestions 2019-10-31 02:10:00 +03:00
Andrei Zavatski
d90545227c Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix 2019-10-30 23:49:56 +03:00
Huo Yaoyuan
ff3db9f3b2 Update README to require VS2019 2019-10-31 02:58:58 +08:00
Huo Yaoyuan
8d290a3242 Resolve CS0067. 2019-10-30 23:43:13 +08:00
Huo Yaoyuan
9d4f80c2a2 Add icon and use licence expression for NuGet.
Unlike framework, if other components are packed, they are likely to use different icons.
2019-10-30 23:37:58 +08:00
Huo Yaoyuan
b0414c105f Copy parts of DotSettings from framework. 2019-10-30 23:16:57 +08:00
Huo Yaoyuan
3ad0369d7b Resolve new diagnostics in C# 7.3 2019-10-30 23:13:11 +08:00
Huo Yaoyuan
e57e9a3817 Update VSCode restore instructions.
Use slnf when dotnet.exe knows it.
2019-10-30 23:07:22 +08:00
Huo Yaoyuan
c95052b10f Resolve package downgrade and VS claims for iOS. 2019-10-30 23:03:02 +08:00
Huo Yaoyuan
847cf8639f Move to VS2019 stable for CI. 2019-10-30 22:58:23 +08:00
Huo Yaoyuan
bcf8e3a9d4 Remove redundant properties from desktop projects.
While OutputType=Library maybe doubtful, PlatformTarget=AnyCPU should be clearly the default.
2019-10-30 22:56:33 +08:00
Huo Yaoyuan
47e3498b71 Use cake as local tool and builds for slnf. 2019-10-30 22:42:25 +08:00
Huo Yaoyuan
9902278277 Merge props orthogonally. 2019-10-30 22:28:10 +08:00
Huo Yaoyuan
31595159be Normalize .props 2019-10-30 21:54:14 +08:00
Huo Yaoyuan
93fae7ad4d Remove meanless properties. 2019-10-30 21:46:30 +08:00
Huo Yaoyuan
8fbe76b574 Use slnf for filtering platform. 2019-10-30 21:35:58 +08:00
Dean Herbert
35be8f9dfb Share framework file-exclusion function 2019-10-30 19:34:17 +09:00
Dean Herbert
7b67701e57
Merge branch 'master' into editor-timing-screen 2019-10-30 19:27:24 +09:00
Dean Herbert
e4270dc57c
Simplify EditorClock.Seek method (#6667)
Simplify EditorClock.Seek method
2019-10-30 19:26:43 +09:00
Dean Herbert
7f2916454d Simplify EditorClock.Seek method 2019-10-30 19:09:46 +09:00
Dean Herbert
5899bbd8a6 Fix merge regressions 2019-10-30 18:45:50 +09:00
Dean Herbert
93076ad6a1
Merge branch 'master' into editor-timing-screen 2019-10-30 18:42:20 +09:00
Dan Balasescu
073066170c
Merge pull request #6632 from peppy/bindable-control-points
Bindable control points
2019-10-30 18:32:12 +09:00
smoogipoo
cf2d885099 Fix control points being flushed too late 2019-10-30 18:02:18 +09:00
smoogipoo
45af796943 Remove usages of EF internals 2019-10-30 17:05:15 +09:00
Dan Balasescu
514c9f1eef
Merge branch 'master' into bindable-control-points 2019-10-30 16:20:54 +09:00
Dan Balasescu
7d61e5cfd5
Merge pull request #6635 from peppy/bindable-control-point-properties
Bindable control point properties
2019-10-30 16:20:10 +09:00
Dan Balasescu
3045ba4bf4
Merge branch 'master' into bindable-control-point-properties 2019-10-30 16:02:39 +09:00
Dan Balasescu
ced6042b3e
Use internal type name 2019-10-30 15:51:09 +09:00
smoogipoo
f56d9fe50c Forcefully part room when multiplayer exits 2019-10-30 14:42:14 +09:00
smoogipoo
b6457f0ce9 Cancel room joins on part 2019-10-30 14:41:54 +09:00
smoogipoo
95ff48c123 Don't log cancelled join requests 2019-10-30 14:38:06 +09:00
Dean Herbert
d7ea264ef4
Fix 1x1 white pixel appearing in the centre of hitcircles on de… (#6658)
Fix 1x1 white pixel appearing in the centre of hitcircles on default skin

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-10-30 12:43:55 +09:00
Dean Herbert
dbee63c1a6
Make OsuButton correctly block hover events (#6636)
Make OsuButton correctly block hover events
2019-10-30 12:38:16 +09:00
Dan Balasescu
a03da25e05
Merge branch 'master' into fix-white-pixel 2019-10-30 12:35:22 +09:00
Dan Balasescu
7204ecf166
Merge pull request #6662 from GSculerlor/signin-ux-improvement
Add feedback to user when sign in form isn't filled
2019-10-30 12:35:16 +09:00
Dan Balasescu
4322933470
Merge branch 'master' into signin-ux-improvement 2019-10-30 12:10:52 +09:00
Dan Balasescu
53b85c1681
Merge pull request #6653 from peppy/fix-day-separator-purging
Fix day separators never being removed from chat history
2019-10-30 12:03:41 +09:00
Andrei Zavatski
759395bcb5 CI fix 2019-10-30 04:31:09 +03:00
Andrei Zavatski
8ad5ccda68 Test steps rearrangement and condition fix 2019-10-30 04:16:14 +03:00
Andrei Zavatski
7f755fe726 Add more tests 2019-10-30 03:47:17 +03:00
Andrei Zavatski
f1a2643c40 Add test scene 2019-10-30 03:45:05 +03:00
Andrei Zavatski
2c31492bbe Fix comment can be voted if user is null 2019-10-30 03:27:06 +03:00
Andrei Zavatski
1502a6c631 Cleanups 2019-10-30 03:09:14 +03:00
Andrei Zavatski
092d16bb64 Dont use binding to set disabled value 2019-10-29 23:43:16 +03:00
Andrei Zavatski
30d9b21b86 Condition simplification 2019-10-29 21:57:20 +03:00
Andrei Zavatski
e287dae64b Fix VotePill can be activated by the comment sender 2019-10-29 21:25:48 +03:00