Jonathan

/

Babushka

inventory #3

Merged

kziolkowski merged 39 commits from inventory into main

Jonathan commented

Owner

There is no content yet.

Jonathan added 27 commits

ec10f0e54b created 3D abandoned street mockup scene

421a90ec17 Added camera preview addon

4ce0367f15 Added 3D Controller

dc322d8943 Fixed camera

84fcec8227 Added basic interaction functionality

78471268db Show interaction popup (<E> Label)

e0b5a26ee6 created first c# setup

4f312209b3 a bit of restructuring, renaming, and c sharp setup

959ab68b4d Added basic inventory system

d4b7c0bf45 Translated some scripts from GDscript to C#

7f8b444270 Translated Player Scripts from GDScript to C#

f2902ad7c1 added 2d and 3d house prototypes

45d09cd618 Farming part I

d144f5c0c4 Added Sprite Swap and Horizontal flipping to character controller

a9b1c179cd folder refactoring, plant_base adjustments

26502f2d37 old style farming works again

f08f3a7978 Fixed Pickup behaviour

45a58f701b Spawning fields works

bd4f7edc20 Creating new plantable fields works

8622f2d38d Added vesna animations

c90687939c Move items

667ef6fb9b Added open close inventory

77591425cb removed unused slots script

daa53e4aef Added slot select

dacf48b9fd Merge remote-tracking branch 'origin/c_sharp_setup' into inventory

8c1822557c Added Inventory into babushka farming scene

64f039ba19 Removed Lock files

Jonathan added 9 commits

b5dcad5614 Vesna walking and idle animations work for all movement directions.

6016f1cf38 Removed Debug.Log

ce5d2b65d3 Separated farming controls from vesna behvaiour and adjusted the setup

5db71adf03 Fields spawn on a grid

0e775309fb Scene changes

c200098f0c WIP reworking the field behaviour to implement watering. Broken state.

9190b2a16a Merge remote-tracking branch 'origin/c_sharp_setup' into inventory

1062193785 item on ground and pickup

e99b574d1f Added pickup error text

Jonathan added 1 commit

fb362e10ad item count WIP

Jonathan added 2 commits

fb0c14c3f1 Added item stacking

54b07cccad added autogenerated items

Jonathan commented

Poster

Owner

Ready for review

kziolkowski approved these changes

kziolkowski left a comment

Owner

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

kziolkowski merged commit 7d1187d218 into main 9 months ago

kziolkowski referenced this issue from a commit

Merge pull request 'inventory' (#3) from inventory into main

Reviewers

kziolkowski approved these changes

The pull request has been merged as 7d1187d218.

Sign in to join this conversation.

No Label

No Milestone

No Assignees

2 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: Jonathan/Babushka#3