Florian
|
44d41c7a68
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# blueberryPeak/Assets/StreamingAssets/Audio/GeneratedSoundBanks/ProjectInfo.json.meta
# blueberryPeak/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h.meta
|
2025-06-12 16:34:36 +02:00 |
|
Florian
|
63583bae3f
|
MomLunaFirstDialog
|
2025-06-12 16:32:50 +02:00 |
|
Florian
|
9dd21bdf53
|
actually no clue why I need to commit rn
|
2025-06-12 16:32:19 +02:00 |
|
Xaver
|
d3df9e4b3b
|
dialog builder 3.0
|
2025-06-12 16:24:01 +02:00 |
|
AgentSchmisch
|
1753fd9ef1
|
✨ Scripts
|
2025-06-12 16:04:22 +02:00 |
|
Xaver
|
de6b32f168
|
Merge remote-tracking branch 'origin/main'
|
2025-06-12 15:50:42 +02:00 |
|
Xaver
|
444ef63d70
|
audio listener off
|
2025-06-12 15:50:30 +02:00 |
|
|
|
77e916d9a5
|
Pine tree
|
2025-06-12 15:05:48 +02:00 |
|
Xaver
|
00b80a8064
|
Merge remote-tracking branch 'origin/main'
|
2025-06-12 15:00:34 +02:00 |
|
Xaver
|
5796ff1ad3
|
Beach
|
2025-06-12 15:00:21 +02:00 |
|
Florian
|
ebcf101b32
|
Merge remote-tracking branch 'origin/main'
|
2025-06-12 13:44:00 +02:00 |
|
Florian
|
57b461e4da
|
Npc Action.txt, NpcAction Sound, Wwise Integration of most sounds
|
2025-06-12 13:43:49 +02:00 |
|
|
|
33a99ad7a9
|
blueberry
|
2025-06-12 13:30:13 +02:00 |
|
|
|
070bfa2495
|
fixed bushes
|
2025-06-12 13:25:27 +02:00 |
|
Florian Schmid
|
705c389dba
|
✨ removed old models
|
2025-06-12 13:14:11 +02:00 |
|
|
|
2490ceb485
|
bush no blueberries
|
2025-06-12 12:29:20 +02:00 |
|
|
|
3727f9d7c9
|
lighter bush
|
2025-06-12 12:13:26 +02:00 |
|
|
|
f056fe12e0
|
new blueberry bush
|
2025-06-12 11:53:54 +02:00 |
|
|
|
ccfce10e84
|
Merge remote-tracking branch 'origin/main'
|
2025-06-12 10:45:07 +02:00 |
|
|
|
5513738969
|
new bush
|
2025-06-12 10:44:57 +02:00 |
|
Florian
|
334626de2f
|
Merge remote-tracking branch 'origin/main'
|
2025-06-12 10:38:28 +02:00 |
|
Florian
|
66d0f2b47c
|
music, ocean and wwise integration
|
2025-06-12 10:36:40 +02:00 |
|
Xaver
|
bec63f45ff
|
Merge remote-tracking branch 'origin/main'
|
2025-06-11 15:37:04 +02:00 |
|
Xaver
|
292390b28c
|
wheres my ac
|
2025-06-11 15:36:54 +02:00 |
|
|
|
097635bcd8
|
bush with blueberries smoothed
|
2025-06-11 14:08:53 +02:00 |
|
|
|
a1bac4a760
|
changed trees
|
2025-06-11 14:03:04 +02:00 |
|
|
|
47f0c1d2ee
|
tree tree
|
2025-06-11 13:48:47 +02:00 |
|
|
|
09515bdf58
|
tree
|
2025-06-11 13:45:44 +02:00 |
|
|
|
fd021fd494
|
tree + bush
|
2025-06-11 13:43:23 +02:00 |
|
|
|
d7e83b4f55
|
still same bush with blueberries
|
2025-06-11 12:47:51 +02:00 |
|
|
|
1da30acc2f
|
new bush base colour
|
2025-06-11 12:43:35 +02:00 |
|
|
|
66fca89d65
|
Merge remote-tracking branch 'origin/main'
|
2025-06-11 12:34:47 +02:00 |
|
|
|
b96de3cdbe
|
textured bush with blueberries
|
2025-06-11 12:34:32 +02:00 |
|
Xaver
|
b1c0541880
|
Merge remote-tracking branch 'origin/main'
|
2025-06-11 11:24:02 +02:00 |
|
Xaver
|
82161e3f5b
|
map + dialog builder
|
2025-06-11 11:23:52 +02:00 |
|
|
|
458d386a38
|
Merge remote-tracking branch 'origin/main'
|
2025-06-11 11:08:19 +02:00 |
|
|
|
3fd9187bc2
|
Textured models: fox, mom fox, 3 spruce trees, bush with no blueberries
|
2025-06-11 10:59:14 +02:00 |
|
Florian
|
c141c2ecf2
|
Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4
|
2025-06-10 17:17:46 +02:00 |
|
Florian
|
445de42dbc
|
Birds and River
|
2025-06-10 17:11:15 +02:00 |
|
Xaver
|
8f09d10b36
|
terrain draft
|
2025-06-10 16:13:48 +02:00 |
|
Florian
|
eb79cf4336
|
Item, Steps, Ui, Dialog Audio found and edited
|
2025-06-10 15:48:41 +02:00 |
|
Xaver
|
ef7093617c
|
water shader
|
2025-06-10 12:39:20 +02:00 |
|
Xaver
|
03f73195ce
|
restructure
|
2025-06-10 11:03:38 +02:00 |
|
Xaver
|
7e643f0704
|
pixelation filter
|
2025-06-10 10:55:47 +02:00 |
|
Xaver
|
194da95e6f
|
shader triplanar
|
2025-06-10 09:40:10 +02:00 |
|
Xaver
|
0f4d2e1790
|
assignment1
|
2025-06-10 09:12:07 +02:00 |
|
|
|
1be26dc178
|
test
|
2025-06-09 20:55:49 +02:00 |
|
