Commit graph

32 commits

Author SHA1 Message Date
j-weissen
5f1a5e5abc Added Comments 2022-06-24 08:05:57 +02:00
j-weissen
9151d987a7 Grass Sprites now randomized 2022-06-23 14:56:39 +02:00
j-weissen
fa82858059 cleanup 2022-06-09 16:49:50 +02:00
j-weissen
afaddd940c Refactored to ActionInvoker.cs 2022-06-09 16:47:17 +02:00
s-prechtl
c06d161006 Klammer beim merge verlorn 2022-06-09 09:29:56 +02:00
s-prechtl
2311f9fdfe Merge branch 'sprechtl' into develop
# Conflicts:
#	Assets/Scripts/Tiles/FarmlandTile.cs
2022-06-09 09:28:36 +02:00
j-weissen
93809f5052 fixed SelectedItem when no item 2022-06-09 09:27:35 +02:00
s-prechtl
63acfe3807 id changed 2022-06-09 09:26:17 +02:00
j-weissen
74d6c7813c changed water sprite, removed debug logs, farmland -> grass with shovel 2022-06-09 01:05:11 +02:00
d-hain
cdd8ae7441 Items adjusted prices
fixed some Tile sheeesh
selling overflowing Items in Inventory (over 999)
2022-06-09 00:42:36 +02:00
s-prechtl
f8da73695c Merge sprechtl develop 2022-06-09 00:00:26 +02:00
j-weissen
7ceb7e4bcb Crops working 2022-06-08 23:32:24 +02:00
s-prechtl
9e91220be4 Major Fishing changes 2022-06-08 22:19:40 +02:00
s-prechtl
1a12d986c4 WaterTile.cs + Shovel.asset 2022-06-08 11:44:22 +02:00
j-weissen
412ef07a75 temporarily disabled HoverIndicator 2022-06-03 14:59:05 +02:00
j-weissen
74941ea9ae added HoverIndicator (geht ned ganz) 2022-06-03 14:20:11 +02:00
s-prechtl
7ccf683005 shop updated 2022-06-03 13:58:49 +02:00
j-weissen
0288e90c78 See, it's working now (Tile sprites) 2022-06-03 11:08:25 +02:00
j-weissen
71fc280d2e improved Tiles, added Split Sprites 2022-06-03 08:19:02 +02:00
j-weissen
c9416181fc fixed clicked() override 2022-06-01 09:36:20 +02:00
j-weissen
108c7b909c added Debug.Log for Farmland and Crop 2022-05-20 09:11:58 +02:00
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