Babushka

Jonathan

Babushka

Commit Graph

Select branches

Hide Pull Requests

3d_character_controller

Animations

Anna

Enemy_selection_overlap

Kampf_Tooltip

Nao's-Sounds

Vesna_Gesichtsausdrücke_einfügen_

Vesna_resets_to_bed_after_dead

bug/attack_dead_enemy

bug/enemy_die

bug/enemy_group

bug/scene_dependency

choise_detection

deadend_wwise

develop

feature/bugfixes_And_Polish

feature/bugfixes_polish_II

feature/build_0_7

feature/damage_feedback

feature/dead_squash

feature/farm_fight_loop

feature/farming_bugfixes_and_magic_word

feature/fight_rework

feature/fight_system

feature/implement_quests

feature/import_changes

feature/integrate_new_fight

feature/languagetool-addon

feature/loading_screen

feature/night_to_day

feature/quest_system

feature/showcase_bugfixing_kathi_partII_quickfix

feature/spine2D_experimental

feature_sanel-dialogic

fighting_minigame_fix_overlap_with_Vesna

hint_box

interactions

inventory

level_transition

main

minigame_hit_feedback

minigame_variation

randomise_fight_start

remove_fightlog

test/music_setup

test/quick_juice

#1

#10

#11

#12

#13

#14

#15

#16

#17

#19

#2

#20

#21

#22

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#8

#9

35c7e9a25e WIP Wasserstand UI kziolkowski 2025-07-05 17:34:03 +0200
57896e37df Fixed background music loop and added audio mixers kziolkowski 2025-07-05 15:08:23 +0200
242879159a Fixed sfx binding in farming scene kziolkowski 2025-07-05 13:57:14 +0200
7ef9fe53b2 Added SignalVisualizer plugin kziolkowski 2025-07-05 13:56:59 +0200
600d9cfca1 Made items activate directly when picked up kziolkowski 2025-07-05 13:18:19 +0200
48796de1ba Changed dialogic background color to black and opacity to 168 sothat there is a visible dark overlay during dialogues kziolkowski 2025-07-05 12:37:39 +0200
4a0b2cd550 Improved Inventory UI (more in the middle, adapt to viewport size, new selector image) kziolkowski 2025-07-05 12:18:28 +0200
ba429d7b84 wip improving inventory layout kziolkowski 2025-07-04 23:41:15 +0200
e33776daeb ESC closes inventory now. kziolkowski 2025-07-04 23:15:45 +0200
9cfd3bd6f4 Improving farm outside scene performance kziolkowski 2025-07-02 21:36:12 +0200
7eb18caaaf Added SFX for Healing magic Nao 2025-07-02 21:24:21 +0200
e65e82f421 Added SFX Duck & Combat, moved Cat SFX to folder "animals" Nao 2025-07-02 21:23:36 +0200
c36d0b5866 reduced VRAM load by more than 50% kziolkowski 2025-07-02 17:54:23 +0200
bcdba7b812 Fixed Vesna sliding issue kziolkowski 2025-07-02 15:48:39 +0200
7467ec56d9 Fixed ordering issues in indoor scene kziolkowski 2025-06-28 17:37:39 +0200
990494e8b0 Adjusted indoor speed kziolkowski 2025-06-28 17:19:41 +0200
c6e0cfe4d9 Fixed Button layout behaviour kziolkowski 2025-06-28 17:17:26 +0200
691e613a5c Added SFX for Combat Nao 2025-06-28 17:04:20 +0200
4e010220bf Improved performance of the first indoor scene kziolkowski 2025-06-28 16:13:06 +0200
ccc4eb759e Added new house image to farming scene kziolkowski 2025-06-21 16:09:35 +0200
250f0d07ca SFX Slime Hit Variations (Pitch) Added Nao 2025-06-17 15:43:33 +0200
f481f5bea7 SFX Added: UI (Dialog + Confirmation), Slime Hit Nao 2025-06-17 15:39:02 +0200
58c65fc928 Merge pull request 'First intro sequence with Yeli' (#9) from feature/yeli_intro into develop Jonathan 2025-06-17 02:40:12 +0200
937e54e47a Merge branch 'feature/farming_visuals' into develop cblech 2025-06-16 21:03:02 +0200
83c8a15e5a Added art for updated startscreen to project (but not yet to start menu scene) #9 kziolkowski 2025-06-16 20:31:24 +0200
1fcddb7349 changed export presets for new builds kziolkowski 2025-06-16 20:30:46 +0200
26cae9b0f8 fixed missing ready plants kziolkowski 2025-06-15 20:11:45 +0200
0ebd0c46a0 Added indoor ending kziolkowski 2025-06-15 20:05:53 +0200
2226b859df Added WateringCan SFX kziolkowski 2025-06-15 19:44:16 +0200
07bcab4454 Added Farming SFX kziolkowski 2025-06-15 19:37:57 +0200
4c6d5350b2 Added Background music kziolkowski 2025-06-15 18:59:59 +0200
f2c492de54 changed label settings for InteractionArea kziolkowski 2025-06-15 18:59:50 +0200
e269b3ab44 WIP trying to toggle interactable colliders at runtime for fields kziolkowski 2025-06-15 18:59:38 +0200
89ae347a91 Added last farming timelines and fixed some minor issues kziolkowski 2025-06-15 18:00:27 +0200
ddb5547b42 Updated Startscreen and added second tutorial step kziolkowski 2025-06-15 16:41:36 +0200
afa06d3ee2 Fixed Yeli Y sorting issue and made fields rounded kziolkowski 2025-06-15 08:38:34 +0200
dd656d5f5f Extended dialogic toggle kziolkowski 2025-06-15 07:49:38 +0200
cdb62f3c2f Added Cozy Raven Splashscreen kziolkowski 2025-06-15 07:21:56 +0200
b0f4592fdd Added first working timeline for yelis intro to farming scene kziolkowski 2025-06-14 19:50:54 +0200
406c11b581 import statements kziolkowski 2025-06-14 10:37:23 +0200
9812006234 Added Yeli sprites and dialogic test timeline as well as prefab kziolkowski 2025-06-14 10:33:43 +0200
b8e456f7ef moved player2D prefab kziolkowski 2025-06-14 10:29:41 +0200
97e5485ef1 Added Yeli Idle and Talk animations Felix Paul 2025-05-21 02:12:36 +0200
c77563d38e Rerender Harvesting and added Watering animations Felix Paul 2025-05-18 21:22:27 +0200
c322f7667a Placeholder for Quest Fail added Nao 2025-06-02 16:06:52 +0200
68be479a09 New SFX for Door added Nao 2025-06-02 15:56:36 +0200
dc52d80a92 SFX Quest Complete Placeholder added (need more time) Nao 2025-05-18 20:34:00 +0200
a84ca9c32c Farm Atmos Nighttime added Nao 2025-05-18 19:21:51 +0200
6b1dd04dd5 New SFX and Forest Atmos Nighttime added Nao 2025-05-18 19:04:02 +0200
72593ff7c7 SFX for kitchen added (cutlery, plates, etc) and a few renamed Nao 2025-05-18 17:52:59 +0200
eac135508c SFX Snoring Added Nao 2025-05-18 15:33:02 +0200
72c3454728 SFX Door Open and Close added Nao 2025-05-18 15:10:08 +0200
523624756e missing import files kziolkowski 2025-06-14 08:54:54 +0200
d7dfd03241 Deleted unused material folder kziolkowski 2025-06-14 08:51:09 +0200
90cadbea07 ui elemente hinzugefügt für dialog Anna Scheck 2025-05-27 21:11:15 +0200
83e25f44cd Fixed background parallaxe effect in outdoor scene kziolkowski 2025-05-28 17:54:19 +0200
31f19ad139 Code cleanup part 2 kziolkowski 2025-05-28 16:28:31 +0200
c6ec99e87a Project cleanup: Removed 3D scripts and scenes from project. Also renamed and moved some minor stuff. kziolkowski 2025-05-28 16:02:51 +0200
8839b248bd missing import files checkIfPRContentChanged-1749884192368007736/feature/farming_visuals #8 kziolkowski 2025-06-14 08:54:54 +0200
bab9a6b5e8 Deleted unused material folder kziolkowski 2025-06-14 08:51:09 +0200
c81119ec38 Merge branch 'develop' into feature/farming_visuals checkIfPRContentChanged-1749880758504311652/feature/farming_visuals kziolkowski 2025-06-14 07:58:54 +0200
b8cb60aec9 Placeholder for Quest Fail added checkIfPRContentChanged-1749884192368007736/Nao's-Sounds checkIfPRContentChanged-1749880758504311652/Nao's-Sounds Nao 2025-06-02 16:06:52 +0200
55a3e56791 New SFX for Door added Nao 2025-06-02 15:56:36 +0200
3bde3b1994 Fixed background parallaxe effect in outdoor scene kziolkowski 2025-05-28 17:54:19 +0200
ec72979177 Code cleanup part 2 kziolkowski 2025-05-28 16:28:31 +0200
6292d94e0a Project cleanup: Removed 3D scripts and scenes from project. Also renamed and moved some minor stuff. kziolkowski 2025-05-28 16:02:51 +0200
1f17cca62d changes from build process kziolkowski 2025-05-28 15:37:04 +0200
1629862759 Merge pull request 'ui elemente hinzugefügt für dialog' (#4) from feature/ui-elements into develop checkIfPRContentChanged-1749884192368007736/tmp_develop checkIfPRContentChanged-1749884192368007736/develop checkIfPRContentChanged-1749880758504311652/tmp_develop checkIfPRContentChanged-1749880758504311652/develop Anna Scheck 2025-05-27 21:23:34 +0200
a53b4c4010 ui elemente hinzugefügt für dialog #4 Anna Scheck 2025-05-27 21:11:15 +0200
3e135afecb Added StartScreen and Scene Transition script kziolkowski 2025-05-24 23:50:06 +0200
25d8f217ff basic harvesting implemented kziolkowski 2025-05-24 23:16:41 +0200
a477f9ef4f Implemented field creation and wateringcan fill up animation kziolkowski 2025-05-24 21:47:25 +0200
b917fb5fbd changed player window size kziolkowski 2025-05-24 21:46:28 +0200
20ed134628 Added Yeli Idle and Talk animations checkIfPRContentChanged-1749884192368007736/Animations checkIfPRContentChanged-1749880758504311652/Animations Felix Paul 2025-05-21 02:12:36 +0200
47a1326292 state after magic clip done kziolkowski 2025-05-21 02:10:50 +0200
708aa8cca4 State after inventory clip (farming mechanic still WIP) kziolkowski 2025-05-21 00:13:58 +0200
83f4144b43 Reworked farming tools pickup animations kziolkowski 2025-05-20 23:05:26 +0200
2c677a8cda Inventory resource rework and slot aspect fix kziolkowski 2025-05-20 22:27:48 +0200
ec5d42068e fixed generic item on ground and added icon checkIfPRContentChanged-1749884192368007736/inventory checkIfPRContentChanged-1749880758504311652/inventory inventory cblech 2025-05-20 20:42:32 +0200
8fdb395ae8 Added icon to slot cblech 2025-05-20 19:48:49 +0200
60928c520c Inventory implemented kziolkowski 2025-05-20 18:27:50 +0200
f3ed5e0ad0 Changes to ItemOnGround kziolkowski 2025-05-20 18:27:40 +0200
ee897db52b added swaying plants shader kziolkowski 2025-05-20 18:27:20 +0200
41201d7406 Indoor room sprites added kziolkowski 2025-05-20 18:27:09 +0200
267172d026 WIP adding the inventory, also state after first clip kziolkowski 2025-05-20 01:00:13 +0200
917e6a5f7e Merge remote-tracking branch 'origin/inventory' into feature/farming_visuals kziolkowski 2025-05-20 00:19:42 +0200
23ef4e9a63 changed visibility order for plants kziolkowski 2025-05-20 00:18:49 +0200
fa7cc66748 added farming animation mechanic kziolkowski 2025-05-19 23:49:00 +0200
7b006d19ef Changed slot visuals cblech 2025-05-19 23:36:45 +0200
ad070514d7 Added item and interact animations kziolkowski 2025-05-19 22:50:28 +0200
80c48ea3df added pickup animation kziolkowski 2025-05-19 22:39:30 +0200
d76218f88f Moved Bar slot selection handling to inventory manager cblech 2025-05-19 22:07:55 +0200
7276bdda38 Watering can animation plays when watering kziolkowski 2025-05-19 22:06:40 +0200
73dc3063c0 removed unnecessary icons from farming controls kziolkowski 2025-05-19 21:42:56 +0200
ae4f7d9c58 added missing imports cblech 2025-05-19 21:36:10 +0200
9a5caef52f Added inventory background and fixes cblech 2025-05-19 21:35:55 +0200
15c2a84ecd Added babushka icon to project settings kziolkowski 2025-05-19 21:18:24 +0200
1094fb2142 Added tool animations to player kziolkowski 2025-05-19 21:17:50 +0200
2ab1c38de9 cleaned Inventory ui cblech 2025-05-19 17:17:01 +0200
3eb35d4e7d Rerender Harvesting and added Watering animations Felix Paul 2025-05-18 21:22:27 +0200