j-weissen
35f93ed50c
Merge remote-tracking branch 'origin/develop' into develop
2022-05-20 08:58:23 +02:00
j-weissen
a3a81eeb2a
Added Crop, Farming&Harvesting functionality (no graphics yet!)
2022-05-20 08:57:46 +02:00
dhain
770de74fbc
added when item amount is zero that item gets removed from items Dictionary
2022-05-20 08:57:43 +02:00
s-prechtl
45fd8aed5e
Merge remote-tracking branch 'origin/develop' into develop
...
# Conflicts:
# Assets/BaseTile.prefab.meta
# Assets/Scenes/MainScene.unity
# Assets/Scripts/PlayerController.cs
# Assets/Scripts/TileBehaviour.cs
# Assets/Scripts/Tiles/GrassTile.cs.meta
2022-05-20 08:19:17 +02:00
dhain
470aeff3f3
runnable
2022-05-19 16:13:53 +02:00
dhain
7a04d79aba
Merge branch 'dhain' into develop
...
# Conflicts:
# Assets/Scenes/MainScene.unity
# Assets/Scripts/PlayerController.cs
2022-05-19 16:07:18 +02:00
j-weissen
1e2ae28c12
Added TerraformingTools & functionality
2022-05-19 15:00:55 +02:00
s-prechtl
a24cb01365
Daycycle finished
2022-05-19 14:21:22 +02:00
d-hain
aacdd80fdf
added Inventory UI
...
added logic to inventory
* it is very possible to be reworked in the near future
* With
- ScriptableItem
- an own Inventory class maybe
- if necessary no Dictionary anymore
2022-05-19 02:30:21 +02:00
j-weissen
4612938b54
added Player GameObject, updated GrassTile.Clicked()
2022-05-18 23:59:49 +02:00
j-weissen
433158e658
added Tiles, basic TileBehaviour
2022-05-18 22:53:23 +02:00