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

15683 Commits

Author SHA1 Message Date
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
Willy Tu
ad077042ba Created ContextMenu for scores by adding OsuContextMenuContainer as a child of LeaderboardScore and a Drawable that extended the IHasContextMenu interface to the MenuContainer. Tried to the LeaderboardScore extend IHASContextMenu itself, but it is not working yet. 2019-12-15 02:18:12 -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
smoogipoo
0b7c4f252c Fix artist being written in place of version 2019-12-13 17:01:59 +09:00
smoogipoo
53a665a034 Fix sound types and banks not being written correctly 2019-12-13 17:01:44 +09:00
unknown
3945e7403a improve tests and refactor AdvancedStats 2019-12-13 09:39:54 +08:00
unknown
ec5b506960 apply mod difficulty settings during song select 2019-12-12 23:41:46 +08:00
Dean Herbert
5e634c1183 Move test values to constants 2019-12-12 20:51:58 +09:00
Dean Herbert
7559012fb7 Merge remote-tracking branch 'upstream/master' into lighten-playfield-during-breaks 2019-12-12 19:55:09 +09:00
smoogipoo
ac984423bb Fix only single sound type being written 2019-12-12 19:53:30 +09:00
smoogipoo
dedae69db8 Prefer legacy curve format if possible 2019-12-12 19:52:15 +09:00
smoogipoo
d35d34c01b Fix hanging semicolon for per-node bank output 2019-12-12 19:01:43 +09:00
smoogipoo
4760307bbb Don't output the first slider control point 2019-12-12 19:01:15 +09:00
smoogipoo
60063eefd2 Fix up background/video events 2019-12-12 18:51:05 +09:00
smoogipoo
51bdb73b91 Don't write empty file names 2019-12-12 18:49:47 +09:00
smoogipoo
f89042cd0a Add missing section header 2019-12-12 18:48:22 +09:00
smoogipoo
e09bbf0315 Implement background/video/break encoding 2019-12-12 18:47:28 +09:00
smoogipoo
d1dc3456d1 Fix incorrect repeat point count 2019-12-12 18:42:48 +09:00
smoogipoo
c3475a2dde Write control points in absolute coordinates 2019-12-12 18:41:13 +09:00
smoogipoo
8f03599a62 Write default sampleset by name 2019-12-12 18:40:33 +09:00
smoogipoo
be000e13e4 Implement initial legacy beatmap encoding support 2019-12-12 18:34:40 +09:00
Dean Herbert
623ab1ef3b Update time ramp preview on setting change 2019-12-12 17:38:18 +09:00
Dean Herbert
bd3fe23cee Merge branch 'fix-mod-retention' into adjustable-rate-mods 2019-12-12 17:21:15 +09:00
Dean Herbert
a0792f82e8 Re-jig mod select logic to reduce event fires 2019-12-12 17:05:47 +09:00
Dean Herbert
d15f49f60f Also hide the break overlay 2019-12-12 16:13:02 +09:00
Dean Herbert
99280db694 Add note about AlwaysPresent requirement 2019-12-12 16:12:40 +09:00
Dean Herbert
e4297ffead Hide HUD in a better way 2019-12-12 16:12:32 +09:00
Dean Herbert
37a94988a3 Merge branch 'improve-hud-hiding' into cinema-mod 2019-12-12 16:12:19 +09:00
Dean Herbert
94f3dbb2f6 Adjust transitions slightly 2019-12-12 16:09:50 +09:00
Dean Herbert
3ccfee64f6 Add HUDOverlay tests 2019-12-12 16:09:42 +09:00
smoogipoo
59345c97e4 Remove now unnecessary editor working beatmap 2019-12-12 15:58:31 +09:00
smoogipoo
5861eca80d Make DrawableRuleset take a converted beatmap 2019-12-12 15:58:11 +09:00
Dean Herbert
4c4199269c Use protected constructors 2019-12-12 15:25:37 +09:00
Dean Herbert
ffb5cdc6ae Hide settings overlay along with other HUD-hidden content 2019-12-12 15:20:42 +09:00
Dean Herbert
ad2528d4d2 Hide key counter along with other hud elements
Also tidies up HUD hide logic and protects against incorrect hiding.
2019-12-12 15:19:45 +09:00
Dean Herbert
9961fa7385
Merge branch 'master' into adjustable-rate-mods 2019-12-12 15:10:23 +09:00
Dean Herbert
76a7e9cde8 Catch file exception in test reset 2019-12-12 14:04:57 +09:00
Dean Herbert
b6c86d512a Update framework 2019-12-12 13:28:27 +09:00
Dean Herbert
8168872952 Merge remote-tracking branch 'upstream/master' into filesafety 2019-12-12 13:28:21 +09:00
Dean Herbert
606bd33aa6 Use beatmap background in editor 2019-12-12 13:04:32 +09:00
Dean Herbert
a93d57b77e
Merge branch 'master' into lighten-playfield-during-breaks 2019-12-12 11:57:21 +09:00
Dean Herbert
d2ada90434
Merge branch 'master' into single-scoreprocessor 2019-12-12 11:36:45 +09:00
Salman Ahmed
4f6b85e5ea Add test ensuring correct break lightening behaviour 2019-12-12 00:32:39 +03:00
Albie
6b048a03a6 Merge branch 'cinema-mod' of https://github.com/aspriddell/osu into cinema-mod 2019-12-11 19:01:28 +00:00
Albie
2ca722423b remove uneccesary using statement 2019-12-11 18:58:14 +00:00
Albie
4a1c6db3ed
Merge branch 'master' into cinema-mod 2019-12-11 18:00:17 +00:00
Albie
caa9286a90 update tests, change binding and reduce lines in cinema mod 2019-12-11 17:39:40 +00:00
Dean Herbert
e6102200a8 Merge remote-tracking branch 'upstream/master' into filesafety 2019-12-12 01:59:57 +09:00
smoogipoo
40f918dce6 Remove unused using 2019-12-11 19:49:32 +09:00
smoogipoo
c34b6b59ed Remove time ramp and rate adjust mod incompatibility 2019-12-11 19:48:57 +09:00
smoogipoo
404d3207ff Refactor ModNightcore/ModDaycore 2019-12-11 19:43:32 +09:00
Dan Balasescu
b77f9504d0
Merge branch 'master' into adjustable-rate-mods 2019-12-11 19:28:59 +09:00
Dan Balasescu
9963d18d17
Add whitespace 2019-12-11 19:13:04 +09:00
Dan Balasescu
e288706802
Merge branch 'master' into rankings-overlay-refactor 2019-12-11 19:09:29 +09:00
Dan Balasescu
166e957104
Merge pull request #6432 from LeNitrous/customized-mods
Add per-mod settings
2019-12-11 19:07:29 +09:00
Dean Herbert
a106e2a53f
Refactor distance snap grid to not require hitobjects (#7138)
Refactor distance snap grid to not require hitobjects
2019-12-11 19:02:29 +09:00
Dan Balasescu
900cbd7af3
Merge branch 'master' into customized-mods 2019-12-11 18:52:00 +09:00
smoogipoo
48f1dad4aa Remove abstract ScoreProcessor class 2019-12-11 17:25:06 +09:00
Huo Yaoyuan
cffeceb229 Remove unnecessary comment. 2019-12-11 16:24:22 +08:00
Huo Yaoyuan
b86a3dbfab PathStandardise -> ToStandardisedPath 2019-12-11 16:06:56 +08:00
Huo Yaoyuan
6b3c7c8421 Remove usages of FileSafety class. 2019-12-11 16:05:35 +08:00
Albie
83b2e0525e further fixes, not perfect yet 2019-12-11 07:02:51 +00:00
Dean Herbert
75f9250645 Don't automatically pause when window is inactive if in break time 2019-12-11 15:46:07 +09:00
Dean Herbert
6c8f325063 Add failing test 2019-12-11 15:46:07 +09:00
Dean Herbert
9ebad16436 Fix logic regression 2019-12-11 14:37:10 +09:00
Dean Herbert
77b9989e11 Fix some weird private field names 2019-12-11 14:10:35 +09:00
Dean Herbert
9eed64997f Merge branch 'customized-mods' into adjustable-rate-mods 2019-12-11 13:26:05 +09:00
Dean Herbert
5624b9fd3f Fix US english 2019-12-11 13:19:13 +09:00
Dean Herbert
a37af311d0 Simplify settings update logic 2019-12-11 13:19:02 +09:00
Salman Ahmed
53daa37eaa Fix failing tests 2019-12-10 23:06:13 +03:00
Albie
a61f8cc2c3
Merge branch 'master' into cinema-mod 2019-12-10 17:06:53 +00:00
Albie
6c1ae3bc8a add tests 2019-12-10 16:59:31 +00:00
Salman Ahmed
38f1a8bc17 Bind UserDimContainer.IsBreakTime from Player 2019-12-10 15:14:47 +03:00
Salman Ahmed
bb078c2afc Lighten user-dim container if on break time 2019-12-10 15:13:44 +03:00
Salman Ahmed
b93bbf81aa Add lighten background during breaks setting 2019-12-10 15:10:35 +03:00
smoogipoo
c378e525da Extract the rest of legacy enums 2019-12-10 20:23:15 +09:00
smoogipoo
3c18872a16 Extract legacy effect flags enum 2019-12-10 20:19:31 +09:00
smoogipoo
e3f925f69a Extract legacy hitobject type enum 2019-12-10 20:19:16 +09:00
smoogipoo
8012b21ffa Extract legacy sound type enum 2019-12-10 20:18:44 +09:00
Dean Herbert
138b83c9ea
Merge branch 'master' into customized-mods 2019-12-10 19:13:32 +09:00
Dean Herbert
f6c0b5c44a
Merge branch 'master' into settings-source 2019-12-10 18:49:41 +09:00
Dean Herbert
efc3b7fc9f
Merge branch 'master' into fix-settings-bindable-logic 2019-12-10 18:30:27 +09:00
Dean Herbert
55c938e5da Fix bindable usage 2019-12-10 18:08:24 +09:00
Dean Herbert
65f2d1f875 Update framework 2019-12-10 17:49:42 +09:00
Dean Herbert
f7f4a57c5f Update bindable types in line with framework 2019-12-10 16:48:24 +09:00
Dean Herbert
609c511309 Update framework 2019-12-10 16:43:58 +09:00
Dan Balasescu
bd6a08a21b
Merge branch 'master' into apply-to-track 2019-12-10 16:15:24 +09:00
smoogipoo
94a298a82d Refactor distance snap grid to not require hitobjects 2019-12-10 16:00:09 +09:00
Dean Herbert
5f3d163772
Merge branch 'master' into segmented-slider-paths-3 2019-12-10 14:28:20 +09:00
smoogipoo
ab0f2e7c6a Apply suggested refactorings 2019-12-10 13:12:54 +09:00