dhain
|
c98713e3a7
|
meta
|
2022-06-10 08:18:27 +02:00 |
|
dhain
|
b58d337fa0
|
weg mit dem kack
|
2022-06-09 16:53:24 +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 |
|
j-weissen
|
fa82858059
|
cleanup
|
2022-06-09 16:49:50 +02:00 |
|
dhain
|
7b286bcfd9
|
day transition is now working
|
2022-06-09 16:49:15 +02:00 |
|
j-weissen
|
35ecec04ef
|
Merge branch 'jweissen' into develop
# Conflicts:
# Assets/Scripts/FishingController.cs
|
2022-06-09 16:48:38 +02:00 |
|
j-weissen
|
afaddd940c
|
Refactored to ActionInvoker.cs
|
2022-06-09 16:47:17 +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
|
6ba8615a1f
|
Fishing Balanced
|
2022-06-09 11:45:45 +02:00 |
|
s-prechtl
|
072a06aef2
|
Scene
|
2022-06-09 10:33:34 +02:00 |
|
s-prechtl
|
2412d0f9c6
|
Renaming QoL changes
|
2022-06-09 10:32:43 +02:00 |
|
s-prechtl
|
d492a9efbb
|
Deselect item on empty InventorySlot.cs clicked
|
2022-06-09 10:13:09 +02:00 |
|
s-prechtl
|
147af498c3
|
Fishing + Deselected stuff better
|
2022-06-09 10:09:04 +02:00 |
|
s-prechtl
|
1b0f890b0b
|
Bait fix
|
2022-06-09 09:56:11 +02:00 |
|
s-prechtl
|
f25892b1e8
|
Bait usage
|
2022-06-09 09:34:27 +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
|
8e64a009f5
|
finished HoverIndicator
|
2022-06-09 08:59:32 +02:00 |
|
j-weissen
|
82a07f587e
|
added split water_sprites
|
2022-06-09 07:34:30 +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 |
|
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 |
|