Commit graph

29 commits

Author SHA1 Message Date
dhain
2ff7fc2c12 diesmal wirklich 2022-05-19 16:03:20 +02:00
dhain
25f51c2622 added Inventory system
added Inventory UI
changed Item to ScriptableObject
2022-05-19 15:42:07 +02:00
d-hain
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
2022-05-19 02:30:21 +02:00
j-weissen
433158e658 added Tiles, basic TileBehaviour 2022-05-18 22:53:23 +02:00
dhain
66756be23b Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Assets/Scripts/PlayerController.cs
2022-05-10 00:04:07 +02:00
dhain
0d49c92c15 extended usable Items with UsableItem 2022-05-10 00:01:57 +02:00
s-prechtl
3466d25dbb PlayerController.cs select Item 2022-05-10 00:01:21 +02:00
dhain
fb9aa4e349 Merge branch 'develop' into dhain
# Conflicts:
#	ProjectSettings/RiderScriptEditorPersistedState.asset
2022-05-09 23:41:02 +02:00
dhain
384ce05bb7 base constructor for every Item 2022-05-09 23:39:29 +02:00
s-prechtl
d84a815d74 UsableItem.cs 2022-05-09 23:38:56 +02:00
s-prechtl
22f8a3b9e5 Merge branch 'develop' into sprechtl 2022-05-09 23:21:44 +02:00
s-prechtl
0a50e09f6d as 2022-05-09 23:20:51 +02:00
s-prechtl
4f32d5540b Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Assets/Scripts/DayController.cs.meta
2022-05-09 23:18:48 +02:00
s-prechtl
7042d5fc62 meta 2022-05-09 23:18:11 +02:00
dhain
c3166c5b64 added all Files in Items Folder
added Items.cs
added IUSable.cs
2022-05-09 23:17:01 +02:00
dhain
97819693b6 Merge branch 'dhain' into develop 2022-05-09 23:14:22 +02:00
dhain
b3f32656ae added namespace Items to:
* FishingRod.cs
 * Hoe.cs
 * Scythe.cs
 * WateringCan.cs
 * Wheat.cs
 * WheatSeed.cs
2022-05-09 23:10:28 +02:00
s-prechtl
0554440fd5 PlayerController.cs init 2022-05-09 23:08:18 +02:00
dhain
26ea595bfa created Items
created IUsable.cs interface
2022-05-09 23:06:01 +02:00
s-prechtl
12ff6e0390 DayController implemented 2022-05-09 23:02:02 +02:00
j-weissen
57d3906a4d Merge branch 'develop' into jweissen
# Conflicts:
#	ProjectSettings/RiderScriptEditorPersistedState.asset
2022-05-06 11:58:34 +02:00
s-prechtl
a99eeba591 gitignore update 2022-05-06 11:57:20 +02:00
j-weissen
eeaf7cc11d Added GrassTile Prefab and Simple TileController 2022-05-06 11:55:07 +02:00
s-prechtl
5320e65356 DayController.cs started implementation 2022-05-06 09:43:02 +02:00
j-weissen
84c1b1f2df Added first tiles, TileController 2022-05-06 09:08:24 +02:00
s-prechtl
ca0718d286 farming assets added 2022-05-06 08:17:48 +02:00
s-prechtl
751bae3c7f adding packages 2022-05-06 07:05:03 +02:00
s-prechtl
1a270d706b Projectere settinge 2022-05-05 14:43:49 +02:00
s-prechtl
e3d0aa629d initial commit 2022-05-05 14:30:24 +02:00