Skip to content
Snippets Groups Projects
Commit 98464097 authored by Florian Schröder's avatar Florian Schröder
Browse files

Merge remote-tracking branch 'origin/main' into 79-info-screens-pop-ups-etc 

# Conflicts:
#	overcooked_simulator/gui_2d_vis/overcooked_gui.py
parents ec29d41c 038000bf
Branches
Tags
1 merge request!53Resolve "Info screens (pop ups etc)"
Pipeline #46130 passed
Stage: test