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

24415 Commits

Author SHA1 Message Date
Huo Yaoyuan
d7b3578cc6 CA2201: throw correct exception type. 2019-12-17 13:00:02 +08:00
Huo Yaoyuan
ecfc6dfa3d CA1825: use Array.Empty. 2019-12-17 12:59:48 +08:00
Huo Yaoyuan
46dc2251e8 Add fxcop with every violated rule off. 2019-12-17 12:44:29 +08:00
Dean Herbert
5761d763ec
Allow changing volume using alt when hovering scroll containers (#7213)
Allow changing volume using alt when hovering scroll containers

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-17 13:20:31 +09:00
Dean Herbert
a85653ebec Add comment 2019-12-17 12:24:59 +09:00
Dean Herbert
a82b2a6c34
Merge pull request #7233 from smoogipoo/fix-cursortrail-texture
Fix cursortrail texture not being bound
2019-12-16 19:46:24 +09:00
Dean Herbert
eed2984bef
Update sdk and InspectCode version (#7208)
Update sdk and InspectCode version
2019-12-16 19:46:12 +09:00
Dan Balasescu
267d832ecc
Merge pull request #7168 from peppy/improve-hud-hiding
Improve HUD hiding
2019-12-16 19:09:46 +09:00
smoogipoo
6cf318c34b Merge remote-tracking branch 'refs/remotes/origin/master' into improve-hud-hiding 2019-12-16 18:41:21 +09:00
smoogipoo
a276643a4b Reorder health display and score elements 2019-12-16 18:41:14 +09:00
smoogipoo
83f77d9c35 Make the layout faster 2019-12-16 18:41:02 +09:00
smoogipoo
add04e98e1 Fix cursortrail texture not being bound 2019-12-16 18:10:44 +09:00
Dean Herbert
6ad792d2e0
Merge pull request #7232 from ppy/dependabot/nuget/ppy.osu.Game.Resources-2019.1215.0
Bump ppy.osu.Game.Resources from 2019.1010.0 to 2019.1215.0
2019-12-16 16:36:55 +09:00
dependabot-preview[bot]
fef1877095
Bump ppy.osu.Game.Resources from 2019.1010.0 to 2019.1215.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.1010.0 to 2019.1215.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.1010.0...2019.1215.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-16 07:36:30 +00:00
Dean Herbert
520924a5ef
Don't reuse the same control point references for sliders (#7230)
Don't reuse the same control point references for sliders
2019-12-16 16:03:37 +09:00
Dean Herbert
00853f350a
Optimise cursortrail with custom vertex logic (#7229)
Optimise cursortrail with custom vertex logic
2019-12-16 16:02:15 +09:00
Dan Balasescu
c3c0356963
Merge pull request #7228 from peppy/fix-skin-crash
Fix crashes on custom skins due to extension-less file lookups
2019-12-16 15:34:29 +09:00
smoogipoo
a554ca728b Don't reuse the same control point references 2019-12-16 15:27:54 +09:00
smoogipoo
db3dc4f375 Optimise cursortrail with custom vertex logic 2019-12-16 15:15:26 +09:00
Dean Herbert
befb78f83b Simplify LegacySkinResourceStore by deriving from ResourceStore 2019-12-16 14:01:08 +09:00
Dean Herbert
9062fe1935 Fix crashes on custom skins due to extension-less file lookups 2019-12-16 13:32:53 +09:00
Dean Herbert
f4ce703490
Separate path connections from control points (#7136)
Separate path connections from control points

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-16 11:37:11 +09:00
Dean Herbert
5e98f65b52
Merge branch 'master' into separate-path-connection 2019-12-16 11:16:00 +09:00
Huo Yaoyuan
c457571da6 Use index and range expressions 2019-12-15 20:17:35 +08:00
Huo Yaoyuan
cea3a66d4a Use static local method fixed for roslyn 3.4 2019-12-15 20:07:56 +08:00
Huo Yaoyuan
8b57023349 Require 3.1.100 SDK in global.json 2019-12-15 20:07:56 +08:00
Huo Yaoyuan
ab70abe8bd Turn off unexpected new warnings. 2019-12-15 20:07:56 +08:00
Huo Yaoyuan
19a3c95992 Update InspectCode to 2019.3 2019-12-15 20:07:56 +08:00
Dean Herbert
ef4718dfaf
Fix depth of cursor middle being incorrect compared other curso… (#7205)
Fix depth of cursor middle being incorrect compared other cursor elements
2019-12-15 14:43:56 +09:00
mcendu
135eb8972e
Merge branch 'master' into cursormiddle 2019-12-15 13:23:40 +08:00
Joehu
a04f4b76bb Allow changing volume using alt when hovering scroll containers 2019-12-14 11:39:59 -08:00
Dan Balasescu
6eac5d03ad
Merge pull request #7212 from peppy/update-framework
Update framework
2019-12-15 03:49:01 +09:00
Dean Herbert
91bb851a7d Update framework 2019-12-15 03:32:50 +09:00
Dean Herbert
23ea6c1e6c
Fix crash on trying to retrieve mods from unavailable ruleset (#7211)
Fix crash on trying to retrieve mods from unavailable ruleset
2019-12-15 03:18:14 +09:00
Dean Herbert
244eb56455 Fix test ruleset availability 2019-12-15 03:01:37 +09:00
Dean Herbert
41d4609c92 Fix crash on trying to retrieve mods from unavailable ruleset 2019-12-15 02:37:30 +09:00
Dean Herbert
63c13ca1eb
Use GetEndTime in Taiko and Mania (#7204)
Use GetEndTime in Taiko and Mania
2019-12-14 23:09:20 +09:00
mcendu
489d9dc7b5 Switch Expandtarget and "cursormiddle" 2019-12-14 18:33:56 +08:00
Huo Yaoyuan
ddb2cfc46d Use GetEndTime in Taiko and Mania 2019-12-14 18:16:13 +08:00
Dean Herbert
e96723434c
Fix error when entering multiplayer game in different ruleset (#7191)
Fix error when entering multiplayer game in different ruleset
2019-12-14 01:14:23 +09:00
Dean Herbert
b94d5bf82e Fix error when entering multiplayer game in different ruleset 2019-12-14 00:42:54 +09:00
Dean Herbert
a904660ed3
Add rate adjustment settings for all time mods (DT/HT/NC/DC/WU/… (#7121)
Add rate adjustment settings for all time mods (DT/HT/NC/DC/WU/WD)

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-12-13 22:39:37 +09:00
Dean Herbert
bc397a4f1d
Merge branch 'master' into adjustable-rate-mods 2019-12-13 22:23:30 +09:00
Dean Herbert
5a8b4113a2
Move available mods to global context (#7172)
Move available mods to global context

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-12-13 22:16:53 +09:00
Dean Herbert
59538bfd32 Merge branch 'global-available-mods' into adjustable-rate-mods 2019-12-13 21:57:27 +09:00
Dan Balasescu
ef94df917c
Add whitespace 2019-12-13 21:56:03 +09:00
smoogipoo
72ea871bff Make constructor protected 2019-12-13 21:55:20 +09:00
Dean Herbert
af15662856 Fix WindUp applying too much change 2019-12-13 21:55:07 +09:00
Dean Herbert
bc31146560 Mods -> SelectedMods 2019-12-13 21:45:38 +09:00
Dean Herbert
8052aeb238 Fix potential nullref in disposal logic 2019-12-13 21:36:50 +09:00