Commit Graph

Select branches

Hide Pull Requests

3d_character_controller

Animations

Anna

Enemy_selection_overlap

Kampf_Tooltip

Minigame_extra_click

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/damage_feedback

feature/dead_squash

feature/entity_rework

feature/farm_fight_loop

feature/fight_rework

feature/fight_system

feature/implement_quests

feature/integrate_new_fight

feature/languagetool-addon

feature/night_to_day

feature/quest_system

feature/screenshots-storyboard

feature/shaders_with_modulate

feature/spine2D_experimental

feature/trash_object_entity_removable

feature/vesna_entity

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

tmp/mock_qad_scripts

#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

#49

#50

#52

#53

#54

#8

#9

Mono Color

• 01daddee3b Made basic quest setup cblech 2025-07-07 04:40:40 +02:00
• ba512508f8 Merge pull request 'feature/farm_scene_rework' (#10) from feature/farm_scene_rework into develop Jonathan 2025-07-07 03:46:51 +02:00
• ec653aa847 readded camera ref to farming behaviour kziolkowski 2025-07-07 01:17:41 +02:00
• 9acea54f28 Added duck sprite kziolkowski 2025-07-07 00:46:57 +02:00
• 2f5296e05a Diversified field shapes kziolkowski 2025-07-06 23:48:01 +02:00
• e8a58655ad Added grass textures and field borders kziolkowski 2025-07-06 23:28:02 +02:00
• aa3789566c Duplicated sunflower field parallaxe layer to ensure seamlessness on big screens kziolkowski 2025-07-06 22:00:39 +02:00
• 9c7ae20c18 Reworked Camera controls outside scene kziolkowski 2025-07-06 21:56:15 +02:00
• ffc7ef2d61 Added Vesna and Yeli as 2D rigged chars, Chuga is still WIP Felix Paul 2025-07-06 20:22:12 +02:00
• 9f04c8819f SFX for Mavkas (Voices but more "ghostly") Added Nao 2025-07-06 20:20:03 +02:00
• 6cd7be196b SFX Wolf + Mavka Voices (when hit in battle) Added Nao 2025-07-06 20:11:50 +02:00
• ab2cf3f497 wateringcanstate uid? kziolkowski 2025-07-06 12:26:07 +02:00
• bf096aa716 visual improvements on farm scene kziolkowski 2025-07-06 12:25:44 +02:00
• 09ef508f49 Fixed field creation bug kziolkowski 2025-07-06 10:57:38 +02:00
• 6de8368414 Farm Atmos Added Nao 2025-07-05 23:23:39 +02:00
• d20085a67c SFX Water Attack Added (Vesna + Slimes) Nao 2025-07-05 23:17:58 +02:00
• a54003c658 Made ground noise texture more seamless kziolkowski 2025-07-05 23:10:23 +02:00
• 648ae8395b SFX added for Root Attack, Mavka + Vesna Nao 2025-07-05 23:01:43 +02:00
• fbad33213c Finalized new watering can mechanic with vfx and ui kziolkowski 2025-07-05 22:54:52 +02:00
• b68eb0953e SFX Duck Flügelflattern "Wings" + Schlappentornado Added Nao 2025-07-05 21:51:19 +02:00
• 35c7e9a25e WIP Wasserstand UI kziolkowski 2025-07-05 17:34:03 +02:00
• 57896e37df Fixed background music loop and added audio mixers kziolkowski 2025-07-05 15:08:23 +02:00
• 242879159a Fixed sfx binding in farming scene kziolkowski 2025-07-05 13:57:14 +02:00
• 7ef9fe53b2 Added SignalVisualizer plugin kziolkowski 2025-07-05 13:56:59 +02:00
• 600d9cfca1 Made items activate directly when picked up kziolkowski 2025-07-05 13:18:19 +02:00
• 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 +02:00
• 4a0b2cd550 Improved Inventory UI (more in the middle, adapt to viewport size, new selector image) kziolkowski 2025-07-05 12:18:28 +02:00
• ba429d7b84 wip improving inventory layout kziolkowski 2025-07-04 23:41:15 +02:00
• e33776daeb ESC closes inventory now. kziolkowski 2025-07-04 23:15:45 +02:00
• 9cfd3bd6f4 Improving farm outside scene performance kziolkowski 2025-07-02 21:36:12 +02:00
• 7eb18caaaf Added SFX for Healing magic Nao 2025-07-02 21:24:21 +02:00
• e65e82f421 Added SFX Duck & Combat, moved Cat SFX to folder "animals" Nao 2025-07-02 21:23:36 +02:00
• c36d0b5866 reduced VRAM load by more than 50% kziolkowski 2025-07-02 17:54:23 +02:00
• bcdba7b812 Fixed Vesna sliding issue kziolkowski 2025-07-02 15:48:39 +02:00
• 7467ec56d9 Fixed ordering issues in indoor scene kziolkowski 2025-06-28 17:37:39 +02:00
• 990494e8b0 Adjusted indoor speed kziolkowski 2025-06-28 17:19:41 +02:00
• c6e0cfe4d9 Fixed Button layout behaviour kziolkowski 2025-06-28 17:17:26 +02:00
• 691e613a5c Added SFX for Combat Nao 2025-06-28 17:04:20 +02:00
• 4e010220bf Improved performance of the first indoor scene kziolkowski 2025-06-28 16:13:06 +02:00
• ccc4eb759e Added new house image to farming scene kziolkowski 2025-06-21 16:09:35 +02:00
• 250f0d07ca SFX Slime Hit Variations (Pitch) Added Nao 2025-06-17 15:43:33 +02:00
• f481f5bea7 SFX Added: UI (Dialog + Confirmation), Slime Hit Nao 2025-06-17 15:39:02 +02:00
• 58c65fc928 Merge pull request 'First intro sequence with Yeli' (#9) from feature/yeli_intro into develop Jonathan 2025-06-17 02:40:12 +02:00
• 937e54e47a Merge branch 'feature/farming_visuals' into develop cblech 2025-06-16 21:03:02 +02:00
• 83c8a15e5a Added art for updated startscreen to project (but not yet to start menu scene) kziolkowski 2025-06-16 20:31:24 +02:00
• 1fcddb7349 changed export presets for new builds kziolkowski 2025-06-16 20:30:46 +02:00
• 26cae9b0f8 fixed missing ready plants kziolkowski 2025-06-15 20:11:45 +02:00
• 0ebd0c46a0 Added indoor ending kziolkowski 2025-06-15 20:05:53 +02:00
• 2226b859df Added WateringCan SFX kziolkowski 2025-06-15 19:44:16 +02:00
• 07bcab4454 Added Farming SFX kziolkowski 2025-06-15 19:37:57 +02:00
• 4c6d5350b2 Added Background music kziolkowski 2025-06-15 18:59:59 +02:00
• f2c492de54 changed label settings for InteractionArea kziolkowski 2025-06-15 18:59:50 +02:00
• e269b3ab44 WIP trying to toggle interactable colliders at runtime for fields kziolkowski 2025-06-15 18:59:38 +02:00
• 89ae347a91 Added last farming timelines and fixed some minor issues kziolkowski 2025-06-15 18:00:27 +02:00
• ddb5547b42 Updated Startscreen and added second tutorial step kziolkowski 2025-06-15 16:41:36 +02:00
• afa06d3ee2 Fixed Yeli Y sorting issue and made fields rounded kziolkowski 2025-06-15 08:38:34 +02:00
• dd656d5f5f Extended dialogic toggle kziolkowski 2025-06-15 07:49:38 +02:00
• cdb62f3c2f Added Cozy Raven Splashscreen kziolkowski 2025-06-15 07:21:56 +02:00
• b0f4592fdd Added first working timeline for yelis intro to farming scene kziolkowski 2025-06-14 19:50:54 +02:00
• 406c11b581 import statements kziolkowski 2025-06-14 10:37:23 +02:00
• 9812006234 Added Yeli sprites and dialogic test timeline as well as prefab kziolkowski 2025-06-14 10:33:43 +02:00
• b8e456f7ef moved player2D prefab kziolkowski 2025-06-14 10:29:41 +02:00
• 97e5485ef1 Added Yeli Idle and Talk animations Felix Paul 2025-05-21 02:12:36 +02:00
• c77563d38e Rerender Harvesting and added Watering animations Felix Paul 2025-05-18 21:22:27 +02:00
• c322f7667a Placeholder for Quest Fail added Nao 2025-06-02 16:06:52 +02:00
• 68be479a09 New SFX for Door added Nao 2025-06-02 15:56:36 +02:00
• dc52d80a92 SFX Quest Complete Placeholder added (need more time) Nao 2025-05-18 20:34:00 +02:00
• a84ca9c32c Farm Atmos Nighttime added Nao 2025-05-18 19:21:51 +02:00
• 6b1dd04dd5 New SFX and Forest Atmos Nighttime added Nao 2025-05-18 19:04:02 +02:00
• 72593ff7c7 SFX for kitchen added (cutlery, plates, etc) and a few renamed Nao 2025-05-18 17:52:59 +02:00
• eac135508c SFX Snoring Added Nao 2025-05-18 15:33:02 +02:00
• 72c3454728 SFX Door Open and Close added Nao 2025-05-18 15:10:08 +02:00
• 523624756e missing import files kziolkowski 2025-06-14 08:54:54 +02:00
• d7dfd03241 Deleted unused material folder kziolkowski 2025-06-14 08:51:09 +02:00
• 90cadbea07 ui elemente hinzugefügt für dialog ascheck 2025-05-27 21:11:15 +02:00
• 83e25f44cd Fixed background parallaxe effect in outdoor scene kziolkowski 2025-05-28 17:54:19 +02:00
• 31f19ad139 Code cleanup part 2 kziolkowski 2025-05-28 16:28:31 +02:00
• c6ec99e87a Project cleanup: Removed 3D scripts and scenes from project. Also renamed and moved some minor stuff. kziolkowski 2025-05-28 16:02:51 +02:00
• b8cb60aec9 Placeholder for Quest Fail added checkIfPRContentChanged-1749884192368007736/Nao's-Sounds checkIfPRContentChanged-1749880758504311652/Nao's-Sounds Nao 2025-06-02 16:06:52 +02:00
• 55a3e56791 New SFX for Door added Nao 2025-06-02 15:56:36 +02:00
• 1f17cca62d changes from build process kziolkowski 2025-05-28 15:37:04 +02:00
• 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 ascheck 2025-05-27 21:23:34 +02:00
• a53b4c4010 ui elemente hinzugefügt für dialog ascheck 2025-05-27 21:11:15 +02:00
• 3e135afecb Added StartScreen and Scene Transition script kziolkowski 2025-05-24 23:50:06 +02:00
• 25d8f217ff basic harvesting implemented kziolkowski 2025-05-24 23:16:41 +02:00
• a477f9ef4f Implemented field creation and wateringcan fill up animation kziolkowski 2025-05-24 21:47:25 +02:00
• b917fb5fbd changed player window size kziolkowski 2025-05-24 21:46:28 +02:00
• 20ed134628 Added Yeli Idle and Talk animations checkIfPRContentChanged-1749884192368007736/Animations checkIfPRContentChanged-1749880758504311652/Animations Felix Paul 2025-05-21 02:12:36 +02:00
• 47a1326292 state after magic clip done kziolkowski 2025-05-21 02:10:50 +02:00
• 708aa8cca4 State after inventory clip (farming mechanic still WIP) kziolkowski 2025-05-21 00:13:58 +02:00
• 83f4144b43 Reworked farming tools pickup animations kziolkowski 2025-05-20 23:05:26 +02:00
• 2c677a8cda Inventory resource rework and slot aspect fix kziolkowski 2025-05-20 22:27:48 +02:00
• ec5d42068e fixed generic item on ground and added icon checkIfPRContentChanged-1749884192368007736/inventory checkIfPRContentChanged-1749880758504311652/inventory inventory cblech 2025-05-20 20:42:32 +02:00
• 8fdb395ae8 Added icon to slot cblech 2025-05-20 19:48:49 +02:00
• 60928c520c Inventory implemented kziolkowski 2025-05-20 18:27:50 +02:00
• f3ed5e0ad0 Changes to ItemOnGround kziolkowski 2025-05-20 18:27:40 +02:00
• ee897db52b added swaying plants shader kziolkowski 2025-05-20 18:27:20 +02:00
• 41201d7406 Indoor room sprites added kziolkowski 2025-05-20 18:27:09 +02:00
• 267172d026 WIP adding the inventory, also state after first clip kziolkowski 2025-05-20 01:00:13 +02:00
• 917e6a5f7e Merge remote-tracking branch 'origin/inventory' into feature/farming_visuals kziolkowski 2025-05-20 00:19:42 +02:00