Commit graph

15 commits

Author SHA1 Message Date
dhain
e78fa38433 Merge branch 'dhain' into develop
# Conflicts:
#	Assets/Scripts/Cow.cs
2022-06-24 08:54:42 +02:00
j-weissen
d60c65149c Merge remote-tracking branch 'origin/develop' into develop 2022-06-24 08:54:08 +02:00
dhain
2d51baacd8 moved Cow.cs and Chicken.cs into Animals Folder
Chicken lays eggs now every day
2022-06-24 08:53:56 +02:00
j-weissen
0fe6f1f8dd fixed cow 2022-06-24 08:53:52 +02:00
dhain
4a8067d3d7 NO LONGER CLICK THROUGH UI OMG 2022-06-24 08:38:28 +02:00
j-weissen
d3a06effc5 Merge branch 'jweissen' into develop
# Conflicts:
#	Assets/Scripts/Actions/ActionManager.cs
2022-06-24 08:07:22 +02:00
j-weissen
5f1a5e5abc Added Comments 2022-06-24 08:05:57 +02:00
d-hain
8dc7f78803 added chicken
added bucket
cow can now be milked
2022-06-24 00:49:22 +02:00
d-hain
4e286d74ce cow can be milked 2022-06-23 23:59:32 +02:00
j-weissen
1f7a3a4595 Only one action can be invoked 2022-06-23 14:39:00 +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