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

24163 Commits

Author SHA1 Message Date
Dean Herbert
9fa745aecc Merge branch 'apply-to-track' into adjustable-rate-mods 2019-12-09 18:12:01 +09:00
Dean Herbert
d650bfb6d6 Remove unnecessary cast 2019-12-09 18:05:14 +09:00
Dean Herbert
ba538cf09b Merge branch 'apply-to-track' into adjustable-double-time 2019-12-09 17:45:19 +09:00
Dean Herbert
eb074b7058 Allow mods to apply to track, not clock 2019-12-09 17:44:45 +09:00
Dean Herbert
0c7e5a2e3b Add bindable adjustments for DT/HT rate 2019-12-09 16:54:00 +09:00
Dean Herbert
7d6cd72a82
Bump System.ComponentModel.Annotations from 4.6.0 to 4.7.0 (#7109)
Bump System.ComponentModel.Annotations from 4.6.0 to 4.7.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
2019-12-09 16:51:03 +09:00
Dean Herbert
e37526888c Merge remote-tracking branch 'upstream/master' into adjustable-double-time 2019-12-09 16:43:17 +09:00
dependabot-preview[bot]
12cfb7dedb
Bump System.ComponentModel.Annotations from 4.6.0 to 4.7.0
Bumps [System.ComponentModel.Annotations](https://github.com/dotnet/corefx) from 4.6.0 to 4.7.0.
- [Release notes](https://github.com/dotnet/corefx/releases)
- [Commits](https://github.com/dotnet/corefx/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-09 07:28:11 +00:00
Dean Herbert
fbd0bfac60
Improve animation of popup dialog buttons (#7082)
Improve animation of popup dialog buttons

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-12-09 16:00:39 +09:00
Dan Balasescu
0c9f7a64f1
Merge branch 'master' into improve-dialog-button-visuals 2019-12-09 15:31:48 +09:00
Dan Balasescu
6fa2910674
Merge pull request #7095 from mcendu/legacy-cursor
Add skin-controlled cursor rotation
2019-12-09 15:31:33 +09:00
Dan Balasescu
f0014963e3
Merge branch 'master' into legacy-cursor 2019-12-09 14:53:36 +09:00
Dan Balasescu
07efd66287
Merge pull request #7075 from peppy/editor-timeline-hitobject-display
Editor timeline hitobject display
2019-12-09 14:53:25 +09:00
Dan Balasescu
65fda87c65
Merge pull request #7107 from EVAST9919/replay-fix
Fix unavailable replays can be accessed via leaderboard
2019-12-09 14:46:07 +09:00
smoogipoo
aff1b93a07 Move config retrieval into LegacySliderBall 2019-12-09 14:43:23 +09:00
Dan Balasescu
5738ef5fab
Merge branch 'master' into editor-timeline-hitobject-display 2019-12-09 14:34:55 +09:00
Dean Herbert
58db745121 Merge remote-tracking branch 'upstream/master' into improve-dialog-button-visuals 2019-12-09 14:11:52 +09:00
Dean Herbert
03d18186c2 Fix broken merge 2019-12-09 14:11:44 +09:00
mcendu
340b709e43
Merge branch 'master' into legacy-cursor 2019-12-09 12:32:16 +08:00
Andrei Zavatski
69deb0ca96 Fix unavailable replays can be accessed via leaderboard 2019-12-09 07:19:55 +03:00
mcendu
76aabdd297 rename field rotate to spin 2019-12-09 12:11:04 +08:00
Dean Herbert
003eef8595
Fix mod buttons being selected when drag scrolling overlay (#7099)
Fix mod buttons being selected when drag scrolling overlay
2019-12-09 12:24:48 +09:00
Dean Herbert
ad2ecf4dff
Fix key config search not clearing after pressing escape (#7105)
Fix key config search not clearing after pressing escape
2019-12-09 12:22:30 +09:00
Dean Herbert
d2d1c03af5
Highlight own score in BeatmapSetOverlay (#7093)
Highlight own score in BeatmapSetOverlay

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-09 11:56:07 +09:00
mcendu
eb065286ae fix ci 2019-12-09 08:49:44 +08:00
mcendu
1cf81c4906 rm unnecessary curlies 2019-12-09 08:37:32 +08:00
mcendu
b2b252a1cc Allow skin to disable spin 2019-12-09 08:36:07 +08:00
Joehu
9974fff5cc Make sub panel back button inherit osu button 2019-12-08 10:51:25 -08:00
Joehu
5cf35869e9 Fix key config search not clearing after pressing escape 2019-12-08 10:40:39 -08:00
Dean Herbert
c2a40c574d Split out if statement for readability 2019-12-09 02:13:47 +09:00
Joehu
e394b28799 Remove redundant transform 2019-12-08 09:12:32 -08:00
Joehu
463b6c0030 Remove whitespace 2019-12-08 09:04:34 -08:00
Joehu
8956768fe0 Fix mod buttons being selected when drag scrolling overlay 2019-12-08 08:55:45 -08:00
mcendu
4cd0dd7856 Move transformation to LoadComplete 2019-12-08 20:47:28 +08:00
mcendu
13b891f3f4 Crude legacy cursor rotation support 2019-12-08 20:05:02 +08:00
Andrei Zavatski
929be3e9e7 Highlight own score in BeatmapSetOverlay 2019-12-08 12:34:07 +03:00
Dean Herbert
4d4e17f7c0
Add explicit app manifest to desktop project (#7088)
Add explicit app manifest to desktop project
2019-12-08 17:31:55 +09:00
Bartłomiej Dach
ff8544597c Add explicit app manifest to desktop project
After the .NET Core bump to version 3.0 in the 2019.1011.0 release,
reports popped up of the game not starting any more on some computers
using Intel graphics cards (HD 3000 in particular).

After investigation the auto-generated application manifest changed in
.NET Core 3.0. In particular this seems to be a root cause for the
failed start-ups on Intel cards, due to a Windows version compatibility
section appearing. The section in turn affects some WinAPI calls like
GetVersionEx, which will return major version 10 instead of 6 if
compatibility with Windows 10 is declared. This combined with a broken
check in the Intel OpenGL driver caused the crashes.

To resolve this without having to patch binaries, add an explicit
application manifest to the desktop project with the compatibility
section removed.
2019-12-07 19:55:09 +01:00
Dan Balasescu
52a0d98012
Merge pull request #7077 from peppy/fix-player-loader-speed
Fix mod speed adjustments unapplying if exiting the player loading screen early
2019-12-08 03:53:55 +09:00
Dan Balasescu
58074df11a
Merge pull request #7078 from peppy/dont-confine-skins
Always display skins at native sizes for now
2019-12-08 03:39:31 +09:00
Dan Balasescu
54798b134e
Add accessibility modifiers 2019-12-08 03:16:41 +09:00
Dan Balasescu
299daa26da
Merge branch 'master' into dont-confine-skins 2019-12-08 03:14:24 +09:00
Dean Herbert
f65866648e Use Array.Empty 2019-12-06 20:14:56 +09:00
Dean Herbert
347373a3ba Fix test failures 2019-12-06 19:04:55 +09:00
Dean Herbert
46d055604a Customize -> Customise 2019-12-06 18:59:45 +09:00
Dean Herbert
f958485be1 Add comment about size change 2019-12-06 18:54:54 +09:00
Dean Herbert
af2305bb77 Add null check 2019-12-06 18:53:30 +09:00
Dean Herbert
680b2653ae Improve animation of popup dialog buttons 2019-12-06 18:51:30 +09:00
Dean Herbert
cf0413663d Merge branch 'settings-source' into customized-mods 2019-12-06 18:05:39 +09:00
Dean Herbert
f84705ab96 Add tests 2019-12-06 18:04:46 +09:00