Labels Milestones

New Pull Request

feature/entity_rework #52

Merged

Jonathan merged 7 commits from feature/entity_rework into develop 4 months ago

Conversation 0 Commits 7 Files Changed 38

7 Commits (develop)

Author	SHA1	Message	Date
Katharina Ziolkowski	0dfbd73978	Reverted ItemOnGround to make everything compile again	4 months ago
Katharina Ziolkowski	8a93b00e72	Merge branch 'develop' into feature/entity_rework ... # Conflicts: # scenes/scene_credits.tscn # scenes/scene_farm_outside_2d.tscn # scenes/scene_fight_world_room.tscn # scenes/scene_indoor_vesnas_room.tscn # scenes/scene_outside_beets.tscn # scripts/CSharp/Common/Farming/PlantBehaviour2D.cs	4 months ago
Katharina Ziolkowski	ba7d550c3f	Implemented Save and Load functionality	4 months ago
Katharina Ziolkowski	b65a3bbd6d	Managed the freeing of entityplacers. Also cleaned up EntityManager	4 months ago
Katharina Ziolkowski	bcbc074c86	First adjustments to the Entity System to make it work with different types	4 months ago
jonathan	745f54b375	WIP	4 months ago
jonathan	59d313d97d	Added basic entity scripts	5 months ago