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!

e7888738

Commit e7888738 authored 1 year ago by Florian Schröder

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/main' into 61-counter-factory

# Conflicts:
#	overcooked_simulator/game_server.py

parents d9ddc417 610e930e

No related branches found

No related tags found

1 merge request!34Resolve "Counter Factory"

Pipeline #44929 passed 1 year ago

Stage: test

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

README.md 6 additions, 2 deletions

README.md
overcooked_simulator/__init__.py 3 additions, 2 deletions

overcooked_simulator/__init__.py
overcooked_simulator/__main__.py 4 additions, 2 deletions

overcooked_simulator/__main__.py
overcooked_simulator/game_server.py 18 additions, 7 deletions

overcooked_simulator/game_server.py
overcooked_simulator/gui_2d_vis/overcooked_gui.py 18 additions, 10 deletions

overcooked_simulator/gui_2d_vis/overcooked_gui.py
overcooked_simulator/utils.py 15 additions, 1 deletion

overcooked_simulator/utils.py

with 64 additions and 24 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