Admin/wwdpublic
1
0
Fork 0
mirror of https://github.com/WWhiteDreamProject/wwdpublic.git synced 2026-04-27 02:27:46 +03:00
Code Issues Packages Projects Releases Wiki Activity
24,576 Commits 1 Branch 0 Tags
98bfbde6c2fc3ccdaa4dfd220e92ac4b0d5fd8fd
Commit Graph

83 Commits

Author SHA1 Message Date
VMSolidus
4634419935 Update Submodule to 217.2.1 (#534) 
Ready to Merge Now
(I had to go to 217.2.1 because the prior versions of 217.0.0 weren't
viable)

Includes the following Cherry-Picks:
https://github.com/space-wizards/space-station-14/pull/26387
https://github.com/space-wizards/space-station-14/pull/25963

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-07-11 17:25:06 -07:00
SimpleStation14
f14800abe5 Mirror: fix: ambient music fade in (#25874) (#137) 
## Mirror of PR #25969: [fix: ambient music fade in
(#25874)](https://github.com/space-wizards/space-station-14/pull/25969)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `e47f84568eec53efd66fca6e79d8c594a508cf3c`

PR opened by <img
src="https://avatars.githubusercontent.com/u/82627200?v=4"
width="16"/><a href="https://github.com/Kokoc9n"> Kokoc9n</a> at
2024-03-10 16:26:28 UTC
PR merged by <img
src="https://avatars.githubusercontent.com/u/19864447?v=4"
width="16"/><a href="https://github.com/web-flow"> web-flow</a> at
2024-03-10 17:08:05 UTC

---

PR changed 1 files with 3 additions and 3 deletions.

The PR had the following labels:


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> ## About the PR
> <!-- What did you change in this PR? -->
> Ambient music  volume now set to ambient music volume slider.
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> Space ambience tracks being super loud #25874.
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
> FadeIn and UpdateFades now get correct values instead of blasting
music on maximum volume.
> ## Media
> <!-- 
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
> 
> If you're unsure whether your PR will require media, ask a maintainer.
> 
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
> 
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> Before:
>
https://github.com/space-wizards/space-station-14/assets/82627200/8a2ab0c5-d3ae-4cb5-85d8-97703ecdb52a
> After:
>
https://github.com/space-wizards/space-station-14/assets/82627200/2b364261-b267-4bad-ab3e-10d389df6eb4


</details>

Co-authored-by: Gregg <82627200+Kokoc9n@users.noreply.github.com>
 2024-05-04 19:43:30 -04:00
Fildrance
426b208c1d fix: lobby music volume will be changed on options change without restart (also lobby music not looped anymore) (#25530) 
* fix: lobby music volume will be changed on options change without restart (also lobby music not looped anymore)

* refactor: now lobby music is part of ContentAudioSystem. Lobby playlist is used instead of single track. Client now selects next lobby soundtrack after previous finished.

* refactor: incapsulated info on current lobby track in simple record

* refactor: fixed inconsistent naming between song and soundtrack for lobbymusic

* refactor: xml-doc for LobbyPlaylistChangedEvent

* fix: inverted invalid _audio.PlayGlobal check to return only if lobby soundtrack play call failed

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
(cherry picked from commit 4c87dcd3cb92855df1fa01dea52d2ddd09f2adce)
 2024-03-07 01:18:33 +01:00
Pieter-Jan Briers
ccea85136b Random spontaneous cleanup PR (#25131) 
* Use new Subs.CVar helper

Removes manual config OnValueChanged calls, removes need to remember to manually unsubscribe.

This both reduces boilerplate and fixes many issues where subscriptions weren't removed on entity system shutdown.

* Fix a bunch of warnings

* More warning fixes

* Use new DateTime serializer to get rid of ISerializationHooks in changelog code.

* Get rid of some more ISerializationHooks for enums

* And a little more

* Apply suggestions from code review

Co-authored-by: 0x6273 <0x40@keemail.me>

---------

Co-authored-by: 0x6273 <0x40@keemail.me>
(cherry picked from commit 68ce53ae17985876d6d112b764b2144964a9f42e)
 2024-02-18 23:02:29 +01:00
nikthechampiongr
c3629bc043 Fix end of round messages looping forever (#24920) 
* Fix End of Round messages looping forever and ever and ever

* Use the correct setting for round restart sounds

(cherry picked from commit 09daa534bd32d4784b6dd88ac6877607efec17b8)
 2024-02-08 12:32:25 +01:00
Hannah Giovanna Dawson
29e65fd324 Actually fix round restart audio this time (#24754) 
In which I'm a goober and don't clean up after
myself and accientally don't fix the issue I tried
to fix in my last round restart PR.

The audio is now maintained just like music during
restarts (yippee to ContentAudioSystem::OnRoundRestart)

This needs a refactor but at least the defect is fixed now.

(cherry picked from commit 2e7d23674ed315aa3cd36e5a744008900474c3fd)
 2024-02-08 12:31:24 +01:00
metalgearsloth
3254acd8e7 Fix some test warnings (#24324) 
Extracted from smug's pr.

(cherry picked from commit 4a13dbea76e8e6061274537c7063c6915429d38a)
 2024-01-26 23:16:18 +01:00
Hannah Giovanna Dawson
0ce2cb5b29 Fixes round restart audio clipping (#24044) 
* Fix round end audio clipping

* weh

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 5af1d0ea8b5a54cd1f1b48308176318032a457ea)
 2024-01-26 23:13:43 +01:00
metalgearsloth
627746fb30 Fix audio fades (#23684) 
Audio refactor casualty

(cherry picked from commit bc07cbc97ce365dde83ee4e5b32a4ffa603b1d5e)
 2024-01-26 22:07:35 +01:00
metalgearsloth
6cfbdc6a4e Add UI click sounds (#22410) 
* Add UI click sounds

* tweaks

* Significant cleanup

* Audio options and numerous fixes

* Fix the remaining UI elements

* new click sound

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
(cherry picked from commit 4023134cf0536d36dd1d685189e8b1ee6c004d81)
 2024-01-22 20:59:16 +01:00
Leon Friedrich
8494bd0885 Use ECS prototype-reload events (#22613) 
* Use ECS prototype-reload events

* better constructors

* Maybe this fixes tests?
 2023-12-22 23:25:35 +01:00
metalgearsloth
89416b9bdf Audio fixes (#22324) 2023-12-16 19:48:34 +01:00
metalgearsloth
5b1081905c Add audio multipliers back (#22260) 2023-12-16 19:36:16 +01:00
metalgearsloth
d864ad7de8 Make audio sliders use gain not volume (#21984) 2023-12-16 19:36:15 +01:00
metalgearsloth
d708bbd97b Fix ambient audio (#21933) 2023-12-02 20:22:08 +01:00
metalgearsloth
b1ee2d48ff Unrevert audio (#21330) 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
 2023-12-02 20:16:36 +01:00
DrSmugleaf
9cc8a7fc81 Remove 700 usages of Component.Owner (#21100) 2023-10-20 15:31:13 +02:00
metalgearsloth
4cfc578011 Revert "Remove most usages of obsolete TransformComponent methods (#1… (#19714) 2023-09-01 12:30:29 +10:00
Visne
1416942bea Remove most usages of obsolete TransformComponent methods (#19571) 2023-08-30 12:05:19 +10:00
DrSmugleaf
a88e747a0b Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
Vordenburg
2cbe8609a3 Make lobby song update occur at round end (#19303) 2023-08-21 14:54:44 -04:00
Abbey Armbruster
f708a8dbf5 Add API to change the sound of AmbientSoundComponent (#18115) 2023-08-03 20:36:10 +10:00
metalgearsloth
e755509fc7 More miscellaneous compiler warning fixes (#18228) 2023-07-23 16:03:57 +10:00
metalgearsloth
68480af109 Update content vectors to numerics (#17759) 2023-07-08 14:08:32 +10:00
metalgearsloth
1485666a23 Ambient music fixes (#17685) 2023-06-27 21:28:51 +10:00
metalgearsloth
0c83642c5a Add ambient music (#16829) 2023-05-29 10:44:11 +10:00
eoineoineoin
56b2386870 Fix bug where space music would play even when on station (#16260) 2023-05-13 08:07:04 +10:00
metalgearsloth
ae01618874 Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566) 2023-04-20 20:16:01 +10:00
metalgearsloth
acf79a8209 Revert "Replace ResourcePath with ResPath (#15308)" (#15551) 2023-04-20 11:43:54 +10:00
Ygg01
71f358a027 Replace ResourcePath with ResPath (#15308) 2023-04-19 23:39:17 +10:00
metalgearsloth
9c03ed805c Don't play ambience for paused ents (#14269) 2023-02-26 04:19:31 +11:00
Leon Friedrich
ccac9efc26 Fix two small ambient sound bugs. (#13249) 2023-01-01 11:40:22 +11:00
Leon Friedrich
ae58bb1f1b Store ambient sound entities on a component tree. (#13110) 2022-12-30 15:10:14 +11:00
Leon Friedrich
75ab0a1127 Fix ambient audio assert (#12938) 2022-12-09 12:16:39 +11:00
Leon Friedrich
b771d2423a Fix ambient sound error (#12808) 2022-12-01 09:02:37 -06:00
Leon Friedrich
8ec2a9ec74 Ambient sound performance improvements (#12756) 2022-11-28 12:10:40 +11:00
Leon Friedrich
6917b0fe17 Misc audio and related changes for replays (#12578) 2022-11-22 11:49:48 +11:00
rolfero
1151ca42e5 changing accumulators to timespan targets (#12407) 
* changing accumulators to timespan targets

* Update Content.Server/Abilities/Mime/MimePowersSystem.cs

Co-authored-by: 0x6273 <0x40@keemail.me>

* Update MimePowersSystem.cs

* serializing timespans and adding pausetime where applicable

* remove nullable

Co-authored-by: CommieFlowers <rasmus.cedergren@hotmail.com>
Co-authored-by: 0x6273 <0x40@keemail.me>
 2022-11-08 13:59:34 -06:00
theashtronaut
2856213c80 Add lobby music volume slider (#12153) 2022-11-04 11:15:37 +11:00
Jacob Tong
6d297fbb62 Cleanup audio (#11238) 2022-11-04 10:01:53 +11:00
metalgearsloth
0e9213f523 Fix lookup flags (#12235) 2022-10-28 01:09:16 +11:00
Matthias
85a26adcd6 Ambience no longer plays in the lobby (#11416) 
Co-authored-by: matthst <32034333+matthst@users.noreply.github.com>
Co-authored-by: Matthias Steinletzberger <matthias.steinletzberger@ntsretail.com>
 2022-10-17 15:56:10 +11:00
metalgearsloth
600c0e3255 Fix a few warnings (#11576) 2022-10-04 14:24:19 +11:00
wrexbe
35b90736b7 Minor UI refactor (#11212) 2022-09-11 20:42:12 -07:00
wrexbe
c55a015b77 Small UI refactor pieces (#11026) 
* ActionType rename Name to DisplayName

* Gameplay State rename+move
 2022-09-04 17:21:14 -07:00
metalgearsloth
56b7b175b0 Fix ambient audio nags (#10698) 2022-08-22 05:05:43 +10:00
Visne
58769634c7 Fix a bunch of compiler warnings (#10518) 2022-08-13 22:28:34 -07:00
metalgearsloth
5449835bba Fix audio occlusion (#10538) 2022-08-11 19:53:28 -07:00
Leon Friedrich
c7ad6b709e Audio System Rejig (#9635) 2022-07-29 12:13:12 +10:00
ike709
0b86e0e953 Event Music & Nuke Countdown Song (#8597) 
Co-authored-by: ike709 <ike709@github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-07-04 16:29:38 +10:00