Skip to content
Snippets Groups Projects
Commit ca473edf authored by Fabian Heinrich's avatar Fabian Heinrich
Browse files

Merge branch 'main' into 81-gui-player-management 

# Conflicts:
#	overcooked_simulator/gui_2d_vis/drawing.py
#	overcooked_simulator/gui_2d_vis/overcooked_gui.py
#	overcooked_simulator/overcooked_environment.py
#	overcooked_simulator/utils.py
#	tests/test_start.py
parents a77b87a3 a9290be8
No related branches found
No related tags found
1 merge request!44Resolve "GUI Player Management"
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1429 additions and 248 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment