sprechtl/Foerming
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Commit graph

  • 7e7d9854f7 Merge branch 'develop' into jweissen j-weissen 2022-06-03 11:09:54 +02:00
  • 0288e90c78 See, it's working now (Tile sprites) j-weissen 2022-06-03 11:08:25 +02:00
  • f8c2ae1541 Sprites for WateringCan.asset and WheatSeed.asset changed s-prechtl 2022-06-03 11:04:12 +02:00
  • 9fcc02ae3e Merge branch 'sprechtl' into develop s-prechtl 2022-06-03 11:01:50 +02:00
  • a457924b6d House Menu position adjustment s-prechtl 2022-06-03 10:59:55 +02:00
  • 127ff101d8 sleep field s-prechtl 2022-06-03 09:38:17 +02:00
  • d3387a88c9 fixed instance of object is null error when buying items in shop dhain 2022-06-03 09:36:03 +02:00
  • ccb25d4335 Merge branch 'dhain' into develop dhain 2022-06-03 09:31:35 +02:00
  • de6bab067e added TODO dhain 2022-06-03 09:30:01 +02:00
  • 24fa26ddb2 added Item changing Sprite when hovering over Slot in Shop or Inventory dhain 2022-06-03 09:29:24 +02:00
  • 98d191c7e8 Sprites for mouse 100% ready s-prechtl 2022-06-03 09:16:51 +02:00
  • 82747ed7c0 edited meta files of png to match sprite settings s-prechtl 2022-06-03 09:13:20 +02:00
  • f4e44714c1 Sprites working for mouse s-prechtl 2022-06-03 08:49:32 +02:00
  • 2324668dda FishingRod.asset s-prechtl 2022-06-03 08:32:11 +02:00
  • fe63511825 Fishing Rod + Cursor s-prechtl 2022-06-03 08:29:07 +02:00
  • 29de95f46a added split tiles (fr now) j-weissen 2022-06-03 08:23:11 +02:00
  • 0ffbb31b39 Merge remote-tracking branch 'origin/develop' into develop j-weissen 2022-06-03 08:20:17 +02:00
  • 71fc280d2e improved Tiles, added Split Sprites j-weissen 2022-06-03 08:19:02 +02:00
  • f7b593045f µ d-hain 2022-06-03 00:07:30 +02:00
  • 98b571c2aa merged with develop dhain 2022-06-02 15:10:31 +02:00
  • 6959240afe Merge branch 'develop' into dhain dhain 2022-06-02 15:09:49 +02:00
  • ee6704abc1 added ItemStorage.cs, ItemStorageSlot.cs, ItemStorageUI.cs * Inventory, InventorySlot, InventoryUI, Shop, ShopSlot, ShopUI are extending them dhain 2022-06-02 15:08:21 +02:00
  • 52fa93fc36 Money and Day UI finished s-prechtl 2022-06-02 14:58:47 +02:00
  • 9e082537d8 money and daycount ui added s-prechtl 2022-06-02 14:48:24 +02:00
  • d28a1947eb display no number in inventory when only 1 item is in the slot dhain 2022-06-02 12:13:58 +02:00
  • 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 d-hain 2022-06-02 00:08:37 +02:00
  • c9416181fc fixed clicked() override j-weissen 2022-06-01 09:36:20 +02:00
  • be04c2263c included all meta files s-prechtl 2022-06-01 09:26:54 +02:00
  • 24b8e8e70a .meta included again s-prechtl 2022-06-01 09:21:56 +02:00
  • 6da7cff68f Merge remote-tracking branch 'origin/develop' into develop s-prechtl 2022-06-01 08:49:11 +02:00
  • 1f2c89c729 added cost field s-prechtl 2022-06-01 08:48:52 +02:00
  • bc9af1d8d5 worked on inventory hover dhain 2022-05-20 09:44:08 +02:00
  • 59e46eb4ab Main scene + Items s-prechtl 2022-05-20 09:16:15 +02:00
  • cbb85e0117 i mecht a amoi s-prechtl 2022-05-20 09:12:49 +02:00
  • 108c7b909c added Debug.Log for Farmland and Crop j-weissen 2022-05-20 09:11:58 +02:00
  • 35f93ed50c Merge remote-tracking branch 'origin/develop' into develop j-weissen 2022-05-20 08:58:23 +02:00
  • b902755495 Merge remote-tracking branch 'origin/develop' into develop dhain 2022-05-20 08:57:48 +02:00
  • a3a81eeb2a Added Crop, Farming&Harvesting functionality (no graphics yet!) j-weissen 2022-05-20 08:57:46 +02:00
  • 770de74fbc added when item amount is zero that item gets removed from items Dictionary dhain 2022-05-20 08:57:43 +02:00
  • b9030174b6 ItemContainer.cs singleton s-prechtl 2022-05-20 08:51:25 +02:00
  • 6836367207 ItemContainer.cs s-prechtl 2022-05-20 08:48:33 +02:00
  • f969277910 House s-prechtl 2022-05-20 08:36:06 +02:00
  • 5cc9a7894b unity scene i forgor dhain 2022-05-20 08:34:35 +02:00
  • db13c25920 added Hoe & Scythe Items added starting Items in Inventory dhain 2022-05-20 08:34:18 +02:00
  • 207d07b026 Merge remote-tracking branch 'origin/develop' into develop dhain 2022-05-20 08:25:24 +02:00
  • d8499fc960 MainScene canvas adjustments dhain 2022-05-20 08:25:13 +02:00
  • 7c07d5d801 include s-prechtl 2022-05-20 08:21:41 +02:00
  • 45fd8aed5e Merge remote-tracking branch 'origin/develop' into develop s-prechtl 2022-05-20 08:19:17 +02:00
  • 97b6ce7497 voigas dhain 2022-05-19 16:54:36 +02:00
  • 66eb5af0bb inventory dhain 2022-05-19 16:44:53 +02:00
  • d2c90c3b7f fixes dhain 2022-05-19 16:41:05 +02:00
  • 470aeff3f3 runnable dhain 2022-05-19 16:13:53 +02:00
  • 7a04d79aba Merge branch 'dhain' into develop dhain 2022-05-19 16:07:18 +02:00
  • 27cf70487c hoe dhain 2022-05-19 16:04:13 +02:00
  • 2ff7fc2c12 diesmal wirklich dhain 2022-05-19 16:03:20 +02:00
  • 25f51c2622 added Inventory system added Inventory UI changed Item to ScriptableObject dhain 2022-05-19 15:42:07 +02:00
  • 1e2ae28c12 Added TerraformingTools & functionality j-weissen 2022-05-19 15:00:55 +02:00
  • 0230d07481 layers s-prechtl 2022-05-19 14:21:51 +02:00
  • a24cb01365 Daycycle finished s-prechtl 2022-05-19 14:21:22 +02:00
  • e9f4f3344b House menu ui s-prechtl 2022-05-19 09:51:17 +02:00
  • aacdd80fdf added Inventory UI added logic to inventory * it is very possible to be reworked in the near future * With - ScriptableItem - an own Inventory class maybe - if necessary no Dictionary anymore d-hain 2022-05-19 02:30:21 +02:00
  • 4612938b54 added Player GameObject, updated GrassTile.Clicked() j-weissen 2022-05-18 23:59:49 +02:00
  • 433158e658 added Tiles, basic TileBehaviour j-weissen 2022-05-18 22:53:23 +02:00
  • 66756be23b Merge remote-tracking branch 'origin/develop' into develop dhain 2022-05-10 00:04:07 +02:00
  • 0d49c92c15 extended usable Items with UsableItem dhain 2022-05-10 00:01:57 +02:00
  • 3466d25dbb PlayerController.cs select Item s-prechtl 2022-05-10 00:01:21 +02:00
  • fb9aa4e349 Merge branch 'develop' into dhain dhain 2022-05-09 23:41:02 +02:00
  • 384ce05bb7 base constructor for every Item dhain 2022-05-09 23:39:29 +02:00
  • d84a815d74 UsableItem.cs s-prechtl 2022-05-09 23:38:56 +02:00
  • 22f8a3b9e5 Merge branch 'develop' into sprechtl s-prechtl 2022-05-09 23:21:44 +02:00
  • 0a50e09f6d as s-prechtl 2022-05-09 23:20:51 +02:00
  • 4f32d5540b Merge remote-tracking branch 'origin/develop' into develop s-prechtl 2022-05-09 23:18:48 +02:00
  • 7042d5fc62 meta s-prechtl 2022-05-09 23:18:11 +02:00
  • c3166c5b64 added all Files in Items Folder added Items.cs added IUSable.cs dhain 2022-05-09 23:17:01 +02:00
  • 97819693b6 Merge branch 'dhain' into develop dhain 2022-05-09 23:14:22 +02:00
  • b3f32656ae added namespace Items to: * FishingRod.cs * Hoe.cs * Scythe.cs * WateringCan.cs * Wheat.cs * WheatSeed.cs dhain 2022-05-09 23:10:28 +02:00
  • 0554440fd5 PlayerController.cs init s-prechtl 2022-05-09 23:08:18 +02:00
  • 26ea595bfa created Items created IUsable.cs interface dhain 2022-05-09 23:06:01 +02:00
  • 12ff6e0390 DayController implemented s-prechtl 2022-05-09 23:02:02 +02:00
  • 57d3906a4d Merge branch 'develop' into jweissen j-weissen 2022-05-06 11:58:34 +02:00
  • a99eeba591 gitignore update s-prechtl 2022-05-06 11:57:20 +02:00
  • eeaf7cc11d Added GrassTile Prefab and Simple TileController j-weissen 2022-05-06 11:55:07 +02:00
  • 5320e65356 DayController.cs started implementation s-prechtl 2022-05-06 09:43:02 +02:00
  • 84c1b1f2df Added first tiles, TileController j-weissen 2022-05-06 09:08:24 +02:00
  • b29a160766
         Create README.md master Stefan Prechtl 2022-05-06 08:26:13 +02:00
  • ca0718d286 farming assets added s-prechtl 2022-05-06 08:17:48 +02:00
  • 751bae3c7f adding packages s-prechtl 2022-05-06 07:05:03 +02:00
  • 1a270d706b Projectere settinge s-prechtl 2022-05-05 14:43:49 +02:00
  • e3d0aa629d initial commit s-prechtl 2022-05-05 14:30:24 +02:00