Jonathan/Babushka
2
0
Fork 0
Code Pull Requests 1 Releases Activity

inventory #3

Merged
kziolkowski merged 39 commits from inventory into main 2025-04-24 21:18:16 +02:00
Conversation 2 Commits 39 Files Changed 1601
+24839 -466
Jonathan commented 2025-04-08 21:33:10 +02:00
Owner
Copy Link
Copy Source
No description provided.
Jonathan added 27 commits 2025-04-08 21:33:11 +02:00
created 3D abandoned street mockup scene ec10f0e54b
Added camera preview addon 421a90ec17
Added 3D Controller 4ce0367f15
Fixed camera dc322d8943
Added basic interaction functionality 84fcec8227
Show interaction popup (<E> Label) 78471268db
created first c# setup e0b5a26ee6
a bit of restructuring, renaming, and c sharp setup 4f312209b3
Added basic inventory system 959ab68b4d
Translated some scripts from GDscript to C# d4b7c0bf45
Translated Player Scripts from GDScript to C# 7f8b444270
added 2d and 3d house prototypes f2902ad7c1
Farming part I 45d09cd618
Added Sprite Swap and Horizontal flipping to character controller d144f5c0c4
folder refactoring, plant_base adjustments a9b1c179cd
old style farming works again 26502f2d37
Fixed Pickup behaviour f08f3a7978
Spawning fields works 45a58f701b
Creating new plantable fields works bd4f7edc20
Added vesna animations 8622f2d38d
Move items c90687939c
Added open close inventory 667ef6fb9b
removed unused slots script 77591425cb
Added slot select daa53e4aef
Merge remote-tracking branch 'origin/c_sharp_setup' into inventory dacf48b9fd
Added Inventory into babushka farming scene 8c1822557c
Removed Lock files 64f039ba19
Jonathan added 9 commits 2025-04-14 17:39:01 +02:00
Vesna walking and idle animations work for all movement directions. b5dcad5614
Removed Debug.Log 6016f1cf38
Separated farming controls from vesna behvaiour and adjusted the setup ce5d2b65d3
Fields spawn on a grid 5db71adf03
Scene changes 0e775309fb
WIP reworking the field behaviour to implement watering. Broken state. c200098f0c
Merge remote-tracking branch 'origin/c_sharp_setup' into inventory 9190b2a16a
item on ground and pickup 1062193785
Added pickup error text e99b574d1f
Jonathan added 1 commit 2025-04-17 03:25:50 +02:00
item count WIP fb362e10ad
Jonathan added 2 commits 2025-04-17 16:12:11 +02:00
Added item stacking fb0c14c3f1
added autogenerated items 54b07cccad
Jonathan commented 2025-04-17 16:14:41 +02:00
Author
Owner
Copy Link
Copy Source

Ready for review

Ready for review
kziolkowski approved these changes 2025-04-18 18:09:47 +02:00
kziolkowski left a comment
Owner
Copy Link
Copy Source

Memo an mich selbst: künftige PRs kleiner halten. 1601 Dateien sind im Browser nicht reviewbar xD

Memo an mich selbst: künftige PRs kleiner halten. 1601 Dateien sind im Browser nicht reviewbar xD
kziolkowski merged commit 7d1187d218 into main 2025-04-24 21:18:16 +02:00
Sign in to join this conversation.
Reviewers
No Reviewers
kziolkowski
Labels
No items
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
ascheck (Anna Scheck) jlink kziolkowski (Katharina Ziolkowski) lkrause Nao Palurdas saderako Sanelschnitte Jonathan
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Jonathan/Babushka#3
Delete Branch "inventory"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?