14 Commits

Author SHA1 Message Date
Chanumask
ee4d29d50b Merge branch 'main' into refactor_rename
# Conflicts:
#	marl_factory_grid/configs/default_config.yaml
#	marl_factory_grid/environment/entity/object.py
2023-10-31 10:28:25 +01:00
Steffen Illium
374a38971a fixed names and function, dirtspawn and item spawn 2023-10-30 11:11:35 +01:00
Chanumask
b13dff925b bugfixes 2023-10-27 13:08:01 +02:00
Chanumask
0c1d0f510b removed positionmix entirely (now also in collection) 2023-10-24 13:33:35 +02:00
Chanumask
c4ffdb4e44 object and objects are now private 2023-10-23 16:44:03 +02:00
Chanumask
161d04d15c Merge branch 'main' into refactor_rename
# Conflicts:
#	marl_factory_grid/environment/entity/entity.py
#	marl_factory_grid/modules/destinations/entitites.py
#	marl_factory_grid/modules/doors/entitites.py
#	marl_factory_grid/modules/items/groups.py
2023-10-20 15:39:01 +02:00
Chanumask
d3147b9ff6 WIP: collection, entities, objects 2023-10-20 15:11:35 +02:00
Steffen Illium
7a1d3f84f1 no more tiles no more floor 2023-10-20 14:36:23 +02:00
Chanumask
8d6dcd70ae WIP: object, entity rework 2023-10-19 17:25:31 +02:00
Chanumask
3677b7b7dc WIP: removing tiles 2023-10-16 11:06:51 +02:00
Steffen Illium
714e07a816 New Szenario "Two_Rooms_One_Door" 2023-09-01 13:04:54 +02:00
Steffen Illium
9135a69da6 New Szenario "Two_Rooms_One_Door" 2023-07-12 15:59:21 +02:00
Steffen Illium
836495a884 Machines 2023-07-06 12:01:25 +02:00
Steffen Illium
d11b1a8172 renaming 2023-06-21 11:28:36 +02:00