Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Cooperative Cuisine Environment
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

Looking for advice? Join the Matrix channel for GitLab users in Bielefeld!

47981fb7

Commit 47981fb7 authored 1 year ago by Fabian Heinrich

Downloads
- Plain Diff

Merge branch '94-beep-on-button-for-audio-sync' into '91-game-flow'

Resolve "Beep on button for audio sync"

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

parents 5ba7407d a551fd24

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

overcooked_simulator/__main__.py 4 additions, 4 deletions

overcooked_simulator/__main__.py
overcooked_simulator/example_study_server.py 19 additions, 22 deletions

overcooked_simulator/example_study_server.py
overcooked_simulator/game_content/environment_config.yaml 1 addition, 1 deletion

overcooked_simulator/game_content/environment_config.yaml
overcooked_simulator/game_content/environment_config_dark.yaml 1 addition, 1 deletion

...ooked_simulator/game_content/environment_config_dark.yaml
overcooked_simulator/game_content/study_config.yaml 5 additions, 5 deletions

overcooked_simulator/game_content/study_config.yaml
overcooked_simulator/game_server.py 5 additions, 2 deletions

overcooked_simulator/game_server.py
overcooked_simulator/gui_2d_vis/overcooked_gui.py 34 additions, 15 deletions

overcooked_simulator/gui_2d_vis/overcooked_gui.py
overcooked_simulator/gui_2d_vis/sync_bell.wav 0 additions, 0 deletions

overcooked_simulator/gui_2d_vis/sync_bell.wav
overcooked_simulator/overcooked_environment.py 10 additions, 1 deletion

overcooked_simulator/overcooked_environment.py

with 79 additions and 51 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 sign in to comment