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

182 Commits

Author SHA1 Message Date
Dean Herbert
631d217f78 Remove no longer necessary conditional access 2021-05-28 15:42:35 +09:00
Dean Herbert
6268bbea85 Merge branch 'master' into fix-skin-sample-lookup 2021-05-28 14:47:35 +09:00
Dean Herbert
70a844ac10 Remove allowFallback parameters completely 2021-05-27 14:50:42 +09:00
Dean Herbert
342acadae2 Change LINQ query for better readability 2021-05-25 18:51:51 +09:00
Dean Herbert
5ea948aabe Bypass 640x480 coordinate space for video storyboard elements
This allows the `FillMode.Fill` to take up the full space of the
storyboard container.
2021-05-25 16:17:29 +09:00
Dean Herbert
0c55bba220 Allow storyboards to be widescreen if only a video element exists
This matches stable behaviour, which will allow videos to display
filling the screen if they are the only thing contained within the
"storyboard".
2021-05-25 16:07:19 +09:00
Dean Herbert
e3507d5453 Move DrawableStoryboard's aspect application to inside its own class 2021-05-25 16:06:39 +09:00
Dean Herbert
18779b1d1e Cache last event time value to avoid super expensive LINQ 2021-05-04 16:48:13 +09:00
Dean Herbert
bb9fa1a25e
Merge branch 'master' into play-storyboard-outro 2021-05-04 14:01:34 +09:00
smoogipoo
d28eb399a4 Fix storyboard sample lifetimes not set if seeked past 2021-04-20 17:14:48 +09:00
Salman Ahmed
f6a09be62d Add further xmldoc 2021-04-18 07:25:49 +03:00
Christine Chen
97bacbdc76 Show score after the end of the storyboard after it was toggled 2021-04-17 18:10:21 -04:00
Christine Chen
b15838b220 Move storyboard outro logic to DrawableStoryboard 2021-04-16 00:59:10 -04:00
smoogipoo
dff1d80f39 Update HasFlag usages to HasFlagFast 2021-02-25 15:38:56 +09:00
Dean Herbert
05982f42ab Add more comprehensive commenting and simplify base call logic
We can call the base method regardless for better safety. Worst case
it's just going to run `Stop()` twice anyway.
2021-02-01 16:43:54 +09:00
Mysfit
ee89aa159c Removed blank line 2021-01-26 23:12:26 -05:00
Mysfit
690feb1c1e Allow looping storyboard samples to follow the base samplePlaybackDisabled event logic. 2021-01-26 23:08:51 -05:00
Mysfit
3307e8357f DrawableStoryboardSample event method override for SamplePlaybackDisabledChanged 2021-01-26 00:36:32 -05:00
Bartłomiej Dach
b692abd3c2 Simplify condition from two to one operand 2021-01-22 20:35:34 +01:00
Mysfit
e0f8f6a23f introduce overrideable bool instead of copying event logic entirely 2021-01-22 12:09:40 -05:00
Mysfit
5b1bdfbdc5 Use callback method override 2021-01-21 20:06:24 -05:00
Mysfit
07ec0c0e0b Updated DrawableStoryboardSample to use GetBoundCopy() 2021-01-21 17:46:47 -05:00
Mysfit
b220939650 Fix storyboard samples continuing to play when the beatmap is paused or the intro is skipped. 2021-01-21 17:10:11 -05:00
Dean Herbert
a8569fe15c Fix a couple of simple cases of incorrect TextureLoaderStore initialisation 2020-12-21 13:35:46 +09:00
smoogipoo
c29ad8edf8 Better API for dealing with the contained drawable samples 2020-11-30 19:26:25 +09:00
smoogipoo
a53848ef9b Fix storyboard imlpementation 2020-11-19 22:30:41 +09:00
smoogipoo
730b14b5bb Add initial hit sample pooling 2020-11-19 19:51:09 +09:00
Bartłomiej Dach
61093030ee Remove redundant class name qualifier 2020-11-10 12:20:49 +01:00
Bartłomiej Dach
ce837eaba0 Rename variables 2020-11-10 12:20:26 +01:00
cadon0
539806e9d6 Rewrite - Add empty drawable whenever sprite not found 2020-11-10 23:52:37 +13:00
cadon0
6446074976 Fix paths for storyboard animation sprites 2020-11-10 23:52:37 +13:00
Dean Herbert
4f746792fb Fix regression causing storyboard sprites to have incorrect origin support 2020-10-23 15:46:24 +09:00
Dean Herbert
1b84402b96 Centralise and share logic for storyboard frame lookup method 2020-10-23 15:34:00 +09:00
Bartłomiej Dach
58a54c5b6c Utilise UseSkinSprites value in storyboard sprite logic 2020-10-20 23:01:25 +02:00
Bartłomiej Dach
e54836a63e Use SkinnableSprite to avoid unnecessary reloads 2020-10-20 22:49:56 +02:00
Sebastian Krajewski
f41fc71e42 Allow storyboard animations to load textures from skins 2020-10-09 18:02:21 +02:00
Sebastian Krajewski
cf76d77762 Fix osu!classic skin elements not showing up in storyboards 2020-10-09 17:34:01 +02:00
Sebastian Krajewski
e0b5ead223
Merge branch 'master' into storyboard-skin-sprites 2020-10-09 16:55:45 +02:00
Dean Herbert
367b35bb10 Merge branch 'master' into fix-storyboard-sample-pausing 2020-09-30 22:42:26 +09:00
Dean Herbert
136843c8e4 Make DrawableStoryboardSample a SkinnableSound
Allows sharing pause logic with gameplay samples.
2020-09-29 14:25:39 +09:00
Dean Herbert
69cb9f3091 Fix potential crash if disposing a DrawableStoryboardSample twice 2020-08-21 18:19:47 +09:00
Sebastian Krajewski
7cf225520f Change from BDL to Resolved 2020-08-08 02:43:39 +02:00
Sebastian Krajewski
e0ae2b3ebf Switch to SkinReloadableDrawable 2020-08-06 17:07:36 +02:00
Sebastian Krajewski
19a0eaade9 Allow storyboard sprites to load textures from skins 2020-08-06 04:41:44 +02:00
Dean Herbert
0a1e6a8273 Fix storyboard video playback when not starting at beginning of beatmap 2020-07-16 14:25:45 +09:00
Ronnie Moir
f2a48a339e Remove unused usings 2020-06-24 16:33:19 +01:00
Ronnie Moir
992ada4670 Revert UserPlaybackRate changes 2020-06-24 16:18:46 +01:00
Ronnie Moir
4c28347686 Adjust sample rate by UserPlaybackRate 2020-06-24 15:34:20 +01:00
Bartłomiej Dach
470d5bfce3 Invert if to reduce nesting 2020-06-19 20:15:14 +02:00
Bartłomiej Dach
53861cdde8 Privatise setter 2020-06-19 20:13:43 +02:00
Ronnie Moir
f04f2d2175 Add test scene 2020-06-18 21:46:32 +01:00
Ronnie Moir
9f4f3ce2cc Handle IApplicableToSample mods 2020-06-16 14:54:50 +01:00
Dean Herbert
978636b90c Fix storyboard sample playback failing when expected to play at 0ms 2020-06-15 09:38:33 +09:00
Bartłomiej Dach
2398f2e537 Expose drawable overlay layer 2020-05-19 19:47:50 +02:00
Dean Herbert
b7308f5ed4 Fix storyboard videos being offset incorrectly 2020-04-07 00:26:38 +09:00
Dean Herbert
51db361c32 Update usages of Animation and Video in line with framework changes 2020-04-03 16:00:06 +09:00
Bartłomiej Dach
522bbc1e9c Support widescreen per-layer storyboard masking 2020-03-30 21:51:39 +02: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
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
voidedWarranties
4bb15a8b93 Allow individual storyboard layers to disable masking 2020-03-23 22:51:37 -07:00
smoogipoo
424f9afbf4 Fix incorrect offset with custom clock 2020-03-11 17:55:20 +09:00
smoogipoo
ae7245a51b Refactor + fix fade in too late 2020-03-11 15:11:54 +09:00
voidedWarranties
6de244389b Use OffsetClock instead of ManualClock 2020-03-10 22:50:20 -07:00
voidedWarranties
4624582703 Revert position offset change for separate pull 2020-03-08 14:40:36 -07:00
voidedWarranties
22dd93a4f6 Code quality, read position offsets 2020-03-08 14:02:39 -07:00
voidedWarranties
48282dea8b Remove individual setting to disable videos, fix tests 2020-03-07 22:08:38 -08:00
voidedWarranties
76c832518f Render video as a part of the storyboard 2020-03-07 21:32:03 -08:00
Dean Herbert
cd5290b030 Enforce using get-only auto property where possible 2020-01-20 13:50:27 +09:00
smoogipoo
91735ff367 Update MathUtils namespace usages 2020-01-09 13:43:44 +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
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
Huo Yaoyuan
caf3f774ba CA1309: compare strings correctly. 2019-12-17 13:00:15 +08:00
Huo Yaoyuan
40a5c1fd96 Constrain transformable with class. 2019-12-09 17:45:26 +08:00
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
Dean Herbert
8d1b11d4bd Add storyboard lead-in tests 2019-11-21 18:50:54 +09:00
Huo Yaoyuan
bbeab6fa76 Use auto property. 2019-11-12 19:53:25 +08:00
Dean Herbert
4b2cb8854e Fix storyboard samples not stopping on exit 2019-09-03 19:28:10 +09:00
iiSaLMaN
7b04fb1690 StoryboardSample -> StoryboardSampleInfo 2019-08-23 14:54:39 +03:00
Dean Herbert
48716f8f2b Update framework 2019-08-21 13:29:50 +09:00
smoogipoo
93b26cd026 Reduce unnecessary allocations 2019-05-14 13:04:49 +09:00
smoogipoo
ad4b4f3422 Use nullable cancellation tokens 2019-05-10 17:42:45 +09:00
smoogipoo
d25d39b315 Add cancellation to storyboard/hitobject loading 2019-05-10 16:31:09 +09:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert
92184adef5 Add stable sorting of storyboard elements 2019-03-26 16:37:52 +09:00
David Zhao
acc133896b Correct null check 2019-03-18 18:19:59 +09:00
David Zhao
05147768d3 Permit nulls 2019-03-18 15:50:34 +09:00
David Zhao
6a26972284 DI gameplay clock for Storyboards 2019-03-18 15:25:54 +09:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
smoogipoo
a07d797d75 Merge remote-tracking branch 'Joehuu/master' into use-lifetime-optimization 2019-02-27 12:08:43 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
Dan Balasescu
c9c8cccd68
Merge branch 'master' into use-lifetime-optimization 2019-02-18 15:22:34 +09:00
Dean Herbert
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
ekrctb
504e79b968 Merge branch 'master' into use-lifetime-optimization 2019-01-29 12:15:02 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Roman Kapustin
4b5fc85875 Use Find instead of FirstOrDefault 2019-01-05 19:35:33 +03:00
ekrctb
6f8a2e6ff2 Use LifetimeManagementContainer
This is a significant performance boost for gameplay,
especially for long or stroyboard-heavy maps.
2018-12-13 15:23:06 +09:00