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

15792 Commits

Author SHA1 Message Date
Salman Ahmed
55be4478aa Merge remote-tracking branch 'upstream/master' into fallback-to-skin-combo-colours 2019-12-21 12:36:09 +03:00
unknown
1bd44529dd add full-stop to mod description for consistency 2019-12-20 18:31:16 +08:00
unknown
08b477ed52 make ModDifficultyAdjust abstract 2019-12-20 18:30:23 +08:00
Dean Herbert
a6bdf04f6b Remove unused using 2019-12-20 18:36:39 +09:00
Dean Herbert
822903d5db Update song select statistics when mod changes settings 2019-12-20 18:01:35 +09:00
smoogipoo
1802e0ff11 Fix storyboard incorrectly re-ordering elements 2019-12-20 16:04:05 +09:00
Dean Herbert
1451f06739
Fix key overlay appearing regardless of the setting (#7289)
Fix key overlay appearing regardless of the setting

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-12-20 15:09:02 +09:00
Dean Herbert
f66c12a1f3
Add post-update notification for iOS users (#7300)
Add post-update notification for iOS users
2019-12-20 15:00:19 +09:00
Dan Balasescu
aa2fcbb660
Merge branch 'master' into fix-key-overlay-always-shown 2019-12-20 14:47:20 +09:00
Dean Herbert
11214628ad Add post-update notification for iOS users 2019-12-20 14:02:01 +09:00
Dean Herbert
656c584503 Update RestoreDefaultValueButton when default value changes 2019-12-20 13:59:01 +09:00
Salman Ahmed
7d090d6cd9 Fix key overlay appearing regardless of the setting 2019-12-19 17:52:58 +03:00
Dean Herbert
a3154f2f7b Update framework 2019-12-19 20:30:58 +09:00
smoogipoo
50fa6c5f77 Update score on reverts 2019-12-19 20:18:23 +09:00
smoogipoo
04c3a6f8a4 Move more properties to the base class 2019-12-19 20:18:17 +09:00
smoogipoo
76f2fb378f Separate score and health parts of ScoreProcessor 2019-12-19 20:03:14 +09:00
smoogipoo
1da8cc8690 Encapsulate common logic of ScoreProcessor 2019-12-19 19:03:27 +09:00
Dean Herbert
b1533ae2a9 Fix score serialisation failing for unknown mod properties 2019-12-19 14:58:56 +09:00
Dean Herbert
c94c803562
Implement local sorting by name and country in SocialOverlay (#5847)
Implement local sorting by name and country in SocialOverlay

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-19 12:54:02 +09:00
Dean Herbert
ada8efb4ab
Merge branch 'master' into fix-storyboard-crash 2019-12-19 11:44:20 +09:00
Dean Herbert
a46602f705 Move cancellation token construction closer to usage 2019-12-19 11:26:22 +09:00
smoogipoo
dd68106d90 Recreate panels only while loading/loaded 2019-12-19 02:21:33 +09:00
smoogipoo
007e2e80c1 Refactor to fix sorting issues 2019-12-19 02:02:57 +09:00
Dan Balasescu
37d7c984bc
Merge branch 'master' into friends-sorting 2019-12-19 01:33:03 +09:00
smoogipoo
f38853d229 Improve performance of storyboard loading 2019-12-19 00:52:50 +09:00
smoogipoo
8d6987c870 Refactor storyboard timeline to reduce GC / fix crashes 2019-12-18 23:59:48 +09:00
smoogipoo
2905a4418d Fix potential nullref 2019-12-18 21:30:57 +09:00
smoogipoo
cb5a35f8f9 Fix incorrect bindable valuechanged usage 2019-12-18 21:08:49 +09:00
smoogipoo
4e11fb0fd7 Merge remote-tracking branch 'refs/remotes/origin/master' into multiplier-text 2019-12-18 19:36:16 +09:00
smoogipoo
39489e2901 Merge remote-tracking branch 'refs/remotes/origin/master' into fix-editor-movement-crash 2019-12-18 18:51:56 +09:00
smoogipoo
5664ce3109 Add hitobject container regression test 2019-12-18 18:51:12 +09:00
Dean Herbert
ea661fce21
Merge branch 'master' into adjustable-map-settings 2019-12-18 18:44:11 +09:00
Dean Herbert
36172cf2bd
Merge pull request #7175 from LeNitrous/update-beatmap-settings
Display current difficulty statistics with mods applied
2019-12-18 18:43:49 +09:00
Dean Herbert
5cdc7d3b18
Merge pull request #7183 from smoogipoo/legacy-beatmap-saving
Add initial implementation of a legacy beatmap encoder
2019-12-18 18:43:14 +09:00
Dean Herbert
51a01c7006
Merge pull request #7256 from peppy/remove-ruleset-ctor-param
Remove RulesetInfo parameter from Ruleset constructor
2019-12-18 18:42:42 +09:00
Dean Herbert
06287f72f3
Merge pull request #7221 from LeNitrous/nightcore-beats
Implement backing beats for Nightcore mods
2019-12-18 18:28:16 +09:00
Dan Balasescu
6683460240
Merge branch 'master' into update-beatmap-settings 2019-12-18 17:59:27 +09:00
Dean Herbert
1f3e1b3085 Remove unused using 2019-12-18 17:59:07 +09:00
smoogipoo
2a128340d0 Merge remote-tracking branch 'refs/remotes/origin/master' into nightcore-beats 2019-12-18 17:58:37 +09:00
smoogipoo
d65e37d795 Fix typo 2019-12-18 17:58:29 +09:00
Dean Herbert
bf85f4affb Fix editor crashing when loading a beatmap for an unsupported ruleset 2019-12-18 17:53:26 +09:00
Dean Herbert
69f888fc49
Fix storyboard flipping potentially not having an effect (#7260)
Fix storyboard flipping potentially not having an effect
2019-12-18 17:48:41 +09:00
smoogipoo
8e651962c7 Fix incorrectly binding inside BDL load() 2019-12-18 17:41:30 +09:00
Dean Herbert
4befabc257 Split out complex method 2019-12-18 17:35:51 +09:00
smoogipoo
5aca523d35 Fix storyboard flipping potentially not having an effect 2019-12-18 17:27:13 +09:00
smoogipoo
602ce698d5 Fix storyboard vectorscale and scale cross-pollution 2019-12-18 17:21:38 +09:00
Dean Herbert
fa067b8799
Merge branch 'master' into legacy-beatmap-saving 2019-12-18 17:17:03 +09:00
Dean Herbert
ada2ae2b2c Use tuple to avoid potential for incorrect display 2019-12-18 17:12:41 +09:00
Dean Herbert
e87aa281bf Don't clone beatmap unnecessarily 2019-12-18 17:00:35 +09:00
Dean Herbert
7831e6ed33
Implement NewsArticleCover class (#7192)
Implement NewsArticleCover class
2019-12-18 16:15:23 +09:00
Dean Herbert
6e0802e50c Remove RulesetInfo parameter from Ruleset constructor 2019-12-18 14:49:09 +09:00
Dean Herbert
f53fd6e4bc Fix status capitalisation 2019-12-18 14:07:21 +09:00
Dean Herbert
2f5b27e97c Make user bindables readonly 2019-12-18 14:07:12 +09:00
Dean Herbert
756d847ad8 Fix user not getting an initial status 2019-12-18 14:07:03 +09:00
smoogipoo
df8f8ffd0d Fix potential exception during removal 2019-12-18 12:03:15 +09:00
Lucas A
0a278ef943 Apply review suggestions 2019-12-17 19:23:30 +01:00
smoogipoo
bcc19e29f2 Fix editor crashing after re-ordering objects 2019-12-18 02:56:29 +09:00
Dean Herbert
036efb9947
Merge branch 'master' into fix-effect-points 2019-12-18 01:43:15 +09:00
Dean Herbert
886db8eb22
Merge branch 'master' into fix-local-score-availability 2019-12-18 01:15:20 +09:00
Dean Herbert
4443d2196b
Merge branch 'master' into legacy-slider-body 2019-12-17 23:42:31 +09:00
Dean Herbert
e0ce87adca
Move CreateScoreProcessor() to Ruleset (#7244)
Move CreateScoreProcessor() to Ruleset
2019-12-17 22:15:42 +09:00
Dan Balasescu
3d13fe485d
Merge pull request #7238 from huoyaoyuan/fxcop
Apply FxCop at game side
2019-12-17 21:29:52 +09:00
Dan Balasescu
fd2785bab3
Merge branch 'master' into fxcop 2019-12-17 20:14:45 +09:00
smoogipoo
49bf8d27d1 Move CreateScoreProcessor() to Ruleset 2019-12-17 20:08:13 +09:00
smoogipoo
527ab1a72f Fix traceable mod not working on skin change 2019-12-17 19:49:13 +09:00
Andrei Zavatski
f6cde911e2 Use switch expressions 2019-12-17 13:41:28 +03:00
Andrei Zavatski
bc9177983a Fix possible null 2019-12-17 12:50:50 +03:00
Andrei Zavatski
023892738a Integration into overlay 2019-12-17 12:36:44 +03:00
Andrei Zavatski
8cd96acffc CounterPill implementation 2019-12-17 12:05:35 +03:00
smoogipoo
946a202ee5 Fix online replays not being available locally 2019-12-17 15:47:08 +09:00
Dean Herbert
c92332d2e4
Merge pull request #7214 from Joehuu/default-placeholder-channel-search
Use default placeholder text on chat channel search box
2019-12-17 14:38:56 +09:00
Dean Herbert
735b7a8455
Merge pull request #6940 from aspriddell/cinema-mod
Add "Cinema" mod
2019-12-17 14:33:12 +09:00
Huo Yaoyuan
40b43b85f1 CA1715: use prefix for generic parameters. 2019-12-17 13:00:25 +08:00
Huo Yaoyuan
61a6106e52 CA2200: don't explictly throw caught exception. 2019-12-17 13:00:23 +08:00
Huo Yaoyuan
caf3f774ba CA1309: compare strings correctly. 2019-12-17 13:00:15 +08:00
Huo Yaoyuan
e46f6627e4 CA1052: make type static. 2019-12-17 13:00:13 +08:00
Huo Yaoyuan
d5994ed484 CA2208: create exceptions correctly. 2019-12-17 13:00:10 +08:00
Huo Yaoyuan
09257b0c6d CA1820: use IsNullOrEmpty. 2019-12-17 13:00:08 +08:00
Huo Yaoyuan
3c39fde7ff CA1065: throw NotSupportedException in properties. 2019-12-17 13:00:05 +08:00
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
Dean Herbert
f8ffa67693 Add test and isolate ignore bindable from EnableUserDim 2019-12-17 13:21:23 +09: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
b5db927d93 Merge branch 'master' into cinema-mod 2019-12-17 12:56:06 +09:00
Dean Herbert
272d7d0ca9
Merge branch 'master' into fallback-to-skin-combo-colours 2019-12-17 12:36:20 +09:00
Dean Herbert
a85653ebec Add comment 2019-12-17 12:24:59 +09:00
Dean Herbert
87035f8251 Simplify complex method 2019-12-17 12:12:15 +09:00
Dean Herbert
795416c066 Move first beat offset to BeatSyncedContainer 2019-12-17 12:06:09 +09:00
Dean Herbert
eed2984bef
Update sdk and InspectCode version (#7208)
Update sdk and InspectCode version
2019-12-16 19:46:12 +09:00
Dean Herbert
438d97f4f5 Rename variable for clarity 2019-12-16 19:42:28 +09:00
Dean Herbert
cfd8111120 Better initial beat handling 2019-12-16 19:41:02 +09:00
Dean Herbert
72404bff9a Add support for simple triple time 2019-12-16 19:16:54 +09:00
Dean Herbert
210fecc951 Fix incorrect hat logic; add support for first barline omission 2019-12-16 18:57:11 +09:00
Dean Herbert
0f9ff32cdc Fix beat playing while paused 2019-12-16 18:51:22 +09:00
Dean Herbert
c883c97bab Fix off-by-one starting bar 2019-12-16 18:50:58 +09:00
Dean Herbert
3e0fda58ea Play finish in addition to kick, not isolated 2019-12-16 18:47:06 +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
Dean Herbert
9de6b62fb1 Fix nightcore beat not playing if song doesn't hit beat index 0 2019-12-16 18:24:29 +09:00
Dean Herbert
3f3ba603c1 Merge remote-tracking branch 'upstream/master' into nightcore-beats 2019-12-16 18:03:32 +09:00
smoogipoo
be7b00cc34 Fix potentially incorrect custom sample bank 2019-12-16 17:12:31 +09:00
smoogipoo
8beb6b534f Merge remote-tracking branch 'refs/remotes/origin/master' into legacy-beatmap-saving 2019-12-16 17:09:03 +09:00
smoogipoo
3c9884456f Use writeline 2019-12-16 17:08:46 +09:00
smoogipoo
5278236458 Use invariant ToLower() 2019-12-16 17:07:30 +09:00
smoogipoo
27150d6bbc Use char concatenation for performance 2019-12-16 17:06:52 +09:00
smoogipoo
9fa6954ac2 Refactor getSampleBank a bit 2019-12-16 17:05:24 +09:00
smoogipoo
98dd1c2590 Use SingleOrDefault() where possible 2019-12-16 17:03:58 +09:00
smoogipoo
d56e99865c Throw not implemented exceptions 2019-12-16 16:57:49 +09:00
smoogipoo
596fda3c1f Refactor switch 2019-12-16 16:57:40 +09:00
smoogipoo
58e3fb0d0f Coalesce to -1 2019-12-16 16:43:20 +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
d7eb4f73f4
Merge branch 'master' into update-beatmap-settings 2019-12-16 14:57:57 +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
unknown
88d3a1707d ensure beatIndex is 0 before starting beats 2019-12-16 06:35:18 +08:00
Huo Yaoyuan
c457571da6 Use index and range expressions 2019-12-15 20:17:35 +08:00
Huo Yaoyuan
ab70abe8bd Turn off unexpected new warnings. 2019-12-15 20:07:56 +08:00
unknown
154bc57c6e remove unused dependency 2019-12-15 17:46:44 +08:00
unknown
6da168118e remove unused usings 2019-12-15 17:02:29 +08:00
unknown
01c036b0b0 implement backing beats for nightcore mods 2019-12-15 16:56:02 +08:00
Joehu
5af363c920 Use default placeholder text on chat channel search box 2019-12-14 12:58:13 -08:00
Joehu
a04f4b76bb Allow changing volume using alt when hovering scroll containers 2019-12-14 11:39:59 -08:00
Dean Herbert
91bb851a7d Update framework 2019-12-15 03:32:50 +09:00
Dean Herbert
41d4609c92 Fix crash on trying to retrieve mods from unavailable ruleset 2019-12-15 02:37:30 +09:00
Huo Yaoyuan
ddb2cfc46d Use GetEndTime in Taiko and Mania 2019-12-14 18:16:13 +08:00
Lucas A
43720fbf45 Fix CI issues 2019-12-13 18:59:40 +01:00
Lucas A
e05c9426ed Initial implementation of NewsArticleCover class 2019-12-13 18:50:49 +01:00
Dean Herbert
b94d5bf82e Fix error when entering multiplayer game in different ruleset 2019-12-14 00:42:54 +09:00
Dean Herbert
bc397a4f1d
Merge branch 'master' into adjustable-rate-mods 2019-12-13 22:23:30 +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
Dean Herbert
440a8470e1 Move available mods to global context
This also tidies up ModSelectOverlay and setting creation flow in general.
2019-12-13 21:36:50 +09:00
smoogipoo
ea4eb6b204 CI cleanups 2019-12-13 21:29:10 +09:00
Dean Herbert
fa7520d177
Merge pull request #7185 from peppy/update-framework
Update framework
2019-12-13 20:59:22 +09:00
Dean Herbert
34f67b9cad Update framework 2019-12-13 20:31:20 +09:00
Dean Herbert
a1f8ab1735 Fix unrequired type keyword 2019-12-13 20:13:53 +09:00
Dean Herbert
3dc2b59d2a Move variable above common bindables 2019-12-13 20:06:12 +09:00
Dean Herbert
395b058ff8 Fix OsuScreenDependencies not caching non-leased versions 2019-12-13 20:05:54 +09:00
Dean Herbert
952bc96bbf Use GameBase data sources for Beatmap/Mods/Ruleset
Sourced in via OsuScreenDependencies for management
2019-12-13 20:05:38 +09:00
smoogipoo
9bc02f489e Add missing headers 2019-12-13 19:14:49 +09:00
smoogipoo
0ad28a9400 Start at version 128 2019-12-13 19:11:45 +09:00
smoogipoo
abf3f341b7 Merge remote-tracking branch 'refs/remotes/origin/master' into legacy-beatmap-saving 2019-12-13 19:01:25 +09:00
smoogipoo
87a7f340e3 Fix first sample point being treated as redundant 2019-12-13 18:14:01 +09:00
smoogipoo
654499d8b0 Remove whitespace 2019-12-13 17:33:18 +09:00
smoogipoo
97158fce7d Always attach a new combo to spinners 2019-12-13 17:02:10 +09:00