-
- Downloads
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
Showing
- overcooked_simulator/counters.py 10 additions, 6 deletionsovercooked_simulator/counters.py
- overcooked_simulator/game_content/environment_config.yaml 2 additions, 5 deletionsovercooked_simulator/game_content/environment_config.yaml
- overcooked_simulator/game_content/layouts/basic.layout 9 additions, 11 deletionsovercooked_simulator/game_content/layouts/basic.layout
- overcooked_simulator/game_content/layouts/empty.layout 7 additions, 3 deletionsovercooked_simulator/game_content/layouts/empty.layout
- overcooked_simulator/game_content/player_config.yaml 1 addition, 1 deletionovercooked_simulator/game_content/player_config.yaml
- overcooked_simulator/gui_2d_vis/__init__.py 0 additions, 0 deletionsovercooked_simulator/gui_2d_vis/__init__.py
- overcooked_simulator/gui_2d_vis/game_colors.py 0 additions, 0 deletionsovercooked_simulator/gui_2d_vis/game_colors.py
- overcooked_simulator/gui_2d_vis/gui_theme.json 49 additions, 0 deletionsovercooked_simulator/gui_2d_vis/gui_theme.json
- overcooked_simulator/gui_2d_vis/images/pixel_cook.png 0 additions, 0 deletionsovercooked_simulator/gui_2d_vis/images/pixel_cook.png
- overcooked_simulator/gui_2d_vis/images/plate.png 0 additions, 0 deletionsovercooked_simulator/gui_2d_vis/images/plate.png
- overcooked_simulator/gui_2d_vis/images/plate_clean.png 0 additions, 0 deletionsovercooked_simulator/gui_2d_vis/images/plate_clean.png
- overcooked_simulator/gui_2d_vis/images/plate_dirty.png 0 additions, 0 deletionsovercooked_simulator/gui_2d_vis/images/plate_dirty.png
- overcooked_simulator/gui_2d_vis/images/pot.png 0 additions, 0 deletionsovercooked_simulator/gui_2d_vis/images/pot.png
- overcooked_simulator/gui_2d_vis/images/tomato.png 0 additions, 0 deletionsovercooked_simulator/gui_2d_vis/images/tomato.png
- overcooked_simulator/gui_2d_vis/images/tomato_cut.png 0 additions, 0 deletionsovercooked_simulator/gui_2d_vis/images/tomato_cut.png
- overcooked_simulator/gui_2d_vis/images/tomato_soup.png 0 additions, 0 deletionsovercooked_simulator/gui_2d_vis/images/tomato_soup.png
- overcooked_simulator/gui_2d_vis/overcooked_gui.py 755 additions, 0 deletionsovercooked_simulator/gui_2d_vis/overcooked_gui.py
- overcooked_simulator/gui_2d_vis/visualization.yaml 7 additions, 0 deletionsovercooked_simulator/gui_2d_vis/visualization.yaml
- overcooked_simulator/main.py 2 additions, 5 deletionsovercooked_simulator/main.py
- overcooked_simulator/overcooked_environment.py 35 additions, 29 deletionsovercooked_simulator/overcooked_environment.py
Loading
Please register or sign in to comment