Foerming

sprechtl/Foerming

Fork 0

Commit graph

d65db7ee5f Added Main menu * Play Button * Settings Button * Quit Button dhain d-hain 2022-07-04 21:18:26 +02:00
424b70e950 no more UnityEditorInternal develop d-hain 2022-06-24 16:57:40 +02:00
830e7f0d74 TRANSITION dhain 2022-06-24 09:25:31 +02:00
97799bfb2a s dhain 2022-06-24 09:23:36 +02:00
73ded12856 failed to generify ShopUI dhain 2022-06-24 09:20:35 +02:00
e78fa38433 Merge branch 'dhain' into develop dhain 2022-06-24 08:54:42 +02:00
d60c65149c Merge remote-tracking branch 'origin/develop' into develop j-weissen 2022-06-24 08:54:08 +02:00
2d51baacd8 moved Cow.cs and Chicken.cs into Animals Folder Chicken lays eggs now every day dhain 2022-06-24 08:53:56 +02:00
0fe6f1f8dd fixed cow j-weissen 2022-06-24 08:53:52 +02:00
4a8067d3d7 NO LONGER CLICK THROUGH UI OMG dhain 2022-06-24 08:38:28 +02:00
d3a06effc5 Merge branch 'jweissen' into develop j-weissen 2022-06-24 08:07:22 +02:00
5f1a5e5abc Added Comments jweissen j-weissen 2022-06-24 08:05:57 +02:00
8dc7f78803 added chicken added bucket cow can now be milked d-hain 2022-06-24 00:49:22 +02:00
4e286d74ce cow can be milked d-hain 2022-06-23 23:59:32 +02:00
c40aec0022 Animals are placing correctly (not on house or other animal) d-hain 2022-06-23 23:16:30 +02:00
1fd629e208 added cows to the shop d-hain 2022-06-23 22:40:16 +02:00
c9cf3aade0 included Shop namspace in Inventory.cs d-hain 2022-06-23 22:40:01 +02:00
c01c592976 Undo last purchase working again Added Comments to AnimalShop, ItemShop and ShopUI classes d-hain 2022-06-23 22:24:22 +02:00
441ffb900a Animals can now be bought in AnimalShop if bought they will be placed somewhere random on the map d-hain 2022-06-23 22:18:32 +02:00
acd602c85a fixed first Shop Slot started on shop switcher button (for animal shop) dhain 2022-06-23 15:01:13 +02:00
9151d987a7 Grass Sprites now randomized j-weissen 2022-06-23 14:56:39 +02:00
f5e4c8b789 Tiles now in 2D list j-weissen 2022-06-23 14:41:14 +02:00
1f7a3a4595 Only one action can be invoked j-weissen 2022-06-23 14:39:00 +02:00
b0ab924037 day transition working again dhain 2022-06-23 13:42:07 +02:00
51ab23d3e1 fixed nullptrexception j-weissen 2022-06-23 13:41:18 +02:00
5433305b14 oba jetzt wirklich j-weissen 2022-06-23 13:35:59 +02:00
a5ded24c36 Fully refactored action handling j-weissen 2022-06-23 13:35:22 +02:00
561b56ae84 Merge remote-tracking branch 'origin/develop' into develop j-weissen 2022-06-23 02:22:22 +02:00
5d4bf8c940 ActionHandlers working for Clicks on Tiles j-weissen 2022-06-23 02:21:50 +02:00
42c874a40e Shop -> StartElements etwas hinzugefügt ActionInvoker -> ein Console.Log() entfernt d-hain 2022-06-23 00:12:53 +02:00
e160867e7e Generified ElementStorage.cs and ElementStorageSlot.cs d-hain 2022-06-17 14:51:44 +02:00
df3fad8c51 s d-hain 2022-06-16 23:28:36 +02:00
7382561f01 added StardewValley Fence Sprites you can now place and buy fences Fences have a collider d-hain 2022-06-16 23:26:36 +02:00
e0212ff174 Animal Sprite now flips in right direction when moving d-hain 2022-06-16 16:36:56 +02:00
3c0cdf14e3 animations broke, working again d-hain 2022-06-16 16:25:25 +02:00
a872e5569b added cow animations d-hain 2022-06-16 15:27:02 +02:00
2a29e5413b Animals can now move and stop and be animated to move cow now has idle and run animation d-hain 2022-06-16 15:25:54 +02:00
687a37eb89 DayTransition working properly again Animals now move randomly (but they never stop moving) d-hain 2022-06-16 14:41:24 +02:00
3a564aa909 edge colliders on camera animals are moving now (very bad => will get better) set BasicTile Collider2D isTrigger to false d-hain 2022-06-10 17:51:46 +02:00
f454e82aab animal sprite set in Start() d-hain 2022-06-10 15:50:39 +02:00
f01a969ddf Merge branch 'dhain' into develop dhain 2022-06-10 09:45:43 +02:00
f15a762a04 animal move brokey dhain 2022-06-10 09:45:18 +02:00
dcda816492 FishingController.cs adjusted sprechtl s-prechtl 2022-06-10 09:45:03 +02:00
e71b64df5a FishingController.cs finished s-prechtl 2022-06-10 09:32:11 +02:00
8698df1ed2 wild s-prechtl 2022-06-10 09:14:04 +02:00
0ff64fd318 rtjhs dhain 2022-06-10 09:02:04 +02:00
8551736b5b Merge branch 'develop' into dhain dhain 2022-06-10 08:59:57 +02:00
1d80f01994 Animations beginning of animals dhain 2022-06-10 08:56:29 +02:00
6f8f58566c MessageView.cs no animation s-prechtl 2022-06-10 08:54:53 +02:00
6d8233f33f MessageBox new s-prechtl 2022-06-10 08:25:19 +02:00
c98713e3a7 meta dhain 2022-06-10 08:18:27 +02:00
b58d337fa0 weg mit dem kack dhain 2022-06-09 16:53:24 +02:00
38efeb6af6 Merge branch 'develop' into dhain dhain 2022-06-09 16:52:46 +02:00
fa82858059 cleanup j-weissen 2022-06-09 16:49:50 +02:00
7b286bcfd9 day transition is now working dhain 2022-06-09 16:49:15 +02:00
35ecec04ef Merge branch 'jweissen' into develop j-weissen 2022-06-09 16:48:38 +02:00
afaddd940c Refactored to ActionInvoker.cs j-weissen 2022-06-09 16:47:17 +02:00
8a8f7d5dd8 MessageView Fixed s-prechtl 2022-06-09 16:41:21 +02:00
79ac6ef9cb MessageView.cs sprites etc s-prechtl 2022-06-09 16:31:13 +02:00
a53857c4d2 UI Scaling goes brrrrr s-prechtl 2022-06-09 15:19:13 +02:00
b43535e154 Move ! out scene s-prechtl 2022-06-09 11:50:21 +02:00
6ba8615a1f Fishing Balanced s-prechtl 2022-06-09 11:45:45 +02:00
072a06aef2 Scene s-prechtl 2022-06-09 10:33:34 +02:00
2412d0f9c6 Renaming QoL changes s-prechtl 2022-06-09 10:32:43 +02:00
d492a9efbb Deselect item on empty InventorySlot.cs clicked s-prechtl 2022-06-09 10:13:09 +02:00
147af498c3 Fishing + Deselected stuff better s-prechtl 2022-06-09 10:09:04 +02:00
1b0f890b0b Bait fix s-prechtl 2022-06-09 09:56:11 +02:00
f25892b1e8 Bait usage s-prechtl 2022-06-09 09:34:27 +02:00
c06d161006 Klammer beim merge verlorn s-prechtl 2022-06-09 09:29:56 +02:00
2311f9fdfe Merge branch 'sprechtl' into develop s-prechtl 2022-06-09 09:28:36 +02:00
93809f5052 fixed SelectedItem when no item j-weissen 2022-06-09 09:27:35 +02:00
63acfe3807 id changed s-prechtl 2022-06-09 09:26:17 +02:00
8e64a009f5 finished HoverIndicator j-weissen 2022-06-09 08:59:32 +02:00
82a07f587e added split water_sprites j-weissen 2022-06-09 07:34:30 +02:00
74d6c7813c changed water sprite, removed debug logs, farmland -> grass with shovel j-weissen 2022-06-09 01:05:11 +02:00
cdd8ae7441 Items adjusted prices fixed some Tile sheeesh selling overflowing Items in Inventory (over 999) d-hain 2022-06-09 00:42:36 +02:00
79e86e343c main scene s-prechtl 2022-06-09 00:03:24 +02:00
9c31bcc303 Meta and stuff s-prechtl 2022-06-09 00:01:48 +02:00
f8da73695c Merge sprechtl develop s-prechtl 2022-06-09 00:00:26 +02:00
cf8851745d FishingController.cs finished s-prechtl 2022-06-08 23:55:17 +02:00
624432e1da added Wheat item, changed Wheat Sprites j-weissen 2022-06-08 23:53:00 +02:00
81e91c185c crop in inv d-hain 2022-06-08 23:44:16 +02:00
7ceb7e4bcb Crops working j-weissen 2022-06-08 23:32:24 +02:00
22a4abf927 added Bait Item d-hain 2022-06-08 23:16:15 +02:00
59b3bb4811 price d-hain 2022-06-08 22:55:40 +02:00
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 d-hain 2022-06-08 22:52:28 +02:00
9e91220be4 Major Fishing changes s-prechtl 2022-06-08 22:19:40 +02:00
64b25a2029 you can now undo a purchase after buying an item from the shop d-hain 2022-06-08 21:47:00 +02:00
1a12d986c4 WaterTile.cs + Shovel.asset s-prechtl 2022-06-08 11:44:22 +02:00
efc7a3deaf Debug Log removed s-prechtl 2022-06-03 15:05:33 +02:00
de6ac7384a prefabs moved to resources s-prechtl 2022-06-03 15:02:32 +02:00
8608ffd2eb Merge branch 'develop' into sprechtl s-prechtl 2022-06-03 15:00:08 +02:00
412ef07a75 temporarily disabled HoverIndicator j-weissen 2022-06-03 14:59:05 +02:00
8f23732af7 ItemContainer.cs finished, Resources folder s-prechtl 2022-06-03 14:55:53 +02:00
03a0c37e08 Merge branch 'develop' into sprechtl s-prechtl 2022-06-03 14:20:58 +02:00
74941ea9ae added HoverIndicator (geht ned ganz) j-weissen 2022-06-03 14:20:11 +02:00
865fa08102 ItemContainer.cs now filling with files (not working) s-prechtl 2022-06-03 14:18:26 +02:00
7ccf683005 shop updated s-prechtl 2022-06-03 13:58:49 +02:00
8211a11c2c Merge remote-tracking branch 'origin/develop' into develop s-prechtl 2022-06-03 12:17:38 +02:00
442dd8de5b Tools scripts deleted s-prechtl 2022-06-03 12:16:57 +02:00