1
0
forked from cgvr/DeltaVR
Commit Graph

398 Commits

Author SHA1 Message Date
32d0686cd2 npcs turn smoothly towards player 2026-02-07 12:54:27 +02:00
2ecda2b9a0 rebuild FishNetworking scene ids to fix build 2026-02-07 12:43:19 +02:00
0fbfaed5c3 fix problems from merging with upstream 2026-02-07 12:29:59 +02:00
b1d5b73df4 Merge remote-tracking branch 'upstream/master' 2026-02-07 11:51:41 +02:00
52902b4e0b convert file to lfs pointer ? 2026-02-07 11:51:33 +02:00
de7e9e96e7 make copy of main scene 2026-02-07 11:39:49 +02:00
a682e7245e add separate sprites for animatable mouths for characters, improve animating params 2026-02-07 11:37:45 +02:00
30c0652453 Project Settings file. I don't know what change is this... 2026-02-03 23:00:57 +02:00
85beb73f51 Do not commit config.json. Unity creates it itself and we do not want configs from different devs to end up in the repo. 2026-02-03 22:59:02 +02:00
011d9dfdda Restore Defaults button to restore the default settings. 2026-02-03 22:56:01 +02:00
2e7dc403ad Restore Defaults button images. 2026-02-03 22:55:29 +02:00
4bda55baca Locomotion speed default value fix. 2026-02-03 22:55:03 +02:00
ba1f0c855d Settings are now loaded from and saved to the config.json file. Reworked the UI structure a bit (the script that manage the settings have to be active before the UI is opened to actually take effect at game startup). Fixed several UI bugs (slider deselection, UI labels blocking the sliders, etc). 2026-02-03 21:47:16 +02:00
415484c1f0 Removed unused namespaces that hindered building. 2026-02-03 21:44:40 +02:00
2347d27c62 For some reason Unity changed something in the font asset... Maybe it is the glow effect. 2026-02-03 21:43:50 +02:00
1a4e932b1e add archery range and shape detection npc voiceline timelines 2026-02-03 12:45:41 +02:00
3bae534a61 complete animating mouth scale based on amplitude timeline 2026-02-03 12:26:31 +02:00
74c2ca6a98 Managers folder meta file. 2026-02-02 22:45:06 +02:00
f3d0f206af Config manager. Just creating, reading and writing the config file for now. 2026-02-02 22:44:17 +02:00
f9b2084876 Removed the nested .gitignore file that ignored the .meta files inside this directory. This should fix the missing script errors. 2026-02-02 21:30:45 +02:00
53c6b04d23 Main scene changes. The scene tree is now more readable. Removed the two previous networking prefabs and added the new one. The only thing scene-dependent on it is the player's spawn point. Maybe also the object pool, however it seems to create one itself. So, the object pool in the scene might also be deleted perhaps. 2026-02-02 20:36:34 +02:00
91e44c5dae Created a single prefab to incorporate all the networking stuff. This is the only networking prefab required in the scene. We will see if git breaks it. 2026-02-02 20:35:25 +02:00
216e2660df Hide FMOD setup wizard by default. 2026-02-02 19:54:17 +02:00
57222f0bb0 The arrow server can only be created after the bow server's ownership is done. Should be tested. 2026-02-02 19:36:00 +02:00
768ed39abe Animation player refactoring. Also, if the animation is already playing, do not log. Might be dangerous, but was a bit spam for now. 2026-02-02 19:35:01 +02:00
89b9b5bd7a Scan only the project assets, not the entire folder, to build the Asset Database. 2026-02-02 19:32:32 +02:00
901334b6bf Fix for the Lexus normal map. 2026-02-02 19:30:25 +02:00
1885b1fbe8 Added some debug logs. 2026-02-02 19:29:49 +02:00
f81bc2f7fd The last Interaction Layer name must be "Teleport" not "Player Only". 2026-02-02 19:28:40 +02:00
a4a6535779 Reworked the TutorialController so that it will show the info about trying to initialize once per some time interval. Not flood the entire log. 2026-02-02 19:26:28 +02:00
5a3f566541 WIP animate mouth scale based on precalculated voiceline amplitude timelines 2026-02-02 19:15:31 +02:00
a0d1ee35cd fix FirstPersonOcclusion invalid event handle error 2026-01-29 19:26:16 +02:00
4c6fbb30bc cafe waiter generates model and spawns it on top of plate 2026-01-29 18:47:32 +02:00
e9df211610 cafe waiter NPC goes and brings food after dialogue 2026-01-29 18:12:39 +02:00
ceee57f808 mic stand doesnt show BLANK_AUDIO 2026-01-29 17:40:05 +02:00
61a81d2728 NPC doesnt process player speech when its too soon after last processing 2026-01-29 17:31:59 +02:00
876306a2af improve text recognition reliability, unsubscribe from Whisper events when not wanted anymore 2026-01-28 16:14:27 +02:00
e0d68454c7 cafe waiter npc has states, rotates notepad when spoken to 2026-01-28 15:33:14 +02:00
a8e65514f4 refactor NPCController script, make it abstract, extendable; separate AlienNPC and CafeWaiterNPC 2026-01-28 14:23:16 +02:00
eb8e33bb3d fix voiceline occlusion 2026-01-27 18:44:33 +02:00
af27bb0230 shape scanner improvements: add handle, destroy scannable object on completion, correctly detect when new object is generated 2026-01-27 18:38:20 +02:00
77fc43bebd fix bug with player colliding with spawned model when holding it 2026-01-27 17:50:13 +02:00
15b92e92b4 enable continuous movement by default, move config.json to game folder 2026-01-27 17:25:33 +02:00
24000ec80c add some voicelines to archery range minigame 2026-01-25 16:11:08 +02:00
ec45c402af add sound effects to button, mic stand, model generation, shape scanner 2026-01-25 15:10:42 +02:00
75bd66fc36 add back minigames after merge 2026-01-25 13:11:58 +02:00
19f8efc6a7 Merge remote-tracking branch 'upstream/master' 2026-01-25 12:31:58 +02:00
48b9f12802 make copy of main scene 2026-01-25 12:11:53 +02:00
14c85c83a7 forgot to assign a variable 2026-01-21 19:35:54 +02:00
ca0a7dcc21 fixing merge issue 2026-01-21 19:33:40 +02:00