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

Merge branch 'main' into 37-sprites-for-all-game-items-and-counters

# Conflicts:
#	overcooked_simulator/game_content/environment_config.yaml
#	overcooked_simulator/game_content/player_config.yaml
#	overcooked_simulator/gui_2d_vis/images/bun.png
#	overcooked_simulator/gui_2d_vis/images/cooked_patty.png
#	overcooked_simulator/gui_2d_vis/images/cutting_board_large.png
#	overcooked_simulator/gui_2d_vis/images/lettuce.png
#	overcooked_simulator/gui_2d_vis/images/lettuce_cut.png
#	overcooked_simulator/gui_2d_vis/images/lettuce_cut_smaller.png
#	overcooked_simulator/gui_2d_vis/images/lettuce_smaller.png
#	overcooked_simulator/gui_2d_vis/images/meat.png
#	overcooked_simulator/gui_2d_vis/images/onion_cut.png
#	overcooked_simulator/gui_2d_vis/images/onion_large.png
#	overcooked_simulator/gui_2d_vis/images/onion_soup_plate.png
#	overcooked_simulator/gui_2d_vis/images/onion_soup_pot.png
#	overcooked_simulator/gui_2d_vis/images/pan.png
#	overcooked_simulator/gui_2d_vis/images/pot_smaller.png
#	overcooked_simulator/gui_2d_vis/images/raw_fish.png
#	overcooked_simulator/gui_2d_vis/images/raw_patty.png
#	overcooked_simulator/gui_2d_vis/images/sink.png
#	overcooked_simulator/gui_2d_vis/images/sink_large.png
#	overcooked_simulator/gui_2d_vis/images/tomato.png
#	overcooked_simulator/gui_2d_vis/images/tomato_cut.png
#	overcooked_simulator/gui_2d_vis/images/tomato_soup.png
#	overcooked_simulator/gui_2d_vis/visualization.yaml
#	overcooked_simulator/pygame_gui/pygame_gui.py
parents 548d72b3 c752b748
No related branches found
No related tags found
Loading
Showing
with 877 additions and 60 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment