# Conflicts:
#	.gitlab-ci.yml

# Conflicts:
#	overcooked_simulator/gui_2d_vis/overcooked_gui.py
#	overcooked_simulator/overcooked_environment.py

Resolve "gym env"

Closes #86

See merge request scs/cocosy/overcooked-simulator!52

Counter interaction is not stopped on movement at all, but only if the player is not in reach anymore.

Can add bots to study.

Resolve "Beep on button for audio sync"

See merge request scs/cocosy/overcooked-simulator!61

Fixed finishing study. Button did not show properly, now does. last level bool is sent when connecting to game

# Conflicts:
#	overcooked_simulator/gui_2d_vis/overcooked_gui.py

# Conflicts:
#	overcooked_simulator/gui_2d_vis/overcooked_gui.py

- Can be used via main with flag

Resolve "Controller Support"

Closes #80

See merge request scs/cocosy/overcooked-simulator!45