Commits · 5ba7407d8b04fb26ee77b26a6482e7365e2e1578 · Social Cognitive Systems / CoCoSy / Cooperative Cuisine Environment

Feb 22, 2024
- Fix controller input · 5ba7407d
  fheinrich authored 1 year ago
  
  5ba7407d
- Fix merge, testing to be done... · 6fb6e6e5
  Fabian Heinrich authored 1 year ago
  
  6fb6e6e5
- Merge branch 'main' into 91-game-flow · b44439e2
  Fabian Heinrich authored 1 year ago
  
  # Conflicts: # overcooked_simulator/gui_2d_vis/overcooked_gui.py
  b44439e2
Feb 21, 2024
- Show which player is controlled again · 14b6b535
  Fabian Heinrich authored 1 year ago
  
  14b6b535
- Removed print? · 6563d493
  Fabian Heinrich authored 1 year ago
  
  6563d493
- Implemented basic study flow in with the study server. Added Controls tutorial. · 5cfe68e3
  Fabian Heinrich authored 1 year ago
  
  - Can be used via main with flag
  5cfe68e3
- Merge branch '80-controller-support' into 'main' · c4a3cf9d
  Annika Österdiekhoff authored 1 year ago
  
  Resolve "Controller Support" Closes #80 See merge request scs/cocosy/overcooked-simulator!45
  c4a3cf9d
- resolve review · 5bce4290
  Annika Österdiekhoff authored 1 year ago
  
  5bce4290
Feb 20, 2024
- Fixed basic layout · 3dc3e293
  Fabian Heinrich authored 1 year ago
  
  3dc3e293
- UI elements are created one and shown or hidden. Like before, but cleaner · a6ee6c10
  Fabian Heinrich authored 1 year ago
  
  a6ee6c10
- Running tutorial game in controls tutorial screen · 925e3487
  Fabian Heinrich authored 1 year ago
  
  925e3487
Feb 19, 2024
- Cleaned up main loop · c640f11b
  Fabian Heinrich authored 1 year ago
  
  c640f11b
- Button event in own function · 780b8df7
  Fabian Heinrich authored 1 year ago
  
  780b8df7
- Update how different screens are managed. · f32a30f4
  Fabian Heinrich authored 1 year ago
  
  f32a30f4
- Updated calculation of game screen size · 6790f53b
  Fabian Heinrich authored 1 year ago
  
  6790f53b
Feb 15, 2024
- fix error when only one controller is connected · 5e0fe384
  Annika Österdiekhoff authored 1 year ago
  
  5e0fe384
- fix switching multiple times in one frame · 2bed7e6c
  Annika Österdiekhoff authored 1 year ago
  
  2bed7e6c
- remove old fixme + todo · 3dbfa664
  Annika Österdiekhoff authored 1 year ago
  
  3dbfa664
- implement switching possibility · 02a99145
  Annika Österdiekhoff authored 1 year ago
  
  02a99145
- fix interaction error · a4fe5a07
  Annika Österdiekhoff authored 1 year ago
  
  a4fe5a07
- fix error due to merging main · 6ba1f773
  Annika Österdiekhoff authored 1 year ago
  
  6ba1f773
- merge main · 83f5aacc
  Annika Österdiekhoff authored 1 year ago
  
  83f5aacc
- fix slow down of keyboard movements when joy sticks are connected · 380c84cc
  Annika Österdiekhoff authored 1 year ago
  
  380c84cc
- first rough working version of joy stick movement · 61b0e8a0
  Annika Österdiekhoff authored 1 year ago
  
  61b0e8a0
Feb 14, 2024
- Fix polygon for displaying items in list · 41b0065a
  Fabian Heinrich authored 1 year ago
  
  41b0065a
- Info msgs are optional, put them in comment in the config · 6cb370b5
  Florian Schröder authored 1 year ago
  
  6cb370b5
- Merge branch '79-info-screens-pop-ups-etc' into 'main' · 1efc5493
  Florian Schröder authored 1 year ago
  
  Resolve "Info screens (pop ups etc)" Closes #79 See merge request scs/cocosy/overcooked-simulator!53
  1efc5493
- Merge remote-tracking branch 'origin/main' into 79-info-screens-pop-ups-etc · 98464097
  Florian Schröder authored 1 year ago
  
  # Conflicts: # overcooked_simulator/gui_2d_vis/overcooked_gui.py
  98464097
- Merge branch '87-more-maps' into 'main' · 038000bf
  Florian Schröder authored 1 year ago
  
  Resolve "More maps" Closes #87 See merge request scs/cocosy/overcooked-simulator!54
  038000bf
- Merge remote-tracking branch 'origin/main' into 87-more-maps · 78a99f11
  Florian Schröder authored 1 year ago
  
  # Conflicts: # overcooked_simulator/overcooked_environment.py
  78a99f11
- Merge branch '93-example-study-server' into 'main' · 9f85b1ac
  Florian Schröder authored 1 year ago
  
  Resolve "Example Study Server" Closes #93 See merge request scs/cocosy/overcooked-simulator!57
  9f85b1ac
- Implement study server · 37c127e1
  Florian Schröder authored 1 year ago
  
  Several GUI instances are managed by a study server for matchmaking. Needs code adjustments to work (change static var)
  37c127e1
- Merge branch '88-second-window' into 'main' · 60ddf871
  Fabian Heinrich authored 1 year ago
  
  Resolve "Second window" Closes #88 See merge request scs/cocosy/overcooked-simulator!55
  60ddf871
- Doc and renaming for clarity · 3b9e86f7
  Fabian Heinrich authored 1 year ago
  
  3b9e86f7
- Revert change · 68408ea5
  Fabian Heinrich authored 1 year ago
  
  68408ea5
- Changed fullscreen button placement, change in order window size · fa701e40
  Fabian Heinrich authored 1 year ago
  
  fa701e40
- Merge branch 'main' into 88-second-window · 56a698fe
  Fabian Heinrich authored 1 year ago
  
  # Conflicts: # overcooked_simulator/gui_2d_vis/overcooked_gui.py
  56a698fe
- Correct time delta · 488ddf3f
  Fabian Heinrich authored 1 year ago
  
  488ddf3f
- Merge branch 'main' into 88-second-window · 984851bc
  Fabian Heinrich authored 1 year ago
  
  984851bc
- Merge branch '89-more-fov' into 'main' · bbddc863
  Fabian Heinrich authored 1 year ago
  
  Resolve "More FOV" Closes #89 See merge request scs/cocosy/overcooked-simulator!56
  bbddc863