Commit graph

134 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
f5e4c8b789 Tiles now in 2D list 2022-06-23 14:41:14 +02:00
j-weissen
1f7a3a4595 Only one action can be invoked 2022-06-23 14:39:00 +02:00
dhain
b0ab924037 day transition working again 2022-06-23 13:42:07 +02:00
j-weissen
51ab23d3e1 fixed nullptrexception 2022-06-23 13:41:18 +02:00
j-weissen
5433305b14 oba jetzt wirklich 2022-06-23 13:35:59 +02:00
j-weissen
a5ded24c36 Fully refactored action handling 2022-06-23 13:35:22 +02:00
j-weissen
561b56ae84 Merge remote-tracking branch 'origin/develop' into develop 2022-06-23 02:22:22 +02:00
j-weissen
5d4bf8c940 ActionHandlers working for Clicks on Tiles 2022-06-23 02:21:50 +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
e0212ff174 Animal Sprite now flips in right direction when moving 2022-06-16 16:36:56 +02:00
d-hain
3c0cdf14e3 animations broke, working again 2022-06-16 16:25:25 +02:00
d-hain
2a29e5413b Animals can now move and stop and be animated to move
cow now has idle and run animation
2022-06-16 15:25:54 +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
d-hain
f454e82aab animal sprite set in Start() 2022-06-10 15:50:39 +02:00
dhain
f01a969ddf Merge branch 'dhain' into develop 2022-06-10 09:45:43 +02:00
dhain
f15a762a04 animal move brokey 2022-06-10 09:45:18 +02:00
s-prechtl
dcda816492 FishingController.cs adjusted 2022-06-10 09:45:03 +02:00
s-prechtl
e71b64df5a FishingController.cs finished 2022-06-10 09:32:11 +02:00
s-prechtl
8698df1ed2 wild 2022-06-10 09:14: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
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
79ac6ef9cb MessageView.cs sprites etc 2022-06-09 16:31:13 +02:00
s-prechtl
6ba8615a1f Fishing Balanced 2022-06-09 11:45:45 +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
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
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