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

4261789f13 SFX Quest Complete Placeholder added (need more time) Nao 2025-05-18 20:34:00 +0200
ce18c89c09 Farm Atmos Nighttime added Nao 2025-05-18 19:21:51 +0200
7643cccebf New SFX and Forest Atmos Nighttime added Nao 2025-05-18 19:04:02 +0200
7e4d733d7c SFX for kitchen added (cutlery, plates, etc) and a few renamed Nao 2025-05-18 17:52:59 +0200
1dcd900737 SFX Snoring Added Nao 2025-05-18 15:33:02 +0200
74c3540c96 SFX Door Open and Close added Nao 2025-05-18 15:10:08 +0200
6d80253d9c import updates to shaders and animations kziolkowski 2025-05-18 13:05:35 +0200
1b7c35879c Merge remote-tracking branch 'origin/Animations' into farming_mechanic checkIfPRContentChanged-1749884192368007736/farming_mechanic checkIfPRContentChanged-1749880758504311652/farming_mechanic kziolkowski 2025-05-18 12:34:21 +0200
ff426b0494 Initial Farming setup complete kziolkowski 2025-05-18 12:32:56 +0200
90616537bc Watering fields kziolkowski 2025-05-18 11:44:33 +0200
0f8eb244e9 planting / growth works again kziolkowski 2025-05-17 19:04:46 +0200
38fdad7690 removed print statements kziolkowski 2025-05-17 18:24:15 +0200
0de6bc0c04 the most beautiful grid of fields you can imagine kziolkowski 2025-05-17 18:23:35 +0200
fc2d6592a2 Added Vesna animations with tools Felix Paul 2025-05-17 17:47:52 +0200
222c10fe0a limited field creation to specified shape kziolkowski 2025-05-17 17:40:15 +0200
8af825bc18 InteractionAreas are now bound to SpriteSwitchers and farming tool interaction works kziolkowski 2025-05-17 16:38:32 +0200
f7684b6c2a Deleted unused kenney assets kziolkowski 2025-05-17 14:02:20 +0200
f9a3a8e389 generated import files for art assets kziolkowski 2025-05-17 13:49:07 +0200
6ad8fb00bd imported various art assets from owncloud kziolkowski 2025-05-17 13:47:54 +0200
c4dbc104d4 music files added kziolkowski 2025-05-17 13:41:42 +0200
77c0babdca minor changes after merge kziolkowski 2025-05-17 13:37:56 +0200
aa5a3483bb Merge remote-tracking branch 'origin/Nao's-Sounds' into farming_mechanic kziolkowski 2025-05-17 13:31:21 +0200
68b6031da1 Merge remote-tracking branch 'origin/Animations' into farming_mechanic kziolkowski 2025-05-17 13:30:58 +0200
4afb02440c Reworking 2D interactions kziolkowski 2025-05-16 23:16:27 +0200
de5657a9cd More SFX Added Nao 2025-05-15 19:06:27 +0200
ff85b67087 Made interaction area 2d work - and farming/growing work again. kziolkowski 2025-05-14 23:12:14 +0200
6f3d843818 SFX and Atmos added (with variations) Nao 2025-05-14 19:58:03 +0200
20f8eaaebd Added Vesna 2D image sequences Felix Paul 2025-05-14 12:48:37 +0200
69848e77c9 Added PickUp and Interact (Back) animations Felix Paul 2025-05-12 17:57:12 +0200
366923699c WIP 2D rework kziolkowski 2025-05-12 00:16:13 +0200
2a7f39e3fe Adjusted movement and included collider collisions as a constraint to the player kziolkowski 2025-05-11 23:20:35 +0200
296fed6e08 Added fields kziolkowski 2025-05-10 16:33:35 +0200
1af04631c5 Added 2d outdoor scene with parallaxe and mockup background kziolkowski 2025-05-10 16:29:23 +0200
9ec1bcab97 Added 2 animations Felix Paul 2025-05-05 20:24:26 +0200
d11fc9f1f2 Cleaned up house mockup outline and removed spammy debug log kziolkowski 2025-04-30 18:49:46 +0200
16a65f7155 added flat indoor test and skybox to 3d test kziolkowski 2025-04-30 18:43:18 +0200
0fcc425ace built first 2d indoor scene + added kitchen kziolkowski 2025-04-30 17:36:38 +0200
21685d60d5 Added Vesna animations Felix Paul 2025-04-28 20:15:39 +0200
752cdb1502 Added new how sprite kziolkowski 2025-04-27 10:09:11 +0200
8299998a0f Added fence to the left part of the farm checkIfPRContentChanged-1749884192368007736/c_sharp_setup checkIfPRContentChanged-1749880758504311652/c_sharp_setup kziolkowski 2025-04-26 15:15:38 +0200
5ea6431216 Added tree prefabs and a forest border around the farm kziolkowski 2025-04-26 14:51:56 +0200
7cccd40290 Test Felix Paul 2025-04-25 21:19:04 +0200
762a694be3 Spawning and watering is now bound to the cursor position (kinda) kziolkowski 2025-04-25 00:13:50 +0200
339428c312 Basic watering functionality implemented kziolkowski 2025-04-24 23:36:23 +0200
7e19268847 Merge remote-tracking branch 'origin/main' into c_sharp_setup kziolkowski 2025-04-24 21:22:56 +0200
20b37de108 generated files kziolkowski 2025-04-24 21:22:14 +0200
7d1187d218 Merge pull request 'inventory' (#3) from inventory into main checkIfPRContentChanged-1749884192368007736/main checkIfPRContentChanged-1749880758504311652/main main kziolkowski 2025-04-24 21:18:13 +0200
71ca6c3305 World transision WIP checkIfPRContentChanged-1749884192368007736/level_transition checkIfPRContentChanged-1749880758504311652/level_transition level_transition cblech 2025-04-21 15:31:01 +0200
1782ff91b4 Scene Restructuring cblech 2025-04-17 17:47:20 +0200
54b07cccad added autogenerated items #3 cblech 2025-04-17 16:10:31 +0200
fb0c14c3f1 Added item stacking cblech 2025-04-17 16:10:12 +0200
fb362e10ad item count WIP cblech 2025-04-17 03:24:31 +0200
c73d3ff370 Reworked the fieldservice kziolkowski 2025-04-14 18:00:10 +0200
e99b574d1f Added pickup error text cblech 2025-04-14 17:36:29 +0200
1062193785 item on ground and pickup cblech 2025-04-14 16:49:29 +0200
9190b2a16a Merge remote-tracking branch 'origin/c_sharp_setup' into inventory cblech 2025-04-14 04:53:29 +0200
c200098f0c WIP reworking the field behaviour to implement watering. Broken state. kziolkowski 2025-04-14 00:08:19 +0200
0e775309fb Scene changes kziolkowski 2025-04-13 15:01:49 +0200
5db71adf03 Fields spawn on a grid kziolkowski 2025-04-13 14:56:25 +0200
ce5d2b65d3 Separated farming controls from vesna behvaiour and adjusted the setup kziolkowski 2025-04-13 14:35:14 +0200
6016f1cf38 Removed Debug.Log kziolkowski 2025-04-09 18:18:19 +0200
b5dcad5614 Vesna walking and idle animations work for all movement directions. kziolkowski 2025-04-09 18:14:05 +0200
64f039ba19 Removed Lock files cblech 2025-04-07 22:17:55 +0200
8c1822557c Added Inventory into babushka farming scene cblech 2025-04-07 19:59:55 +0200
dacf48b9fd Merge remote-tracking branch 'origin/c_sharp_setup' into inventory cblech 2025-04-07 18:44:38 +0200
daa53e4aef Added slot select cblech 2025-04-07 18:43:56 +0200
77591425cb removed unused slots script cblech 2025-04-07 02:56:08 +0200
667ef6fb9b Added open close inventory cblech 2025-04-07 02:52:57 +0200
c90687939c Move items cblech 2025-04-07 02:10:59 +0200
8622f2d38d Added vesna animations kziolkowski 2025-04-07 00:17:50 +0200
bd4f7edc20 Creating new plantable fields works kziolkowski 2025-04-06 23:22:05 +0200
45a58f701b Spawning fields works kziolkowski 2025-04-06 23:13:25 +0200
f08f3a7978 Fixed Pickup behaviour kziolkowski 2025-04-06 22:03:13 +0200
26502f2d37 old style farming works again kziolkowski 2025-04-06 20:50:55 +0200
a9b1c179cd folder refactoring, plant_base adjustments kziolkowski 2025-04-06 18:46:59 +0200
d144f5c0c4 Added Sprite Swap and Horizontal flipping to character controller kziolkowski 2025-04-06 15:06:22 +0200
45d09cd618 Farming part I kziolkowski 2025-04-04 00:22:35 +0200
f2902ad7c1 added 2d and 3d house prototypes kziolkowski 2025-03-30 23:25:37 +0200
7f8b444270 Translated Player Scripts from GDScript to C# kziolkowski 2025-03-27 23:12:16 +0100
d4b7c0bf45 Translated some scripts from GDscript to C# kziolkowski 2025-03-26 00:26:29 +0100
959ab68b4d Added basic inventory system cblech 2025-03-25 19:39:00 +0100
4f312209b3 a bit of restructuring, renaming, and c sharp setup kziolkowski 2025-03-24 21:55:34 +0100
e0b5a26ee6 created first c# setup kziolkowski 2025-03-21 19:50:01 +0100
77a7441400 Added help box checkIfPRContentChanged-1749884192368007736/hint_box checkIfPRContentChanged-1749880758504311652/hint_box hint_box cblech 2025-01-20 19:30:43 +0100
8375598ecd Added test for Dialogic Choices checkIfPRContentChanged-1749884192368007736/choise_detection checkIfPRContentChanged-1749880758504311652/choise_detection choise_detection cblech 2025-01-20 16:47:07 +0100
d8b427de8f WIP cblech 2024-12-24 06:57:00 +0100
78471268db Show interaction popup (<E> Label) checkIfPRContentChanged-1749884192368007736/interactions checkIfPRContentChanged-1749880758504311652/interactions #2 interactions cblech 2024-12-20 20:34:10 +0100
84fcec8227 Added basic interaction functionality cblech 2024-12-20 16:28:02 +0100
dc322d8943 Fixed camera cblech 2024-12-20 14:52:24 +0100
a0eac2cde8 Dialogic First Test checkIfPRContentChanged-1749884192368007736/Dialogic-Test checkIfPRContentChanged-1749880758504311652/Dialogic-Test Sanelschnitte 2024-12-09 18:51:42 +0100
4ce0367f15 Added 3D Controller checkIfPRContentChanged-1749884192368007736/3d_character_controller checkIfPRContentChanged-1749880758504311652/3d_character_controller #1 3d_character_controller cblech 2024-12-02 18:50:26 +0100
421a90ec17 Added camera preview addon cblech 2024-12-02 18:49:36 +0100
ec10f0e54b created 3D abandoned street mockup scene checkIfPRContentChanged-1749884192368007736/kathi_mockups checkIfPRContentChanged-1749880758504311652/kathi_mockups kziolkowski 2024-11-12 22:42:34 +0100
cbcbcbbcee abandoned street mockup done kziolkowski 2024-11-11 23:33:37 +0100
dde4f18305 generated project changes kziolkowski 2024-11-11 22:37:43 +0100
267a0b9556 renamed old sprites kziolkowski 2024-11-11 22:37:01 +0100
5ea5e5547c Added basic dialogic translation cblech 2024-10-28 12:27:17 +0100
d231bb0773 Added Dialogic and a test dialog cblech 2024-10-28 12:06:03 +0100
ea20332b4f Made very basic graphics test scene cblech 2024-10-27 21:31:14 +0100
6090e7b17b audio testing setup cblech 2024-10-03 13:54:39 +0200