1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 02:22:56 +08:00
Commit Graph

17792 Commits

Author SHA1 Message Date
smoogipoo
d90db5649d Improve comment slightly 2020-04-03 18:32:07 +09:00
Dean Herbert
fd9d4a8d32 Update resources 2020-04-03 18:29:32 +09:00
smoogipoo
1ff2cc31d1 Implement more familiar scroll speed options in mania 2020-04-03 18:25:01 +09:00
smoogipoo
b1268a73f1 Add keybinding repeat extension method 2020-04-03 18:15:24 +09:00
Dean Herbert
51db361c32 Update usages of Animation and Video in line with framework changes 2020-04-03 16:00:06 +09:00
smoogipoo
b42d1104b7 Fix mania converts scrolling at incorrect speeds 2020-04-03 13:16:01 +09:00
smoogipoo
1f797207f7 Rework lookups to not require total playfield columns 2020-04-03 12:31:05 +09:00
Will Kennedy
57944bd335 fix(?) InspectCode warnings 2020-04-02 21:36:31 -04:00
Will Kennedy
c042e709a5 Fix GetDecoder getting fallback decoder too often 2020-04-02 20:43:54 -04:00
smoogipoo
24a7b5f0d6 Fix missing comma 2020-04-02 23:59:53 +09:00
Dean Herbert
f919a2f267
Merge branch 'master' into mania-hitexplosion-skinning 2020-04-02 23:57:03 +09:00
Dean Herbert
c35dd0153d
Merge branch 'master' into mania-column-line-colour 2020-04-02 23:03:22 +09:00
smoogipoo
2a6c0de225 Add frameLength parameter to GetAnimation 2020-04-02 22:56:30 +09:00
Dean Herbert
23b53bee56 Update resources 2020-04-02 22:05:32 +09:00
Dean Herbert
8f2a3578bd Merge branch 'master' into mania-hitexplosion-skinning 2020-04-02 21:59:01 +09:00
Dean Herbert
a6d6bab0cc Update framework 2020-04-02 21:21:29 +09:00
Dean Herbert
c18248c827 Fix crash caused by user json order changing 2020-04-02 18:46:09 +09:00
smoogipoo
62f1bc276d Add skinning support for column line colour 2020-04-02 18:10:17 +09:00
smoogipoo
a77933f5e0 Add support for parsing mania skin colours 2020-04-02 17:56:12 +09:00
smoogipoo
fa3a449c3b Implement legacy normal hit explosions 2020-04-02 14:37:29 +09:00
smoogipoo
b375a02cff Cleanup positioning factor definition 2020-04-02 14:37:29 +09:00
smoogipoo
beb1f037e9 Add startAtCurrentTime parameter to GetAnimation() 2020-04-02 14:33:15 +09:00
Dean Herbert
a76428f965 Move lookup to own function 2020-04-01 23:46:50 +09:00
Dean Herbert
c2c7ff7334 Add temporary logic to LegacySkin 2020-04-01 23:32:48 +09:00
Dean Herbert
4d8b6c47cc Update framework 2020-04-01 21:23:43 +09:00
smoogipoo
ff2c5b446e Fix column lights positioned incorrectly 2020-04-01 16:06:09 +09:00
smoogipoo
2d6d1a8cc6 Implement column width and column spacing 2020-04-01 13:38:03 +09:00
smoogipoo
66486b094c Remove unnecessary dependency, allow null mods 2020-04-01 13:31:17 +09:00
杜Nate
9d9780707d
Merge branch 'master' into mania-skinning-refactor 2020-04-01 10:27:40 +08:00
Dean Herbert
3454983d7a
Merge branch 'master' into mania-hold-note-skinning 2020-04-01 00:04:49 +09:00
Dean Herbert
1e88d3c17a Merge conflict "resolution" 2020-03-31 23:36:06 +09:00
Andrei Zavatski
e26fbd5ed8 Remove overcomplicated stuff 2020-03-31 13:45:59 +03:00
Andrei Zavatski
fd8d4cf23b Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-scroll-container 2020-03-31 13:33:27 +03:00
Dean Herbert
da129ddf6a
Merge pull request #8513 from smoogipoo/mania-skinning-testability
Implement basis for mania skinning
2020-03-31 19:03:18 +09:00
mcendu
c0f8c1dc28
rename variable used for mania lookup key storage 2020-03-31 17:22:46 +08:00
Dean Herbert
f2416f15a3
Merge pull request #8509 from bdach/fix-widescreen-storyboards
Support widescreen per-layer storyboard masking
2020-03-31 17:47:42 +09:00
Dean Herbert
9602ab17b0 Fix replay imports failing for certain mod combinations 2020-03-31 17:13:42 +09:00
smoogipoo
1952fcc0ce Implement mania hold note skinning 2020-03-31 16:42:35 +09:00
smoogipoo
c4f76ffdaf Implement mania note skinning 2020-03-31 15:29:25 +09:00
smoogipoo
b926d570ee Allow skinnabledrawable to be auto-sized 2020-03-31 15:28:50 +09:00
Dean Herbert
2109c98481
Merge branch 'master' into fix-widescreen-storyboards 2020-03-31 15:28:22 +09:00
smoogipoo
211a8db4c5 Merge branch 'mania-key-area-skinning' into mania-note-skinning 2020-03-31 15:23:59 +09:00
smoogipoo
538dc0c558 Merge branch 'mania-hitobject-area-skinning' into mania-note-skinning 2020-03-31 15:20:56 +09:00
smoogipoo
1a858c602a Merge branch 'mania-column-background-skinning' into mania-note-skinning 2020-03-31 15:20:14 +09:00
smoogipoo
4b05f7ff27 Merge branch 'mania-skinning-testability' into mania-key-area-skinning 2020-03-31 15:11:32 +09:00
Dean Herbert
877d5849bb
Merge branch 'master' into mania-skinning-testability 2020-03-31 15:09:11 +09:00
smoogipoo
71387016b2 Add missing judgement line 2020-03-31 12:26:31 +09:00
smoogipoo
02237133cb Implement mania hit target skinning 2020-03-31 12:17:44 +09:00
smoogipoo
cb1513b374 Add mania key area skinning 2020-03-31 11:23:33 +09:00
smoogipoo
44727eb2b8 Implement column background skinning 2020-03-31 10:57:56 +09:00
smoogipoo
2b5e9885f6 Implement mania skin reading functionality 2020-03-31 10:55:58 +09:00
Dan Balasescu
e0a876ceaf
Merge pull request #8494 from peppy/fix-invalid-set-ids-on-import
Fix imports with no matching beatmap IDs still retaining a potentially invalid set ID
2020-03-31 10:42:58 +09:00
smoogipoo
f6f5de7ad1 Allow LineBufferedReader to keep underlying stream open 2020-03-31 10:13:50 +09:00
Bartłomiej Dach
522bbc1e9c Support widescreen per-layer storyboard masking 2020-03-30 21:51:39 +02:00
smoogipoo
a8f7d7ea42 Add structure for mania configuration lookups 2020-03-30 23:21:40 +09:00
Dan Balasescu
250bdbef6b
Merge branch 'master' into dont-retry-on-replay-results 2020-03-30 22:30:15 +09:00
Dan Balasescu
8964001423
Merge branch 'master' into fix-invalid-set-ids-on-import 2020-03-30 22:24:12 +09:00
Andrei Zavatski
179bd1ce7e Fix failing test 2020-03-30 13:38:04 +03:00
Andrei Zavatski
2dc81bbcfa Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-scroll-container 2020-03-30 13:37:25 +03:00
Dean Herbert
0d4830550e Fix tooltips not showing inside ManualInputManagerTestScenes 2020-03-30 19:15:44 +09:00
Dean Herbert
113660b621 Merge if statements 2020-03-30 18:56:35 +09:00
Dean Herbert
ec18fe1f9f Merge branch 'master' into dont-retry-on-replay-results 2020-03-30 18:56:00 +09:00
smoogipoo
881ec146af Ignore duplicate configs 2020-03-30 17:36:57 +09:00
smoogipoo
4719aac235 Add basic mania skin parsing 2020-03-30 17:18:09 +09:00
Dean Herbert
812583a4cd Remove stray newline 2020-03-30 16:17:42 +09:00
Dean Herbert
f71c8cb30f Only drop online set ID if beatmap IDs were stripped in online retrieval 2020-03-30 15:07:56 +09:00
Dean Herbert
7ecce713bb Keep provided IDs where possible if not online 2020-03-30 15:07:39 +09:00
Dan Balasescu
03cd9aa060
Merge branch 'master' into spun-out 2020-03-30 12:31:53 +09:00
Dean Herbert
7db9bd798c Remove handle overrides 2020-03-30 11:59:51 +09:00
Dean Herbert
09d860d5f5 Fix imports with no matching beatmap IDs still retaining a potentially invalid set ID 2020-03-30 11:52:25 +09:00
Dan Balasescu
ea1a2e1955
Merge branch 'master' into dont-retry-on-replay-results 2020-03-30 11:01:25 +09:00
Dan Balasescu
113bbe8c4d
Merge pull request #8488 from peppy/fix-autoplay-results-display
Fix auto mod results screen not displaying correctly
2020-03-30 11:01:16 +09:00
Dean Herbert
bac5f79731
Merge branch 'master' into rewrite-select-next 2020-03-30 00:08:06 +09:00
Dean Herbert
b47a532df3 Adjust code formatting slightly 2020-03-30 00:07:48 +09:00
Dean Herbert
6e68b968f8 Hide "retry" button on results screen after watching a replay 2020-03-29 23:52:50 +09:00
Dean Herbert
66a990cd5e Remove redundant this 2020-03-29 23:50:16 +09:00
Dean Herbert
653480b2f8 Add regression test 2020-03-29 23:29:46 +09:00
Dean Herbert
4f5557096c Fix auto mod results not displaying correctly 2020-03-29 22:51:28 +09:00
Dean Herbert
2abb8a37df
Merge branch 'master' into show-mod-settings-tooltip 2020-03-29 14:35:04 +09:00
Dean Herbert
a2b3fe180e Add the ability to disable user input on specific DrawableHitObjects 2020-03-29 14:30:45 +09:00
Endrik Tombak
b4f0500706 Invert logic 2020-03-28 20:21:21 +02:00
Endrik
2c27894527
Use All instead of ToList Any
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-28 19:58:33 +02:00
Santeri Nogelainen
6bde102207 Merge remote-tracking branch 'upstream/master' 2020-03-28 18:14:17 +02:00
Santeri Nogelainen
faa2b49be4 Fix namespace for CarouselBeatmapRank, make UpdateableRank in TopLocalRank readonly 2020-03-28 18:13:39 +02:00
Santeri Nogelainen
1c711147f3 Move all carousel rank logic into separate classes (TopLocalRank and CarouselBeatmapRank) 2020-03-28 17:22:01 +02:00
Endrik Tombak
87854fc4fa Rename variable 2020-03-28 13:23:31 +02:00
Endrik Tombak
6a0c5c87aa Use already existing variable 2020-03-28 13:06:03 +02:00
Endrik Tombak
fc3f9ff6fa Don't use drawables for select next 2020-03-28 12:54:48 +02:00
Dean Herbert
3cc574e62d
Merge branch 'master' into overlay-scroll-container 2020-03-28 16:46:01 +09:00
Dean Herbert
944926e950
Merge branch 'master' into fix-break-overlay-z-order 2020-03-28 13:04:19 +09:00
Dean Herbert
a317ef65b8 Remove default for argument 2020-03-28 12:18:28 +09:00
Bartłomiej Dach
3a3bfe9a5e Reorder children to fix pause overlay z-order 2020-03-27 21:19:49 +01:00
Bartłomiej Dach
adc759771f Hook up score processor in player 2020-03-27 19:47:42 +01:00
Andrei Zavatski
7b24cc325f Implement OverlayScrollContainer component 2020-03-27 20:57:57 +03:00
Dean Herbert
4f77850790
Merge pull request #8467 from peppy/update-framework
Update framework
2020-03-27 21:22:39 +09:00
Dean Herbert
6ecfeb8cc3
Merge pull request #8455 from Game4all/handle-novideo-beatmaps
Fix NullReferenceException when starting the no-video version of a beatmap with video
2020-03-27 21:12:40 +09:00
Dean Herbert
5be8934c8c
Merge pull request #8407 from peppy/disable-raw-input
Disable raw input toggle on all but windows
2020-03-27 21:10:02 +09:00
Dean Herbert
f25b1b33e3
Merge pull request #8461 from peppy/fix-minia-mod-replay-recording
Fix osu!mania replays recording incorrectly when key mod applied
2020-03-27 20:55:58 +09:00
Dean Herbert
4106700771 Update framework 2020-03-27 20:51:44 +09:00
Dan Balasescu
5e1cb0e9e9
Merge branch 'master' into fix-minia-mod-replay-recording 2020-03-27 19:26:41 +09:00
Dan Balasescu
005a818f32
Merge branch 'master' into fix-slider-end-sounds 2020-03-27 19:26:32 +09:00
Dean Herbert
f75c082601 Fix osu!mania replays recording incorrectly when key mod applied 2020-03-27 15:50:11 +09:00
TheWildTree
83410315c6 Make fields private 2020-03-26 17:18:01 +01:00
Lucas A
01c9112f82 Add a null check to prevent NRE when playing the "no video" version of a beatmap. 2020-03-26 17:09:22 +01:00
TheWildTree
543f584595 Adjust user profile tabs 2020-03-26 16:44:46 +01:00
TheWildTree
9a30ff5a00 Fix code quality issues 2020-03-26 16:11:58 +01:00
TheWildTree
da996ffe74 Update header breadcrumb tab control 2020-03-26 15:44:53 +01:00
TheWildTree
46ebf6ef78 Update user profile section tabs and rename classes for better readibility 2020-03-26 15:44:22 +01:00
TheWildTree
816418742e Update header tab control 2020-03-26 15:43:48 +01:00
TheWildTree
e33055e2c4 Simplify active tab font changes and expose necessary fields in OsuTabItem 2020-03-26 14:19:36 +01:00
Dean Herbert
f80efd10c2 Avoid using a miss judgement 2020-03-26 19:54:17 +09:00
Dean Herbert
07462120e4 Split break tracking into its own component 2020-03-26 15:30:23 +09:00
Dean Herbert
d372ddaadd Move break overlay to a location it is not affected by gameplay scale 2020-03-26 12:50:18 +09:00
Dean Herbert
2b1245f63a Improve xmldoc in a couple of places 2020-03-26 12:50:00 +09:00
Andrei Zavatski
454e402e88 Fix last seen message has been visible when it shouldn't 2020-03-25 21:02:45 +03:00
Andrei Zavatski
1e025b7c31 Add tests to cover the issue 2020-03-25 20:58:51 +03:00
Dean Herbert
8a2aac5f83 Rename conversion methods for clarity 2020-03-25 20:21:34 +09:00
Dean Herbert
800e395bc8 Merge branch 'master' into replay-recording 2020-03-25 20:20:59 +09:00
Dan Balasescu
e7f32d951d
Merge pull request #8431 from peppy/fix-intro-tests
Fix intro tests not asserting pass or working at all
2020-03-25 19:25:26 +09:00
Dan Balasescu
791bf95396
Merge pull request #8433 from peppy/fix-song-select-looping
Fix track looping state not being reset when entering editor from song select
2020-03-25 19:21:18 +09:00
Dean Herbert
b1d4261402 Fix track looping state not being reset when entering editor from song select
Closes #8432.
2020-03-25 15:50:19 +09:00
Dean Herbert
880d138a47 Fix intro tests not asserting pass or working at all 2020-03-25 15:12:19 +09:00
Dean Herbert
87db1ba487 Remove unused text transform helpers 2020-03-25 14:58:49 +09:00
voidedWarranties
b8f20831a1 Video no longer modifies storyboard resolution 2020-03-24 20:04:09 -07:00
Dean Herbert
f2e0fba164 Remove VideoFile from BeatmapMetadata
Leaving in database because it's a pain to drop columns.
2020-03-25 12:00:02 +09:00
Dean Herbert
6d81da5419
Merge branch 'master' into video-offset 2020-03-25 11:28:59 +09:00
Dean Herbert
368bf58521 Rename and make fields readonly 2020-03-25 11:08:08 +09:00
Dean Herbert
971249338d
Merge branch 'master' into storyboard-masking 2020-03-25 11:05:40 +09:00
TheWildTree
05de65937b Update ruleset selector design 2020-03-24 22:14:15 +01:00
TheWildTree
a5781d7fc5 Replace ScreenTitle with OverlayTitle and update titles to match new design 2020-03-24 22:08:20 +01:00
TheWildTree
127c16fccd Implement OverlayTitle component 2020-03-24 22:03:38 +01:00
TheWildTree
e85f45f911 Move old ScreenTitle to MultiHeaderTitle 2020-03-24 22:03:16 +01:00
Dean Herbert
7818251c3e
Merge pull request #8406 from smoogipoo/taiko-random-mod
Implement random mod for taiko
2020-03-24 17:11:49 +09:00
Dean Herbert
4070b2b75f Merge branch 'basic-replay-recorder' into replay-recording 2020-03-24 16:31:14 +09:00
Dean Herbert
cc1863ca3d
Merge branch 'master' into basic-replay-recorder 2020-03-24 16:26:13 +09:00
Dean Herbert
2735a2250c Move replay recorder to final location 2020-03-24 15:49:52 +09:00
Dean Herbert
a7bfaad60f More correctly handle rulesets which don't support replay recording 2020-03-24 15:44:39 +09:00
Dean Herbert
2feb66d423 Correctly handle missing positional data 2020-03-24 15:43:34 +09:00
Dean Herbert
02a3c7c025 Fix incorrect ruleset being recorded to file 2020-03-24 15:43:22 +09:00
Dean Herbert
448961b330 Rename incorrect variable 2020-03-24 15:39:01 +09:00
Dean Herbert
388cf5c83a Fix catch positional data being incorrectly recorded 2020-03-24 15:38:54 +09:00
Dean Herbert
022465f546 Add encoding and import support 2020-03-24 14:51:52 +09:00
voidedWarranties
4bb15a8b93 Allow individual storyboard layers to disable masking 2020-03-23 22:51:37 -07:00
Dean Herbert
68ebe98fde Remove unused GetUnderlyingStream method 2020-03-24 14:08:25 +09:00
Dean Herbert
2a1e7a7ff0
Merge branch 'master' into fix-select-filter-not-absorbing-input 2020-03-24 14:03:58 +09:00
Dan Balasescu
6279c78e3c
Merge branch 'master' into fix-keypad-autoplay-shortcut 2020-03-24 13:34:31 +09:00
Dean Herbert
546772192c Add helper method to convert to legacy mods enums 2020-03-24 13:07:51 +09:00
Dean Herbert
e5f4d8686e Rename decoder 2020-03-24 13:07:50 +09:00
Dan Balasescu
d574fabf7d
Merge branch 'master' into fix-song-select-play-crash 2020-03-24 12:54:10 +09:00
Joehu
5bc5119389 Handle OnHover on song select filter and footer 2020-03-23 16:03:33 -07:00