Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• a8923a343e SceneSwitch working :) Xaver 2025-06-17 15:02:22 +0200
• 0a5cc619b6 Merge remote-tracking branch 'origin/main' Florian 2025-06-17 14:56:19 +0200
• 581ca8f7bc Potentially fixed wwise errors Florian 2025-06-17 14:55:01 +0200
• 0f14c069aa Beach Scene House fix + Scene Switch Prefab Beautified Xaver 2025-06-17 14:34:01 +0200
• 72d6a08df3 Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4 AgentSchmisch 2025-06-17 14:25:33 +0200
• 4464383a4d ✨ altered BushInteraction.cs AgentSchmisch 2025-06-17 14:25:18 +0200
• ae9fd8a087 ✨ added SceneSwitcher AgentSchmisch 2025-06-17 14:19:55 +0200
• 1e68c0350c Merge remote-tracking branch 'origin/main' Florian 2025-06-17 14:11:41 +0200
• 54d00a62e6 Merge remote-tracking branch 'origin/main' Florian 2025-06-17 14:10:51 +0200
• 77aa51400f BirdsSounds in wwise and much more :) Florian 2025-06-17 14:10:23 +0200
• fb055af381 Dialog Xaver 2025-06-17 14:05:38 +0200
• cc52c25054 Merge remote-tracking branch 'origin/main' Xaver 2025-06-17 13:25:33 +0200
• 76cc17e446 stick and bober Xaver 2025-06-17 13:25:24 +0200
• 92f5491d49 textured fish character Sofiia-Khrystyna 2025-06-17 11:57:10 +0200
• d9f45dd791 Merge remote-tracking branch 'origin/main' Sofiia-Khrystyna 2025-06-17 11:25:17 +0200
• cf94886d44 textured bird, modifiers applied to deer Sofiia-Khrystyna 2025-06-17 11:25:05 +0200
• 80ba81f219 Old Wind removed Florian 2025-06-17 11:11:50 +0200
• 60ce611813 Merge remote-tracking branch 'origin/main' Florian 2025-06-17 11:10:38 +0200
• 73f4a7aa91 Fox Prefab with windscript, Wind in market Florian 2025-06-17 11:10:18 +0200
• 9c00a525f1 beaver xaxa Xaver 2025-06-17 10:46:41 +0200
• 9f91322343 not textured bird Sofiia-Khrystyna 2025-06-16 23:44:44 +0200
• 247ca0c7df textured deer Sofiia-Khrystyna 2025-06-16 20:20:15 +0200
• 6cb1a8d6ad Merge remote-tracking branch 'origin/main' Florian 2025-06-16 16:41:52 +0200
• df3e077c55 Wind Sound in Market Florian 2025-06-16 16:41:07 +0200
• 945a91abaa textured beaver Sofiia-Khrystyna 2025-06-16 15:16:55 +0200
• e0c86ec09d peak done Xaver 2025-06-16 14:19:02 +0200
• b9c51dda26 Merge remote-tracking branch 'origin/main' Xaver 2025-06-16 11:40:03 +0200
• 43c4d547e8 market textures and garden scene Xaver 2025-06-16 11:39:57 +0200
• 59ef777dda BirdSounds in market, Listener on Fox Prefab optimized Florian 2025-06-16 11:21:56 +0200
• cdb0ef2a3b safety Florian 2025-06-16 10:29:56 +0200
• 2e55548530 Merge remote-tracking branch 'origin/main' Florian 2025-06-16 10:28:48 +0200
• e3f39057f8 Market and beach with steps Sound Florian 2025-06-16 10:26:32 +0200
• b27982de01 Merge remote-tracking branch 'origin/main' Xaver 2025-06-16 10:21:52 +0200
• eb1a9aa8bd changed some weird stuff Xaver 2025-06-16 10:21:46 +0200
• 0319e8e99d Merge remote-tracking branch 'origin/main' Florian 2025-06-16 10:09:42 +0200
• 2d634f7560 Merge remote-tracking branch 'origin/main' Florian 2025-06-16 10:09:03 +0200
• ae505cadad for the merge Florian 2025-06-16 10:08:51 +0200
• 88c084dea8 Merge remote-tracking branch 'origin/main' Xaver 2025-06-16 10:06:02 +0200
• d17b3a4a1e forest Xaver 2025-06-16 10:04:38 +0200
• 2c9aca5cb6 ✨ updated MarketStands AgentSchmisch 2025-06-16 07:10:06 +0200
• da63ca32f0 added textured models: apples, diamonds, fish + Filled market stands with products Sofiia-Khrystyna 2025-06-16 00:27:02 +0200
• 3f5f40832b ✨ added FoxHouse AgentSchmisch 2025-06-13 18:40:54 +0200
• 71b6b8831a fixed x6 fox house Sofiia-Khrystyna 2025-06-13 18:21:54 +0200
• 7bd80ddbf0 fixed x5 fox house Sofiia-Khrystyna 2025-06-13 18:13:47 +0200
• 90a58258ac fixed x4 fox house Sofiia-Khrystyna 2025-06-13 18:10:11 +0200
• 0508a55ba4 fixed x3 fox house Sofiia-Khrystyna 2025-06-13 17:59:59 +0200
• 745eaae804 fixed x2 fox house Sofiia-Khrystyna 2025-06-13 17:54:18 +0200
• bc1676fb49 fixed fox house Sofiia-Khrystyna 2025-06-13 17:47:22 +0200
• 086b8773e7 Textured fox house Sofiia-Khrystyna 2025-06-13 17:39:51 +0200
• 6725663da7 ✨ added DialogContainer, finished DialogSystem AgentSchmisch 2025-06-13 17:15:00 +0200
• 7828020734 Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4 AgentSchmisch 2025-06-13 16:46:56 +0200
• 6a51629359 ✨ Updated dialogbuilder to make speaker names bold AgentSchmisch 2025-06-13 16:39:38 +0200
• b6816602ed Merge remote-tracking branch 'origin/main' Florian 2025-06-13 16:04:07 +0200
• 31fe3972bf Market with Sound Florian 2025-06-13 16:00:09 +0200
• d71df2437e Merge remote-tracking branch 'origin/main' Xaver 2025-06-13 15:17:55 +0200
• 7b4e435220 beacer,json+beaver+forest Xaver 2025-06-13 15:17:42 +0200
• 0922973442 Merge remote-tracking branch 'origin/main' Florian 2025-06-13 13:37:42 +0200
• 9a1f2ded67 Background Music added to BeachScene Florian 2025-06-13 13:37:27 +0200
• 8f4a194e10 bakery with window Sofiia-Khrystyna 2025-06-13 12:26:33 +0200
• 25ad8395e4 Merge remote-tracking branch 'origin/main' Sofiia-Khrystyna 2025-06-13 12:18:44 +0200
• 5c13fd3585 bakery fully textured Sofiia-Khrystyna 2025-06-13 12:18:35 +0200
• d25991420e Merge remote-tracking branch 'origin/main' Xaver 2025-06-13 11:13:44 +0200
• 12f0274894 market 0.5 Xaver 2025-06-13 11:13:07 +0200
• 4a8b19f344 Berry & Bush sounds in wwise Florian 2025-06-13 11:09:41 +0200
• a58288893b Berry and Bush sounds Florian 2025-06-13 11:08:15 +0200
• 01a5a487e8 Merge remote-tracking branch 'origin/main' Florian 2025-06-13 11:05:56 +0200
• 57306c498d StepSound for player, beach Scene sound updated Florian 2025-06-13 11:05:22 +0200
• 9fbcf3d566 Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4 AgentSchmisch 2025-06-13 10:14:01 +0200
• 14110da522 🎨 created Prefabs, finished BushInteraction AgentSchmisch 2025-06-13 10:11:19 +0200
• c414b2f906 same blue market stand Sofiia-Khrystyna 2025-06-13 10:09:11 +0200
• 6103868ef1 Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4 Florian 2025-06-13 10:03:12 +0200
• 512e86a53c Merge remote-tracking branch 'origin/main' Xaver 2025-06-13 10:01:01 +0200
• 109d0ac3fb idk Xaver 2025-06-13 10:00:53 +0200
• 406fd59dff Merge remote-tracking branch 'origin/main' Florian 2025-06-13 09:58:19 +0200
• 92456c0e59 beach scene unneccessary commit (but git wants it) Florian 2025-06-13 09:58:10 +0200
• 1acb19bcee Merge remote-tracking branch 'origin/main' Sofiia-Khrystyna 2025-06-12 22:06:32 +0200
• 584e49d9cb Not fully textured bakery Sofiia-Khrystyna 2025-06-12 22:06:27 +0200
• e8793a122b Merge remote-tracking branch 'origin/main' Xaver 2025-06-12 21:56:32 +0200
• a8fcab2fc6 animations Xaver 2025-06-12 21:56:02 +0200
• c225b6b881 Fbx fox Sofiia-Khrystyna 2025-06-12 19:55:47 +0200
• 9a3dd9f3b2 Merge remote-tracking branch 'origin/main' Sofiia-Khrystyna 2025-06-12 19:54:13 +0200
• 09729a093b Rigged fox Sofiia-Khrystyna 2025-06-12 19:54:09 +0200
• 8e53bf0d16 Everything works Florian 2025-06-12 19:30:41 +0200
• 9144907a10 ANGST AgentSchmisch 2025-06-12 18:45:34 +0200
• 08c9a2350f Merge remote-tracking branch 'origin/main' Sofiia-Khrystyna 2025-06-12 18:14:14 +0200
• cd056f0b23 Fox walking animation, but needs to be changed Sofiia-Khrystyna 2025-06-12 18:14:06 +0200
• 856df114f2 Merge remote-tracking branch 'origin/main' Florian 2025-06-12 18:11:10 +0200
• aeccf7094b Beach Scene sound (1/2) Florian 2025-06-12 18:10:58 +0200
• 1753fd9ef1 ✨ Scripts AgentSchmisch 2025-06-12 16:04:22 +0200
• 6eb719d9af Merge remote-tracking branch 'origin/main' Sofiia-Khrystyna 2025-06-12 17:51:30 +0200
• a0daa3d7e1 Market stands Sofiia-Khrystyna 2025-06-12 17:51:23 +0200
• 44d41c7a68 Merge remote-tracking branch 'origin/main' Florian 2025-06-12 16:34:36 +0200
• 63583bae3f MomLunaFirstDialog Florian 2025-06-12 16:32:50 +0200
• 9dd21bdf53 actually no clue why I need to commit rn Florian 2025-06-12 16:32:19 +0200
• d3df9e4b3b dialog builder 3.0 Xaver 2025-06-12 16:24:01 +0200
• de6b32f168 Merge remote-tracking branch 'origin/main' Xaver 2025-06-12 15:50:42 +0200
• 444ef63d70 audio listener off Xaver 2025-06-12 15:50:30 +0200
• 77e916d9a5 Pine tree Sofiia-Khrystyna 2025-06-12 15:05:48 +0200
• 00b80a8064 Merge remote-tracking branch 'origin/main' Xaver 2025-06-12 15:00:34 +0200
• 5796ff1ad3 Beach Xaver 2025-06-12 15:00:21 +0200