377 Commits

Author SHA1 Message Date
Chanumask
ef440356e0 fixes to maintainer test 2023-11-23 15:28:47 +01:00
Chanumask
fcea1972a4 Merge branch 'main' into unit_testing
# Conflicts:
#	marl_factory_grid/modules/doors/groups.py
#	marl_factory_grid/utils/states.py
2023-11-23 12:58:12 +01:00
Chanumask
4c85cac50f maintainer test grabs temp state 2023-11-23 12:52:27 +01:00
Steffen Illium
2f29ef703c Verified Collision Checks and Rendering 2023-11-23 11:43:04 +01:00
Steffen Illium
142bbb2c0c Changed Collision Check 2023-11-23 11:07:16 +01:00
Steffen Illium
b68f9e1911 Merge branch 'main' into pypi 2023-11-22 17:52:19 +01:00
Steffen Illium
2d54212e73 removed pypirc 2023-11-22 17:47:06 +01:00
Steffen Illium
51d4d7ac9f Update .gitlab-ci.yml file 2023-11-22 17:44:03 +01:00
Steffen Illium
08e219550c Update .gitlab-ci.yml file 2023-11-22 17:24:04 +01:00
Steffen Illium
132293d0be added pypirc 2023-11-22 17:05:40 +01:00
Steffen Illium
6b398360be Update .gitlab-ci.yml file 2023-11-22 17:04:12 +01:00
Steffen Illium
175a96872f Update .gitlab-ci.yml file 2023-11-22 17:03:58 +01:00
Steffen Illium
b224d41d35 Version raise 2023-11-22 16:55:42 +01:00
Steffen Illium
0aa7afbe7e Merge remote-tracking branch 'origin/main' 2023-11-22 12:34:31 +01:00
Steffen Illium
d8a0756d34 Some Dokumentation (tools.py) 2023-11-22 12:34:16 +01:00
Steffen Illium
72a619fde4 Merge branch 'documentation' into 'main'
Documentation

See merge request mobile-ifi/fiks/EDYS!4
2023-11-22 12:12:04 +01:00
Joel Friedrich
855f53b406 Documentation 2023-11-22 12:12:04 +01:00
Steffen Illium
604c0c6f57 Fixed agent observation and inventory init 2023-11-20 14:59:37 +01:00
Steffen Illium
467cc3f793 Comments, small bugfixes removed legacy elements 2023-11-17 12:27:03 +01:00
Chanumask
3a7b727ec6 maintainer test continued 2023-11-17 12:09:25 +01:00
Steffen Illium
fea327861e moved aftermath collision check to action 2023-11-17 10:36:02 +01:00
Chanumask
0f6ede3f1f Merge branch 'main' into unit_testing 2023-11-16 19:45:52 +01:00
Chanumask
26318a7b48 maintainer test 2023-11-16 19:45:25 +01:00
Steffen Illium
6b97710a7b Fixed Doors 2023-11-16 17:28:45 +01:00
Steffen Illium
67a3f3f342 Fixed Battery Charge 2023-11-16 17:16:22 +01:00
Steffen Illium
6c27aa8eaf Movement printing and Results, state, state reset. 2023-11-16 17:08:08 +01:00
Steffen Illium
7f1d99fe18 Merge branch 'pypi' 2023-11-16 15:32:42 +01:00
Steffen Illium
c3c434a97e Results resolved. Small ADjustments 2023-11-16 15:29:07 +01:00
Chanumask
f25f90a78b Merge branch 'main' into unit_testing 2023-11-13 11:00:14 +01:00
Chanumask
961b5e36f7 started maintainer test 2023-11-13 10:59:55 +01:00
Steffen Illium
c17da78440 Update .gitlab-ci.yml file 2023-11-11 16:04:55 +01:00
Steffen Illium
93bc859161 Update .gitlab-ci.yml file 2023-11-11 16:00:29 +01:00
Steffen Illium
cb76972a5f Merge remote-tracking branch 'origin/pypi' into pypi
# Conflicts:
#	marl_factory_grid/environment/groups/mixins.py
#	setup.py
2023-11-11 15:37:04 +01:00
Steffen Illium
1dfeb7ae4a checked rule returns 2023-11-11 15:33:33 +01:00
Steffen Illium
80247cb56a eight puzzle now available, clones now available 2023-11-11 11:49:12 +01:00
Steffen Illium
b6ab6ab652 small error fixes reset sanity and self sanity almost lost 2023-11-10 17:40:27 +01:00
Chanumask
3a7592b285 Merge branch 'main' into unit_testing
# Conflicts:
#	marl_factory_grid/environment/factory.py
#	marl_factory_grid/utils/states.py
2023-11-10 14:26:45 +01:00
Steffen Illium
9b289591ba Maintainer and pos_dicts fixed. Are sets now. 2023-11-10 14:16:48 +01:00
Chanumask
789e9934fd added test hooks (like rules) 2023-11-10 12:19:52 +01:00
Chanumask
209b317105 Merge branch 'main' into unit_testing
# Conflicts:
#	marl_factory_grid/environment/factory.py
#	marl_factory_grid/utils/config_parser.py
#	marl_factory_grid/utils/states.py
2023-11-10 10:54:00 +01:00
Chanumask
3d18fe9839 added test hooks (like rules) 2023-11-10 10:43:11 +01:00
Chanumask
64c0d0e4e9 added test hooks (like rules) 2023-11-10 10:41:41 +01:00
Steffen Illium
6711a0976b Resolved some warnings and style issues 2023-11-10 09:29:54 +01:00
Steffen Illium
a9462a8b6f Added explanation for narrow_corridor.yaml 2023-11-10 06:54:38 +01:00
Steffen Illium
06a5130b25 new rules, new spawn logic, small fixes, default and narrow corridor debugged 2023-11-09 17:50:20 +01:00
Steffen Illium
9b9c6e0385 Merge branch 'refactor_rename' into 'main'
Refactor rename

See merge request mobile-ifi/fiks/EDYS!3
2023-11-02 12:05:21 +01:00
Chanumask
4a8c12a5c3 fixed render funciton and obsbuilder 2023-11-02 12:02:03 +01:00
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
acd545dc0e fixed observation,
fixed observer reporting
2023-10-30 17:27:30 +01:00
Chanumask
ea6634b187 added regex search for bound entitiy search 2023-10-30 15:03:18 +01:00