fixing merge issue

2026-01-21 19:33:40 +02:00
parent c620b9000d 31145f9735
commit ca0a7dcc21
47 changed files with 126 additions and 0 deletions
--- a/Doc/Readme-Footer.png
+++ b/Doc/Readme-Footer.png
--- a/Doc/Readme-Header.png
+++ b/Doc/Readme-Header.png
--- a/Doc/ReadmeIllustrations.afdesign
+++ b/Doc/ReadmeIllustrations.afdesign
--- 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/Bolt-Self-Driving-Car-Clip.gif
+++ b/Doc/clips/Bolt-Self-Driving-Car-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/Explore-Clip.gif
+++ b/Doc/clips/Explore-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/Interactive-Map-Clip.gif
+++ b/Doc/clips/Interactive-Map-Clip.gif
--- a/Doc/clips/Multiplayer-join-Clip.gif
+++ b/Doc/clips/Multiplayer-join-Clip.gif
--- a/Doc/clips/Old-menu.gif
+++ b/Doc/clips/Old-menu.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-Collide-Offset-Clip.gif
+++ b/Doc/clips/Player-Collide-Offset-Clip.gif
--- a/Doc/clips/Player-Hand-Collision-Complete-Clip.gif
+++ b/Doc/clips/Player-Hand-Collision-Complete-Clip.gif
--- a/Doc/clips/Player-Hand-No-Collision-Clip.gif
+++ b/Doc/clips/Player-Hand-No-Collision-Clip.gif
--- a/Doc/clips/Quit-Clip.gif
+++ b/Doc/clips/Quit-Clip.gif
--- a/Doc/clips/Server-Room-Clip.gif
+++ b/Doc/clips/Server-Room-Clip.gif
--- a/Doc/clips/Singleplayer-Join-Clip.gif
+++ b/Doc/clips/Singleplayer-Join-Clip.gif
--- a/Doc/clips/Skywalk-Clip.gif
+++ b/Doc/clips/Skywalk-Clip.gif
--- a/Doc/clips/Summon-Elevator-Clip.gif
+++ b/Doc/clips/Summon-Elevator-Clip.gif
--- a/Doc/clips/UFO-Bow-Game-Clip.gif
+++ b/Doc/clips/UFO-Bow-Game-Clip.gif
--- a/Doc/clips/VR-Elevator-Example-Clip.gif
+++ b/Doc/clips/VR-Elevator-Example-Clip.gif
--- a/Doc/clips/Whiteboard-Clip.gif
+++ b/Doc/clips/Whiteboard-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/Icons.afdesign
+++ b/Doc/designs/Icons.afdesign
--- a/Doc/designs/Map.afdesign
+++ b/Doc/designs/Map.afdesign
--- 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/Doc/posters/MainPoster-2025.afdesign
+++ b/Doc/posters/MainPoster-2025.afdesign
--- a/Doc/posters/MainPoster-2025.pdf
+++ b/Doc/posters/MainPoster-2025.pdf