dhain
98b571c2aa
merged with develop
2022-06-02 15:10:31 +02:00
dhain
6959240afe
Merge branch 'develop' into dhain
...
# Conflicts:
# Assets/Scripts/ShopSlot.cs
2022-06-02 15:09:49 +02:00
dhain
ee6704abc1
added ItemStorage.cs, ItemStorageSlot.cs, ItemStorageUI.cs
...
* Inventory, InventorySlot, InventoryUI, Shop, ShopSlot, ShopUI are extending them
2022-06-02 15:08:21 +02:00
s-prechtl
52fa93fc36
Money and Day UI finished
2022-06-02 14:58:47 +02:00
s-prechtl
9e082537d8
money and daycount ui added
2022-06-02 14:48:24 +02:00
dhain
d28a1947eb
display no number in inventory when only 1 item is in the slot
2022-06-02 12:13:58 +02:00
d-hain
ce1f6ed389
added cost amount to items
...
added Shop UI
added Shop.cs
* you now can buy items and you lose the cost when bought
* shop is scrollable
added comments in Inventory.cs, InventorySlot.cs, InventoryUI.cs
now showing description when hovering over items in shop or inventory
2022-06-02 00:08:37 +02:00
j-weissen
c9416181fc
fixed clicked() override
2022-06-01 09:36:20 +02:00
s-prechtl
be04c2263c
included all meta files
2022-06-01 09:26:54 +02:00
s-prechtl
24b8e8e70a
.meta included again
2022-06-01 09:21:56 +02:00
s-prechtl
6da7cff68f
Merge remote-tracking branch 'origin/develop' into develop
2022-06-01 08:49:11 +02:00
s-prechtl
1f2c89c729
added cost field
2022-06-01 08:48:52 +02:00
dhain
bc9af1d8d5
worked on inventory hover
2022-05-20 09:44:08 +02:00
s-prechtl
59e46eb4ab
Main scene + Items
2022-05-20 09:16:15 +02:00
s-prechtl
cbb85e0117
i mecht a amoi
2022-05-20 09:12:49 +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
dhain
b902755495
Merge remote-tracking branch 'origin/develop' into develop
2022-05-20 08:57:48 +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
b9030174b6
ItemContainer.cs singleton
2022-05-20 08:51:25 +02:00
s-prechtl
6836367207
ItemContainer.cs
2022-05-20 08:48:33 +02:00
s-prechtl
f969277910
House
2022-05-20 08:36:06 +02:00
dhain
5cc9a7894b
unity scene
...
i forgor
2022-05-20 08:34:35 +02:00
dhain
db13c25920
added Hoe & Scythe Items
...
added starting Items in Inventory
2022-05-20 08:34:18 +02:00
dhain
207d07b026
Merge remote-tracking branch 'origin/develop' into develop
2022-05-20 08:25:24 +02:00
dhain
d8499fc960
MainScene canvas adjustments
2022-05-20 08:25:13 +02:00
s-prechtl
7c07d5d801
include
2022-05-20 08:21:41 +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
97b6ce7497
voigas
2022-05-19 16:54:36 +02:00
dhain
66eb5af0bb
inventory
2022-05-19 16:44:53 +02:00
dhain
d2c90c3b7f
fixes
2022-05-19 16:41:05 +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
dhain
27cf70487c
hoe
2022-05-19 16:04:13 +02:00
dhain
2ff7fc2c12
diesmal wirklich
2022-05-19 16:03:20 +02:00
dhain
25f51c2622
added Inventory system
...
added Inventory UI
changed Item to ScriptableObject
2022-05-19 15:42:07 +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
s-prechtl
e9f4f3344b
House menu ui
2022-05-19 09:51:17 +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
dhain
66756be23b
Merge remote-tracking branch 'origin/develop' into develop
...
# Conflicts:
# Assets/Scripts/PlayerController.cs
2022-05-10 00:04:07 +02:00
dhain
0d49c92c15
extended usable Items with UsableItem
2022-05-10 00:01:57 +02:00
s-prechtl
3466d25dbb
PlayerController.cs select Item
2022-05-10 00:01:21 +02:00
dhain
fb9aa4e349
Merge branch 'develop' into dhain
...
# Conflicts:
# ProjectSettings/RiderScriptEditorPersistedState.asset
2022-05-09 23:41:02 +02:00
dhain
384ce05bb7
base constructor for every Item
2022-05-09 23:39:29 +02:00
s-prechtl
d84a815d74
UsableItem.cs
2022-05-09 23:38:56 +02:00
s-prechtl
22f8a3b9e5
Merge branch 'develop' into sprechtl
2022-05-09 23:21:44 +02:00
