Commit graph

57 commits

Author SHA1 Message Date
dhain
acd602c85a fixed first Shop Slot
started on shop switcher button (for animal shop)
2022-06-23 15:01:13 +02:00
dhain
b0ab924037 day transition working again 2022-06-23 13:42:07 +02:00
d-hain
42c874a40e Shop -> StartElements etwas hinzugefügt
ActionInvoker -> ein Console.Log() entfernt
2022-06-23 00:12:53 +02:00
d-hain
e160867e7e Generified ElementStorage.cs and ElementStorageSlot.cs 2022-06-17 14:51:44 +02:00
d-hain
7382561f01 added StardewValley Fence Sprites
you can now place and buy fences
Fences have a collider
2022-06-16 23:26:36 +02:00
d-hain
687a37eb89 DayTransition working properly again
Animals now move randomly (but they never stop moving)
2022-06-16 14:41:24 +02:00
d-hain
3a564aa909 edge colliders on camera
animals are moving now (very bad => will get better)
set BasicTile Collider2D isTrigger to false
2022-06-10 17:51:46 +02:00
s-prechtl
8698df1ed2 wild 2022-06-10 09:14:04 +02:00
dhain
0ff64fd318 rtjhs 2022-06-10 09:02:04 +02:00
dhain
8551736b5b Merge branch 'develop' into dhain
# Conflicts:
#	Assets/Scenes/MainScene.unity
2022-06-10 08:59:57 +02:00
dhain
1d80f01994 Animations
beginning of animals
2022-06-10 08:56:29 +02:00
s-prechtl
6f8f58566c MessageView.cs no animation 2022-06-10 08:54:53 +02:00
s-prechtl
6d8233f33f MessageBox new 2022-06-10 08:25:19 +02:00
dhain
c98713e3a7 meta 2022-06-10 08:18:27 +02:00
dhain
38efeb6af6 Merge branch 'develop' into dhain
# Conflicts:
#	Assets/Scenes/MainScene.unity
#	Assets/Scripts/TileBehaviour.cs
2022-06-09 16:52:46 +02:00
dhain
7b286bcfd9 day transition is now working 2022-06-09 16:49:15 +02:00
s-prechtl
8a8f7d5dd8 MessageView Fixed 2022-06-09 16:41:21 +02:00
s-prechtl
79ac6ef9cb MessageView.cs sprites etc 2022-06-09 16:31:13 +02:00
s-prechtl
a53857c4d2 UI Scaling goes brrrrr 2022-06-09 15:19:13 +02:00
s-prechtl
b43535e154 Move ! out scene 2022-06-09 11:50:21 +02:00
s-prechtl
072a06aef2 Scene 2022-06-09 10:33:34 +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
79e86e343c main scene 2022-06-09 00:03:24 +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
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
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
7ccf683005 shop updated 2022-06-03 13:58:49 +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
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
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
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
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
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
s-prechtl
24b8e8e70a .meta included again 2022-06-01 09:21:56 +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
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