s-prechtl
9c31bcc303
Meta and stuff
2022-06-09 00:01:48 +02:00
s-prechtl
f8da73695c
Merge sprechtl develop
2022-06-09 00:00:26 +02:00
s-prechtl
cf8851745d
FishingController.cs finished
2022-06-08 23:55:17 +02:00
j-weissen
624432e1da
added Wheat item, changed Wheat Sprites
2022-06-08 23:53:00 +02:00
d-hain
81e91c185c
crop in inv
2022-06-08 23:44:16 +02:00
j-weissen
7ceb7e4bcb
Crops working
2022-06-08 23:32:24 +02:00
d-hain
22a4abf927
added Bait Item
2022-06-08 23:16:15 +02:00
d-hain
59b3bb4811
price
2022-06-08 22:55:40 +02:00
d-hain
ba9be3d96b
you can now sell Items with Right Mouse Click on an InventorySlot for the Item.SellPrice
...
and it gets put into the Shop for full price
renamed Item.cost to Item.price
2022-06-08 22:52:28 +02:00
s-prechtl
9e91220be4
Major Fishing changes
2022-06-08 22:19:40 +02:00
d-hain
64b25a2029
you can now undo a purchase after buying an item from the shop
2022-06-08 21:47:00 +02:00
s-prechtl
1a12d986c4
WaterTile.cs + Shovel.asset
2022-06-08 11:44:22 +02:00
s-prechtl
efc7a3deaf
Debug Log removed
2022-06-03 15:05:33 +02:00
s-prechtl
de6ac7384a
prefabs moved to resources
2022-06-03 15:02:32 +02:00
s-prechtl
8608ffd2eb
Merge branch 'develop' into sprechtl
2022-06-03 15:00:08 +02:00
j-weissen
412ef07a75
temporarily disabled HoverIndicator
2022-06-03 14:59:05 +02:00
s-prechtl
8f23732af7
ItemContainer.cs finished, Resources folder
2022-06-03 14:55:53 +02:00
s-prechtl
03a0c37e08
Merge branch 'develop' into sprechtl
2022-06-03 14:20:58 +02:00
j-weissen
74941ea9ae
added HoverIndicator (geht ned ganz)
2022-06-03 14:20:11 +02:00
s-prechtl
865fa08102
ItemContainer.cs now filling with files (not working)
2022-06-03 14:18:26 +02:00
s-prechtl
7ccf683005
shop updated
2022-06-03 13:58:49 +02:00
s-prechtl
8211a11c2c
Merge remote-tracking branch 'origin/develop' into develop
2022-06-03 12:17:38 +02:00
s-prechtl
442dd8de5b
Tools scripts deleted
2022-06-03 12:16:57 +02:00
j-weissen
7e7d9854f7
Merge branch 'develop' into jweissen
...
# Conflicts:
# Assets/Scripts/Tiles/BaseTile.cs
2022-06-03 11:09:54 +02:00
j-weissen
0288e90c78
See, it's working now (Tile sprites)
2022-06-03 11:08:25 +02:00
s-prechtl
f8c2ae1541
Sprites for WateringCan.asset and WheatSeed.asset changed
2022-06-03 11:04:12 +02:00
s-prechtl
9fcc02ae3e
Merge branch 'sprechtl' into develop
...
# Conflicts:
# Assets/Scenes/MainScene.unity
2022-06-03 11:01:50 +02:00
s-prechtl
a457924b6d
House Menu position adjustment
2022-06-03 10:59:55 +02:00
s-prechtl
127ff101d8
sleep field
2022-06-03 09:38:17 +02:00
dhain
d3387a88c9
fixed instance of object is null error when buying items in shop
2022-06-03 09:36:03 +02:00
dhain
ccb25d4335
Merge branch 'dhain' into develop
...
# Conflicts:
# Assets/Farming Asset Pack/Split Assets.meta
# Assets/Scenes/MainScene.unity
2022-06-03 09:31:35 +02:00
dhain
de6bab067e
added TODO
2022-06-03 09:30:01 +02:00
dhain
24fa26ddb2
added Item changing Sprite when hovering over Slot in Shop or Inventory
2022-06-03 09:29:24 +02:00
s-prechtl
98d191c7e8
Sprites for mouse 100% ready
2022-06-03 09:16:51 +02:00
s-prechtl
82747ed7c0
edited meta files of png to match sprite settings
2022-06-03 09:13:20 +02:00
s-prechtl
f4e44714c1
Sprites working for mouse
2022-06-03 08:49:32 +02:00
s-prechtl
2324668dda
FishingRod.asset
2022-06-03 08:32:11 +02:00
s-prechtl
fe63511825
Fishing Rod + Cursor
2022-06-03 08:29:07 +02:00
j-weissen
29de95f46a
added split tiles (fr now)
2022-06-03 08:23:11 +02:00
j-weissen
0ffbb31b39
Merge remote-tracking branch 'origin/develop' into develop
...
# Conflicts:
# Assets/Scripts/TileBehaviour.cs
2022-06-03 08:20:17 +02:00
j-weissen
71fc280d2e
improved Tiles, added Split Sprites
2022-06-03 08:19:02 +02:00
d-hain
f7b593045f
µ
2022-06-03 00:07:30 +02:00
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
