merge upstream

2025-12-22 08:05:55 +00:00
parent 8b037369b7 24543cce38
commit 2262609cdd
28 changed files with 84 additions and 4 deletions
--- a/Doc/clips/Bolt-Car-Network-Problem-Clip.gif
+++ b/Doc/clips/Bolt-Car-Network-Problem-Clip.gif
--- a/Doc/clips/Bolt-Car-Network-Results-Clip.gif
+++ b/Doc/clips/Bolt-Car-Network-Results-Clip.gif
--- a/Doc/clips/Camera-Collider-Clip.gif
+++ b/Doc/clips/Camera-Collider-Clip.gif
--- a/Doc/clips/Door-Collision-Solution-Clip.gif
+++ b/Doc/clips/Door-Collision-Solution-Clip.gif
--- a/Doc/clips/Door-Grabbing-Clip.gif
+++ b/Doc/clips/Door-Grabbing-Clip.gif
--- a/Doc/clips/Doors-Issue-Clip.gif
+++ b/Doc/clips/Doors-Issue-Clip.gif
--- a/Doc/clips/Elevator-Move-Between-Floors-Clip.gif
+++ b/Doc/clips/Elevator-Move-Between-Floors-Clip.gif
--- a/Doc/clips/Elevator-Open-Close-Doors-Clip.gif
+++ b/Doc/clips/Elevator-Open-Close-Doors-Clip.gif
--- a/Doc/clips/Elevator-network-problem-Clip.gif
+++ b/Doc/clips/Elevator-network-problem-Clip.gif
--- a/Doc/clips/Elevator-network-results-Clip.gif
+++ b/Doc/clips/Elevator-network-results-Clip.gif
--- a/Doc/clips/Ghost-Hand-Clip.gif
+++ b/Doc/clips/Ghost-Hand-Clip.gif
--- a/Doc/clips/Hand-Collider-Prototype-Clip.gif
+++ b/Doc/clips/Hand-Collider-Prototype-Clip.gif
--- a/Doc/clips/Open-Elevator-Doors-Same-Floor-Clip.gif
+++ b/Doc/clips/Open-Elevator-Doors-Same-Floor-Clip.gif
--- a/Doc/clips/Player-Hand-Collision-Complete-Clip.gif
+++ b/Doc/clips/Player-Hand-Collision-Complete-Clip.gif
--- a/Doc/clips/Summon-Elevator-Clip.gif
+++ b/Doc/clips/Summon-Elevator-Clip.gif
--- a/Doc/clips/VR-Elevator-Example-Clip.gif
+++ b/Doc/clips/VR-Elevator-Example-Clip.gif
--- a/Doc/designs/Doorknob-Rework-Blender.png
+++ b/Doc/designs/Doorknob-Rework-Blender.png
--- a/Doc/designs/Doorknob-Rework-Unity.png
+++ b/Doc/designs/Doorknob-Rework-Unity.png
--- a/Doc/designs/Elevator-buttons-inside.png
+++ b/Doc/designs/Elevator-buttons-inside.png
--- a/Doc/designs/Model-Collider-Rework-Concept.png
+++ b/Doc/designs/Model-Collider-Rework-Concept.png
--- a/Doc/designs/Moder-Collider-Rework-Results.png
+++ b/Doc/designs/Moder-Collider-Rework-Results.png
--- a/Doc/designs/Network-Player-mirror.png
+++ b/Doc/designs/Network-Player-mirror.png
--- a/Doc/designs/Old-VR-Doorknob.png
+++ b/Doc/designs/Old-VR-Doorknob.png
--- a/Doc/designs/Original-elevator-state-diagram.png
+++ b/Doc/designs/Original-elevator-state-diagram.png
--- a/Doc/designs/Player-Hand-Colliders.png
+++ b/Doc/designs/Player-Hand-Colliders.png
--- a/Doc/designs/Real-Doorknob.jpg
+++ b/Doc/designs/Real-Doorknob.jpg
--- a/Doc/designs/Two-Elevators.png
+++ b/Doc/designs/Two-Elevators.png
--- a/README.md
+++ b/README.md
@@ -66,23 +66,22 @@ Multiplayer and cross-play functionality. [Bachelor's Thesis](https://comserv.cs
 **Raimond Tunnel**<br/>
 Project management, visual design.

+**Timur Nizamov**<br/>
+Technical sound design.
+
 Developed in the [Computer Graphcis and Virtual Reality Study Lab](https://cgvr.cs.ut.ee/) of the [Institute of Computer Science, University of Tartu](https://cs.ut.ee).

 ### Used Attributions

 | Description                                         | License                                      | Source                                                                                      | Author           |
 |-----------------------------------------------------|----------------------------------------------|---------------------------------------------------------------------------------------------|------------------|
-| Bold's car driving sound                            | Attribution NonCommercial 3.0                | [Link](https://freesound.org/people/Pfujimoto/sounds/14371/)                               | Pfujimoto        |
-| Bold's car braking sound                            | Attribution 3.0                              | [Link](https://freesound.org/people/200154michaela/sounds/542448/)                         | 200154michaela   |
 | Bold's car horn sound                               | Attribution 4.0                              | [Link](https://freesound.org/people/ceberation/sounds/235506/)                             | ceberation       |
 | Server rack model                                   | Royalty Free, No AI License                  | [Link](https://www.cgtrader.com/free-3d-models/electronics/computer/simple-server-model)   | anymelok         |
-| Server rack humming sound                           | Attribution 4.0                              | [Link](https://freesound.org/people/jameswrowles/sounds/248217/)                           | jameswrowles     |
 | Fire suppression button press sound                 | Creative Commons 0                           | [Link](https://freesound.org/people/LamaMakesMusic/sounds/403556/)                         | LamaMakesMusic   |
 | Fire suppression alarm sound                        | Attribution 3.0                              | [Link](https://freesound.org/people/jobro/sounds/33737/)                                   | jobro            |
 | Fire-suppressing gas release sound                  | Creative Commons 0                           | [Link](https://freesound.org/people/mrmccormack/sounds/182359/)                            | mrmccormack      |
 | Coughing sound in response to fire-suppressing gas  | Attribution 4.0                              | [Link](https://freesound.org/people/qubodup/sounds/739416/)                                | qubodup          |
 | Robot movement sound                                | Creative Commons 0                           | [Link](https://freesound.org/people/Brazilio123/sounds/661435/)                            | Brazilio123      |
-| Portal humming sound                                | Attribution 4.0                              | [Link](https://freesound.org/people/zimbot/sounds/122972/)                                 | zimbot           |
 | Spacewalk UFO sound                                 | Attribution NonCommercial 4.0                           | [Link](https://freesound.org/people/Speedenza/sounds/209366/)                           | Speedenza     |
 | Keyboard icons                                      | Creative Commons Attribution-NoDerivs 3.0    | [Link](https://icons8.com/)                                                                 | icons8           |