Commit Graph

47 Commits

Author SHA1 Message Date
Xaver
194fb96498 talk it like i walk it 2025-06-18 16:00:24 +02:00
Florian
bef43e2c98 UI sounds added to mainmenu scene 2025-06-18 11:56:26 +02:00
Xaver
5f50ca7f8e faster talk 2025-06-18 10:40:56 +02:00
Xaver
f8c9f6d50a Merge remote-tracking branch 'origin/main' 2025-06-18 10:31:04 +02:00
Xaver
72f5ac7941 Main Menu 2025-06-18 10:30:42 +02:00
Florian
b268752b0c Merge remote-tracking branch 'origin/main'
# Conflicts:
#	blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset
2025-06-18 10:24:02 +02:00
Florian
6c1e5d826e StickPickUp Sound 2025-06-18 10:22:01 +02:00
AgentSchmisch
29bb16f901 Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4 2025-06-18 09:58:43 +02:00
AgentSchmisch
af7e6f40d9 Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4 2025-06-18 09:56:10 +02:00
Xaver
6c690177c0 fixes 2025-06-18 09:56:04 +02:00
AgentSchmisch
6f19e025f9 edit stick to be saveable 2025-06-18 09:53:15 +02:00
Xaver
1903523be2 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	blueberryPeak/Assets/Scripts/Player/PlayerInteraction.cs
2025-06-18 09:52:09 +02:00
Xaver
463529633a baker talking bug fix on talk and rotated levels 2025-06-18 09:50:57 +02:00
Florian
77a1b194b4 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	blueberryPeak/blueberryPeak_WwiseProject/SoundBanks/Default Work Unit.wwu
2025-06-18 09:49:44 +02:00
Florian
99403fdb08 DialogManager has sound event 2025-06-18 09:48:07 +02:00
AgentSchmisch
eb79eb37ae added TwigInteraction 2025-06-18 09:36:09 +02:00
AgentSchmisch
ae0137770d Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4 2025-06-18 09:17:11 +02:00
AgentSchmisch
9f48b79907 updated PlayerInteraction 2025-06-18 09:11:23 +02:00
6d6c88a8af wind+better dialog+reorganization 2025-06-17 23:11:42 +02:00
Xaver
3e8481d6ea tried some stuff 2025-06-17 21:38:14 +02:00
Xaver
f999361fe2 build err fix 2025-06-17 18:24:05 +02:00
Xaver
8977018353 inviswalls and colliders 2025-06-17 17:44:17 +02:00
AgentSchmisch
65fe1823ec Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4 2025-06-17 16:03:52 +02:00
Xaver
181b18cc6a flo == "AgentSchmisch" 2025-06-17 16:03:38 +02:00
Xaver
c600908d1c fixed flo's foolish mistakes 2025-06-17 16:01:15 +02:00
AgentSchmisch
483eeb54a8 fixed issues in PlayerInteraction & PlayerMovement 2025-06-17 15:33:25 +02:00
Xaver
0f14c069aa Beach Scene House fix + Scene Switch Prefab Beautified 2025-06-17 14:34:01 +02:00
AgentSchmisch
72d6a08df3 Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4 2025-06-17 14:25:33 +02:00
AgentSchmisch
4464383a4d altered BushInteraction.cs 2025-06-17 14:25:18 +02:00
AgentSchmisch
ae9fd8a087 added SceneSwitcher 2025-06-17 14:19:55 +02:00
Florian
77aa51400f BirdsSounds in wwise and much more :) 2025-06-17 14:10:23 +02:00
Florian
73f4a7aa91 Fox Prefab with windscript, Wind in market 2025-06-17 11:10:18 +02:00
Florian
df3e077c55 Wind Sound in Market 2025-06-16 16:41:07 +02:00
Florian
59ef777dda BirdSounds in market, Listener on Fox Prefab optimized 2025-06-16 11:21:56 +02:00
AgentSchmisch
6725663da7 added DialogContainer, finished DialogSystem 2025-06-13 17:15:00 +02:00
Florian
31fe3972bf Market with Sound 2025-06-13 16:00:09 +02:00
Florian
01a5a487e8 Merge remote-tracking branch 'origin/main' 2025-06-13 11:05:56 +02:00
Florian
57306c498d StepSound for player, beach Scene sound updated 2025-06-13 11:05:22 +02:00
AgentSchmisch
9fbcf3d566 Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4 2025-06-13 10:14:01 +02:00
AgentSchmisch
14110da522 🎨 created Prefabs, finished BushInteraction 2025-06-13 10:13:53 +02:00
Xaver
a8fcab2fc6 animations 2025-06-12 21:56:02 +02:00
Florian
856df114f2 Merge remote-tracking branch 'origin/main' 2025-06-12 18:11:10 +02:00
Florian
aeccf7094b Beach Scene sound (1/2) 2025-06-12 18:10:58 +02:00
AgentSchmisch
1753fd9ef1 Scripts 2025-06-12 16:04:22 +02:00
Xaver
82161e3f5b map + dialog builder 2025-06-11 11:23:52 +02:00
Xaver
8f09d10b36 terrain draft 2025-06-10 16:13:48 +02:00
Xaver
03f73195ce restructure 2025-06-10 11:03:38 +02:00