Skip to content
Snippets Groups Projects
  1. Feb 15, 2024
  2. Feb 13, 2024
  3. Feb 01, 2024
  4. Jan 30, 2024
  5. Jan 29, 2024
  6. Jan 28, 2024
    • Florian Schröder's avatar
      Update command instructions and enhance error handling · 239e7093
      Florian Schröder authored
      The README.md file has been updated with revised instructions on initiating game server and GUI, specifically the inclusion of manager_ids as arguments. The argument type for manager_ids in utils.py is also altered from list to string. Exception handling in overcooked_gui.py has been improved to explicitly throw a value error when encountering forbidden requests.
      239e7093
    • Florian Schröder's avatar
      Add manager ID argument to Overcooked simulator · 8d82c086
      Florian Schröder authored
      An optional argument for the list of manager IDs was added across the Overcooked simulator. These IDs are now used for authorization purposes when creating environments. Unauthorized attempts now return HTTP error 403. This helps enhance security and control over environment management in the simulation.
      8d82c086
  7. Jan 27, 2024
    • Florian Schröder's avatar
      Refactor 2D visualization and GUI components · fe277e48
      Florian Schröder authored
      This commit provides a significant overhaul of various aspects within the overcooked_simulator's 2D visualization and GUI components. The changes include adjusting the game window and grid size, simplifying the drawing methods by removing redundancy, and enhancing the theme configuration for the GUI. This makes the code cleaner and easier to maintain, besides improving the visual style of the GUI.
      fe277e48
  8. Jan 26, 2024
    • Florian Schröder's avatar
      Add CookingCounter progress and raise exception for undefined counter types · 8ede781a
      Florian Schröder authored
      The CookingCounter is now included in the list of counters for which we calculate progress. Additionally, if a counter type is not defined in the configuration, a ValueError will be raised. Unnecessary imports were also removed from 'overcooked_gui.py', and a 'to_dict' method was added in 'counters.py'. Fixing errors from merge.
      8ede781a
    • Florian Schröder's avatar
      Update Overcooked Simulator with dynamic URLs and ports · dd723f17
      Florian Schröder authored
      The Overcooked Simulator has been updated to allow dynamic URLs and ports. This change includes modifications to the README file, and refactoring of main.py, utils.py and overcooked_gui.py to allow these variables to be passed in at runtime. This modification enhances the flexibility of the simulator when integrating with different systems or environments.
      dd723f17
    • Fabian Heinrich's avatar
    • Fabian Heinrich's avatar
      Fixed: Remaining time as int · abc5715c
      Fabian Heinrich authored
      abc5715c
    • Florian Schröder's avatar
      Refactor logging setup and remove obsolete files · f4db8bd5
      Florian Schröder authored
      The logging setup has been moved from the now-deleted main.py to utils.py. In this refactor, the files main.py and simulation_runner.py were removed as they were no longer needed. Unnecessary print statements in overcooked_gui.py and the import of setup_logging in game_server.py were also removed.
      f4db8bd5
    • Florian Schröder's avatar
      Update player speed attribute and handle Enum serialization · dc8d7e4f
      Florian Schröder authored
      Renamed `move_dist` attribute to `player_speed_units_per_seconds` in player configuration. Also implemented `__post_init__` method in Action class to handle conversion from str to Enum type. Added a utility function `custom_asdict_factory` to handle Enum serialization for actions. Various code updates are made to accommodate these changes. Fixes merge bugs.
      dc8d7e4f
    • Fabian Heinrich's avatar
      Fixed offsets · fedc0ff0
      Fabian Heinrich authored
      fedc0ff0
    • Florian Schröder's avatar
      Add command line interface to Overcooked Simulator · 01b18acd
      Florian Schröder authored
      A new command line interface has been added to Overcooked Simulator, which starts up the overcooked game engine server and a PyGame 2D Visualization window each in their own process. This is done using argparse for handling command line arguments. Furthermore, some minor changes have been introduced in the game server and GUI scripts to better handle processes and accept host and port arguments.
      01b18acd
  9. Jan 25, 2024
    • Florian Schröder's avatar
      Refactor player id type and remove global constants in UI · 47edb3ea
      Florian Schröder authored
      The player id type is updated from 'int | str' to 'str' across different files to maintain code uniformity and avoid type-related errors. Removed the global constants (USE_PLAYER_COOK_SPRITES, SHOW_INTERACTION_RANGE, SHOW_COUNTER_CENTERS) from gui files for better code structure. Moreover, function annotations are improved by providing more specific types which helps in understanding the codebase. The diff adds additional details in the form of questions or short descriptions in the comments as well.
      47edb3ea
    • Florian Schröder's avatar
      Switch screen for drawing orders in GUI · 3403d046
      Florian Schröder authored
      The screen parameter for the draw_orders function has been changed from game_screen to main_window. This should ensure the orders will appear in the main application window instead of a separate game-specific screen, enhancing user interaction and visibility.
      3403d046
    • Florian Schröder's avatar
      Update Overcooked simulator to support state export in JSON format · df234b9c
      Florian Schröder authored
      The update introduces a new function `get_json_state()` in overcooked_environment.py that exports the current game state in JSON format. Changes were made to player.py, counters.py, and game_items.py to include an additional `to_dict()` function which represents their current status as a dictionary. This commit also includes minor naming changes, such as renaming `beginning_time` to `start_time`.
      df234b9c
    • Fabian Heinrich's avatar
      e22ce756
    • Florian Schröder's avatar
      Remove unnecessary lock in order enumeration · df38f03c
      Florian Schröder authored
      The lock in the enumeration of orders in the Overcooked simulator's 2D visualization was extra and thus, it was removed. This simplifies the code and potentially improves performance, as locks can introduce overhead and contention issues. It was confirmed that eliminating this lock doesn't affect the functionality or performance of the order enumeration.
      df38f03c
    • Florian Schröder's avatar
  10. Jan 24, 2024
    • Florian Schröder's avatar
      Update server and client communication in game simulator · 7ba326c6
      Florian Schröder authored
      The server (game_server.py) and client communication (overcooked_gui.py) now uses the WebSocket communication protocol. In setup.py, the 'requests' module was added as a new requirement. The game simulator now waits for a player to be ready before starting, stops a game environment if no step is taken within a minute, and pauses or unpauses a game environment. Player actions are now handled based on a new 'Action' type. The server also now handles several client types that can send messages.
      7ba326c6
    • Fabian Heinrich's avatar
      Player color visible on cooks hat · 7ce4aa09
      Fabian Heinrich authored
      7ce4aa09
  11. Jan 22, 2024
  12. Jan 20, 2024
  13. Jan 19, 2024
Loading