Commits · main · ECE_4574_F24_TRAJectory / TraumaSim

Dec 12, 2024
- Merge branch 'dev' into 'main' · f2b2d42a
  alvinchung authored 3 months ago
```
Dev

See merge request ece_4574_f24_trajectory/traumasim!14
```
  f2b2d42a
- adding timer that ended up not making it fully due to finnicky nature of counting time via tkinter · 0afd273a
  ramzy authored 3 months ago
  
  0afd273a
- Added name to header of files · 2c32e43a
  ramzy authored 3 months ago
  
  2c32e43a
- added some headers · 55a38b92
  timothyfish authored 3 months ago
  
  55a38b92
- added some headers · d6232c83
  timothyfish authored 3 months ago
  
  d6232c83
Dec 11, 2024
- Merge branch 'jayson_comments' into 'dev' · e3ca15a5
  jaysond21 authored 3 months ago
```
added my comments and file headers

See merge request ece_4574_f24_trajectory/traumasim!13
```
  e3ca15a5
- added comments and headers :P · 5e696fb8
  jaysond21 authored 3 months ago
  
  5e696fb8
Dec 09, 2024
- fixed treatments · eda0cef0
  timothyfish authored 3 months ago
  
  eda0cef0
- Fixed bug with scenarios always showing as Medical 02 · 1b40bb24
  ramzy authored 3 months ago
  
  1b40bb24
- Tiny change to allow teacher role to see statistics · d068fb26
  ramzy authored 3 months ago
  
  d068fb26
- Merge branch 'scenarioDatabaseIntegration' into 'dev' · 23f5a881
  ramzy authored 3 months ago
```
Scenario database integration

See merge request ece_4574_f24_trajectory/traumasim!12
```
  23f5a881
- Implemented final database integration w/ scenario and stats, also type fix on main menu · 8e4d84d3
  ramzy authored 3 months ago
  
  8e4d84d3
Dec 08, 2024
- Merge branch 'guiImprovements' into 'dev' · 52f48439
  alvinchung authored 3 months ago
```
GUI Improvements

See merge request ece_4574_f24_trajectory/traumasim!11
```
  52f48439
- Adjusted colors and moved left aux to right and renamed it to auxFrameAlpha, other auxFrameUnused · 58eaa09b
  alvinchung authored 3 months ago
  
  58eaa09b
- Reset transcript history when return to main menu · 75a6871a
  alvinchung authored 3 months ago
  
  75a6871a
- Added transcript history to left aux frame · 334c7aa4
  alvinchung authored 3 months ago
  
  334c7aa4
- Some changes to input frame · 940bab16
  alvinchung authored 3 months ago
  
  940bab16
- Changes to display frame section · 1833c8cb
  alvinchung authored 3 months ago
  
  1833c8cb
- Login window is centered when opened · b08a2d68
  alvinchung authored 3 months ago
  
  b08a2d68
- Merge branch '1314guiIntegration' into 'dev' · cb52c5ea
  alvinchung authored 3 months ago
```
Integrated Game Controller with GUI

See merge request ece_4574_f24_trajectory/traumasim!10
```
  cb52c5ea
- Added requirements.txt · 4ed0165b
  alvinchung authored 3 months ago
  
  4ed0165b
- Resetting game end return to main menu button after clicking on it · 3ea9ebca
  alvinchung authored 3 months ago
  
  3ea9ebca
- Added check for simulation has ended and added proper resets · 26119876
  alvinchung authored 3 months ago
  
  26119876
Dec 07, 2024
- Adjustments to GUI integration, bug fixes, and some helper functions ref #13 #14 · 40512c7c
  alvinchung authored 3 months ago
  
  40512c7c
- Some small interface changes ref #13 #14 · 667dab41
  alvinchung authored 3 months ago
  
  667dab41
- Quitting mid scenario will reset game controller + some window sizing changes ref #13 #14 · 91c9b2a9
  alvinchung authored 3 months ago
  
  91c9b2a9
- Can display text from and send inputs to game controller via GUI ref #13 #14 · 9192b4c4
  alvinchung authored 3 months ago
  
  9192b4c4
- Added text box for scenario text in display frame ref #13 #14 · fab0a7da
  alvinchung authored 3 months ago
  
  fab0a7da
- Started integration of game controller and GUI ref #13 #14 · ff034a32
  alvinchung authored 3 months ago
  
  ff034a32
- Merge branch 'teacherRole' into 'dev' · 4a603a45
  alvinchung authored 3 months ago
```
Teacher Role

See merge request ece_4574_f24_trajectory/traumasim!9
```
  4a603a45
- Commented line using pack() causing error messages related to stats window · 4b40bf59
  alvinchung authored 3 months ago
  
  4b40bf59
- In progress return to main from running simref #12 · cb8f29b0
  alvinchung authored 3 months ago
  
  cb8f29b0
- Add teacher role functionality with database integration · d74313b8
  ramzy authored 3 months ago and alvinchung committed 3 months ago
  
  d74313b8
Dec 03, 2024
- clarified wrong treatments · 205a518a
  timothyfish authored 3 months ago
  
  205a518a
- cannot repeat treatments · af480753
  timothyfish authored 3 months ago
  
  af480753
- Merge branch 'new_treatments' into 'dev' · 201f0084
  timothyfish authored 3 months ago
```
New treatments

See merge request ece_4574_f24_trajectory/traumasim!8
```
  201f0084
- print instructions · 12a57963
  jdv52 authored 3 months ago
  
  12a57963
- added treatment scoring · a88a6d7d
  timothyfish authored 3 months ago
  
  a88a6d7d
Dec 02, 2024
- added assessment scoring · eafa5038
  jdv52 authored 3 months ago
  
  eafa5038
- added assessment scoring · 358efaa7
  jdv52 authored 3 months ago
  
  358efaa7