1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 19:37:51 +08:00
Commit Graph

139 Commits

Author SHA1 Message Date
smoogipoo
199710b941 Implement equality comparers for HitSampleInfo 2020-12-01 16:04:08 +09:00
smoogipoo
5760e1c1fc Make HitSampleInfo immutable 2020-12-01 15:37:51 +09:00
smoogipoo
730b14b5bb Add initial hit sample pooling 2020-11-19 19:51:09 +09:00
Dean Herbert
199043f677 Allow preview tracks to exist without an owner (without hard crashing) 2020-11-15 13:21:09 +09:00
Dean Herbert
0b28cca7e6 Don't force Gameplay prefix on all skin sample lookups 2020-10-30 11:59:40 +09:00
Dean Herbert
c9a85587fb Allow SampleInfo to specify fallback sample lookup names 2020-10-30 11:59:29 +09:00
Dean Herbert
b8e9f19b92 Move common HitSampleInfo lookup to static method 2020-09-25 17:30:31 +09:00
recapitalverb
c753cb46c5 Use [Resolved] wherever possible 2020-02-14 20:14:00 +07:00
Dean Herbert
740bdee125 Apply remaining uncaught changes 2020-01-20 23:59:21 +09:00
smoogipoo
0f8a76afde Remove manual hitobject sample namespacing 2020-01-02 14:27:27 +09:00
Dean Herbert
cf0f0f8a1b Reword comment 2019-11-21 10:37:50 +09:00
iiSaLMaN
d2ce0878bc Change 'current' accessibility to protected 2019-11-14 14:20:29 +03:00
iiSaLMaN
4e79bbad6b Add inline comment 2019-11-14 14:19:42 +03:00
iiSaLMaN
172e777416 Fix preview track manager permanently muting game tracks 2019-11-13 16:16:06 +03:00
iiSaLMaN
47cbd516f3 Revert "Fix preview track manager potentially not updating"
This reverts commit 8f7fd9993d.
2019-11-13 16:11:13 +03:00
iiSaLMaN
8f7fd9993d Fix preview track manager potentially not updating 2019-11-13 14:24:22 +03:00
Dean Herbert
47be20fa37 Private set on track for safety 2019-11-12 15:13:47 +09:00
iiSaLMaN
6d3d7c5d95 Remove unnecessary use of local 2019-11-11 11:57:14 +03:00
iiSaLMaN
8f4916ad2d Add inline comment 2019-11-10 23:53:31 +03:00
iiSaLMaN
9d61d73ced Change Track and TrackManagerPreviewTrack accessibilities 2019-11-10 23:09:04 +03:00
iiSaLMaN
20ed6c4d52 Use track check solution for this 2019-11-10 23:07:51 +03:00
iiSaLMaN
8ef9ccc39e Schedule new track assignment after stopping current track 2019-11-08 13:19:06 +03:00
Dean Herbert
91bcb5d4a7 Merge remote-tracking branch 'upstream/master' into fix-network-stalls 2019-11-06 19:06:28 +09:00
Dean Herbert
c1a6cb1def Fix audio preview muting game audio indefinitely when beatmap panel is off-screen 2019-11-06 15:58:47 +09:00
Dean Herbert
ddd58ea3da Use LongRunningLoad on network load components 2019-11-01 19:40:45 +09:00
Dean Herbert
60ea3d4e1a Fix skinning support for combobreak 2019-06-30 21:58:30 +09:00
Joehu
36f59ec86d Remove unused using 2019-06-21 08:29:45 -07:00
Joehu
74e99b2915 Remove unused parameter 2019-06-21 08:11:10 -07:00
Joehu
1d6b6a7828 Fix audio being dimmed on preview tracks 2019-06-21 08:06:57 -07:00
Dean Herbert
9f740f69bb Fix preview tracks muting themselves
Closes #4937
2019-06-07 11:21:10 +09:00
Dean Herbert
08ab1e5df7 Use new ITrackStore interface 2019-05-29 16:43:15 +09:00
Dean Herbert
a20eda7b5f Fix remaining cases to work without things 2019-05-28 23:54:42 +09:00
Dean Herbert
4ca34bd5e8 Update osu! in line with audio subsystem refactor 2019-05-28 17:06:01 +09:00
Dean Herbert
372c5b081c Fix audio preview buttons not correctly handling load failure states
Closes #4593.
2019-05-23 12:07:49 +09:00
smoogipoo
0bd35ab7bb Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Dean Herbert
c8793911a8 Enable more stringent inspectcode style inspections 2019-02-27 21:25:40 +09:00
smoogipoo
30815ace62 Fix crossthread operations due to Track.Completed 2019-02-27 16:52:34 +09:00
Roman Kapustin
8b4aa708fa Resolve merge conflict 2019-02-22 23:04:45 +03:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
Roman Kapustin
71efbcf603 Merge remote-tracking branch 'ppy/master' into notify_track_completion_failure 2019-02-03 16:14:04 +03:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Roman Kapustin
befe57e12e Stop PreviewTrack on Completed event 2018-11-17 15:23:52 +03:00
Dean Herbert
14c3cc70b1
Prefer namespace lookups first 2018-07-10 15:23:47 +09:00
Dean Herbert
ba258b8a05 Fix lack of fallback logic for custom bank samples
Closes #2966.

---

Was causing some beatmaps to not play all of their hitsounds
2018-07-10 02:56:22 +09:00
Dean Herbert
8f04acc506 Add missing xmldoc 2018-07-05 20:16:55 +09:00
smoogipoo
189194ee8d Don't include empty namespace in sample lookup 2018-07-02 14:35:03 +09:00
smoogipoo
310c4a7d6c Make SampleInfo choose its own lookup name 2018-07-02 14:18:41 +09:00
smoogipoo
8b0c6a4c85 Make SampleControlPoint clone the existing SampleInfo 2018-07-02 14:17:19 +09:00
Dean Herbert
73e13e2d63 Rename Stop to StopAnyPlaying for clarity 2018-06-22 12:35:43 +09:00
Dean Herbert
4b2b1f51f9 Apply some code review 2018-06-22 12:33:30 +09:00
smoogipoo
1932399521 Add testcases 2018-06-21 19:31:07 +09:00
smoogipoo
63a6fc2596 XMLDoc all the things 2018-06-21 18:54:50 +09:00
smoogipoo
b2066c5d73 Rework preview tracks to reduce usage complexities 2018-06-21 18:40:27 +09:00
Roman Kapustin
9b69e1825d Make PreviewTrack.owner private 2018-06-02 22:06:45 +03:00
Roman Kapustin
330ce19041 Make PreviewTrack a component and use LoadComponentAsync 2018-06-01 23:36:25 +03:00
Roman Kapustin
5566732664 Get rid of PreviewTrackManager.onTrackStart and PreviewTrackManager.onTrackStop delegates 2018-06-01 21:36:30 +03:00
Roman Kapustin
88ac427ba6 PreviewTrack.Owner 2018-06-01 21:06:37 +03:00
Roman Kapustin
a24589f583 Cleanup external PlayButton.Playing usage 2018-05-25 22:35:15 +03:00
Roman Kapustin
498244a308 Introduce PreviewTrack class 2018-05-25 00:37:53 +03:00
Roman Kapustin
ad50f7faf1 Make PreviewTrackManager a Component in order to use DI 2018-05-09 14:51:04 +03:00
Roman Kapustin
7cffabf7f9 Introduce PreviewTrackManager 2018-05-08 22:55:48 +03:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
Dean Herbert
768e0a4e2a Add SkinnableSound class
Tidy things up, move logic out of SampleInfo.
2018-02-24 22:47:14 +09:00
Dean Herbert
6ceabfe19e Add basic hitsound skinning 2018-02-23 13:38:12 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
Dean Herbert
4e6988d21b As it turns out, native directory separators are not supported 2017-12-28 01:05:50 +09:00
Dean Herbert
3f73a9a693 Add better sample fallback logic
Also adds support for null channels at InputDrum level.
2017-12-27 21:44:04 +09:00
Dean Herbert
46ef17354e Simplify path construction 2017-12-27 21:05:16 +09:00
smoogipoo
9690591593 Make taiko use namespaced hitsounds
This is a temporary solution for now that uses DrawableHitObject.SampleNamespace for the override. We will not want to do this going forward, and instead have the rulesets add their custom resource stores to the games', but that requires deciding where/when to apply/remove such resource stores, and is probably left to skinning.
2017-12-26 19:55:56 +09:00
smoogipoo
d288d8a51f Remove SampleInfoList 2017-12-25 15:40:01 +09:00
Dean Herbert
2db68df999 Simplify DrawableHitObject's sample load code 2017-12-23 17:20:14 +09:00
Dean Herbert
9ca03c0209 Simplify and tidy sample retrieval
Less static weirdness
2017-12-23 16:46:02 +09:00
Dean Herbert
5026c7a95e SoundControlPoint -> SampleControlPoint 2017-12-23 16:34:34 +09:00
Dean Herbert
46865bbacd Merge remote-tracking branch 'upstream/master' into taiko-hitsounds-fix
# Conflicts:
#	osu.Game/Audio/SampleInfo.cs
2017-12-23 14:50:35 +09:00
smoogipoo
a3fcc0b60c Back to using SortedLists 2017-12-21 19:40:41 +09:00
smoogipoo
cb7e192aff Determine SampleInfo defaults in DrawableHitObject 2017-12-21 16:02:33 +09:00
FreezyLemon
4b3cf0773d Various CI adjustments 2017-12-08 09:52:58 +01:00
FreezyLemon
61a6a2919e Fixed multiple critical bugs and changed allSamples to a normal Dictionary for faster access 2017-12-08 09:41:13 +01:00
FreezyLemon
d2f3d5a807 Added basic SampleInfo.FromSoundPoint and GetChannel methods 2017-12-07 23:09:51 +01:00
smoogipoo
851c20aff0 Add a few comments 2017-12-07 11:17:32 +09:00
smoogipoo
ea2c67ca5f Fix incorrect serialization condition 2017-12-07 11:10:46 +09:00
smoogipoo
41b607c165 Dont serialize hitobject sample properties copied from the control point 2017-12-07 03:40:43 +09:00
Huo Yaoyuan
345f80b775 Simplify constructor of SampleInfoList. 2017-05-08 19:30:55 +08:00
smoogipooo
4c2985b6d1 Use CRLF instead of LF. 2017-04-26 14:40:40 +09:00
smoogipooo
28f7e0cdba Introduce SampleInfoList as List<SampleInfo> to reduce generic nesting. Fix CI warnings. 2017-04-26 14:12:21 +09:00
smoogipooo
4cc309e5a7 Make hit sounds into consts. 2017-04-06 12:14:06 +09:00
smoogipooo
c65ab5b6f1 General cleanup. 2017-04-06 11:56:19 +09:00
smoogipooo
eb82a4c090 Back to using SampleInfo + fix taiko beatmap conversion. 2017-04-06 11:41:16 +09:00