Chanumask
|
115a79e930
|
fix mismatching signatures of spawn
|
2023-10-27 17:46:13 +02:00 |
|
Chanumask
|
0e5b18c812
|
Merge branch 'main' into refactor_rename
# Conflicts:
# marl_factory_grid/modules/clean_up/groups.py
# marl_factory_grid/modules/clean_up/rules.py
# marl_factory_grid/modules/destinations/rules.py
|
2023-10-27 13:12:54 +02:00 |
|
Steffen Illium
|
6011ba383e
|
Removed stale class DoneOnBreak in rules.py (machines)
|
2023-10-26 16:11:02 +02:00 |
|
Chanumask
|
0c1d0f510b
|
removed positionmix entirely (now also in collection)
|
2023-10-24 13:33:35 +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 |
|
Steffen Illium
|
8709b093b8
|
Merge branch 'remove-tiles'
# Conflicts:
# marl_factory_grid/environment/actions.py
# marl_factory_grid/environment/entity/entity.py
# marl_factory_grid/environment/factory.py
# marl_factory_grid/modules/batteries/rules.py
# marl_factory_grid/modules/clean_up/groups.py
# marl_factory_grid/modules/destinations/entitites.py
# marl_factory_grid/modules/destinations/groups.py
# marl_factory_grid/modules/destinations/rules.py
# marl_factory_grid/modules/items/rules.py
# marl_factory_grid/modules/maintenance/entities.py
# marl_factory_grid/utils/config_parser.py
# marl_factory_grid/utils/level_parser.py
# marl_factory_grid/utils/states.py
|
2023-10-17 14:03:59 +02:00 |
|
Chanumask
|
3677b7b7dc
|
WIP: removing tiles
|
2023-10-16 11:06:51 +02:00 |
|
Steffen Illium
|
e326a95bf4
|
Redone the spawn procedute and destination objects
|
2023-10-11 16:36:48 +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 |
|