Code

Merge Dev to Master#720

Code

Merged

phile-caci merged 200 commits intomasterNextCenturyCorporation/MCS:masterfrom developmentNextCenturyCorporation/MCS:developmentCopy head branch name to clipboardFeb 1, 2024

+612,027-13,197

Commits

Commits on Feb 3, 2022

• Init version

  cedorman

  committed
  4df7786

• Updated readme

  cedorman

  committed
  8719d92

• Scene files

  cedorman

  committed
  351075f

• Started laying out

  cedorman

  committed
  d1587f1

• More style changes

  cedorman

  committed
  13ecd46

• More improvements

  cedorman

  committed
  a238570

• Get list of scenes from dir

  cedorman

  committed
  3446930

Commits on Feb 4, 2022

• Load scene by command, not hard-coded, in run_scene_with_dir. WIP, still need to send command

  cedorman

  committed
  96df036

• Load scene by command, html and mcs_interface changes. WIP

  cedorman

  committed
  6a55e1e

• WIP

  cedorman

  committed
  9488b1d

• Cleanup; add newline at end of html

  cedorman

  committed
  54273b6

Commits on Feb 7, 2022

• WIP; get action list

  cedorman

  committed
  3994cbc

Commits on Feb 15, 2022

• Split respond to scene selection separately from updating image; return list of actions for a scene; use a logger.

  cedorman

  committed
  b3009b7

Commits on Feb 16, 2022

• Put action list higher (so can see when you load); make sure action list is formatted

  cedorman

  committed
  dff5160

Commits on Feb 17, 2022

• Format action list; better debug statements.

  cedorman

  committed
  f29d5ac

• Do sessions properly, using random cookie value; when loading scene, show blank; check to see if the controller is alive.

  cedorman

  committed
  fdb18d4

• flake8 fixes

  cedorman

  committed
  edb86c9

• add scene filename to list of actions

  cedorman

  committed
  5eb5ed9

• applied isort

  cedorman

  committed
  ebbed10

• added lots of log info when looking for mcs_interface

  cedorman

  committed
  1376020

• Local isort changes

  deanwetherby

  committed
  254dbc2

• Local flake8 changes

  deanwetherby

  committed
  ad28db3

Commits on May 8, 2023

• Merge branch 'development' into webenabled

  rartiss55

  committed
  7979db5

Commits on May 9, 2023

• Updates to get things in a semi-working state again.

  rartiss55

  committed
  ea38876

• Updated default actions in webenabled interface.

  ThomasSchellenbergNextCentury

  committed
  728b614

• Replaced scenes in webenabled interface with Eval 6 validation dataset.

  ThomasSchellenbergNextCentury

  committed
  8f6e54c

• Add webenabled directory to precommit.

  rartiss55

  committed
  2d34e5e

• flake8 fixes.

  rartiss55

  committed
  f201afc

• Merge branch 'new-webenabled' of https://github.com/NextCenturyCorporation/MCS into new-webenabled

  rartiss55

  committed
  a8d4d18

• add missing slash.

  rartiss55

  committed
  62d4878

• Added overview section to webenabled README

  ThomasSchellenbergNextCentury

  committed
  520cf43

Commits on May 11, 2023

• Updated logs in the webenabled code

  ThomasSchellenbergNextCentury

  committed
  9a73f6c

• MCS-1796 Fixed frame off-by-one issue in the webenabled interface

  ThomasSchellenbergNextCentury

  committed
  d632c58

• Added step number to webenabled UI and updated main page template

  ThomasSchellenbergNextCentury

  committed
  fa2dd94

• Use the user and same datetime in command and image directory names.

  ThomasSchellenbergNextCentury

  committed
  bbb6f73

• Unified webenabled log config

  ThomasSchellenbergNextCentury

  committed
  96d2b23

• Merge branch 'webenabled-docs' into MCS-1796-webenabled-off-by-one

  ThomasSchellenbergNextCentury

  committed
  9fdf169

• Merge branch 'MCS-1796-webenabled-off-by-one' into webenabled-demo-may-11

  ThomasSchellenbergNextCentury

  committed
  10d8d4b

Commits on May 15, 2023

• Updated versions of python dependencies in requirements file. Updated webenabled installation instructions in README.

  ThomasSchellenbergNextCentury

  committed
  aea7d1e

• Merge branch 'development' into webenabled-docs

  ThomasSchellenbergNextCentury

  committed
  34a42c8

• Merge branch 'webenabled-docs' into MCS-1796-webenabled-off-by-one

  ThomasSchellenbergNextCentury

  committed
  092f267

• Merge branch 'MCS-1796-webenabled-off-by-one' into webenabled-demo-may-11

  ThomasSchellenbergNextCentury

  committed
  4c6342e

Commits on May 16, 2023

• Updated filenames in the webenabled UI

  ThomasSchellenbergNextCentury

  committed
  47d3eda

Commits on May 18, 2023

• Merge pull request #660 from NextCenturyCorporation/webenabled-docs

  Show description for 424ed97
  ThomasSchellenbergNextCentury

  authored
  424ed97

Commits on May 30, 2023

• Update README.md

  ThomasSchellenbergNextCentury

  authored
  472db38

• Update README.md

  ThomasSchellenbergNextCentury

  authored
  b6d3d03

Commits on Jun 15, 2023

• Adding a couple time.sleep() calls to mitigate issues on Mac (MCS-1796).

  rartiss55

  committed
  f3e8abd

Commits on Jun 16, 2023

• Merge pull request #661 from NextCenturyCorporation/MCS-1796-webenabled-off-by-one

  Show description for da1c2df
  ThomasSchellenbergNextCentury

  authored
  da1c2df

• Merge pull request #662 from NextCenturyCorporation/webenabled-demo-may-11

  Show description for 2a7e7ad
  ThomasSchellenbergNextCentury

  authored
  2a7e7ad

Commits on Jun 22, 2023

• Merge branch 'MCS-1808-fixpasshumaninput' into new-webenabled

  ThomasSchellenbergNextCentury

  committed
  db047d0

• Merge remote-tracking branch 'origin/development' into new-webenabled

  ThomasSchellenbergNextCentury

  committed
  356e263

• Updated webenabled log messages.

  ThomasSchellenbergNextCentury

  committed
  5fb82a0

Commits on Jun 26, 2023

• Ignoring extraneous keypresses while a step is being processed (MCS-1807).

  rartiss55

  committed
  2bfdc61

Commits on Jun 27, 2023

• Merge pull request #678 from NextCenturyCorporation/MCS-1807

  Show description for ffc34af
  rartiss55

  authored
  ffc34af

Commits on Jul 3, 2023

• Add loading spinner for when scenes are loading or actions are processing (MCS-1809).

  rartiss55

  committed
  624e05d

• Add new route to handle loading controller, blank page with spinner will now appear when unity app is loading (MCS-1809).

  rartiss55

  committed
  b9b94a5

Commits on Jul 5, 2023

• Merge pull request #680 from NextCenturyCorporation/MCS-1809-spinner

  Show description for d05198a
  rartiss55

  authored
  d05198a

• Update default image size so that little to no conversion for image coordinates is needed (MCS-1810).

  rartiss55

  committed
  a005464

• Fix blank image path prior to controller load (MCS-1810).

  rartiss55

  committed
  23764ea

Commits on Jul 6, 2023

• Add ability to click unity image to populate image coordinates for certain actions (MCS-1810).

  rartiss55

  committed
  7fbdccc

• Fix case for is_json (MCS-1810).

  rartiss55

  committed
  89b1011

Commits on Jul 10, 2023

• Reset image coordinates when scene changes, update alert message when image coordinates are not selected (MCS-1810).

  rartiss55

  committed
  babc5c2

• Minor update to text (MCS-1810).

  rartiss55

  committed
  7d5b001

Commits on Jul 11, 2023

• Initial attempt to support all actions by including all parameters (MCS-1811).

  rartiss55

  committed
  e7d508e

• Cleanup action strings that get processed, ignore case for keyboard shortcuts, display alert for attempt to end scene (MCS-1811).

  rartiss55

  committed
  7efccdf

Commits on Jul 12, 2023

• Adding client side validation for input parameters, updating image coordinate defaults to be the center of the unity image (MCS-1811).

  rartiss55

  committed
  a073c75

• Fix includes/in checks, ignore arrow keys for keypress event, fix bug with y image coords (MCS-1811).

  rartiss55

  committed
  e92ad7c

• Update keyboard shortcut image to display all supported actions (MCS-1811).

  rartiss55

  committed
  456cd39

Commits on Jul 13, 2023

• Fixing timeout issue when same scene is selected/initialized twice in a row.

  rartiss55

  committed
  b159343

• Merge remote-tracking branch 'origin/MCS-1810-clickImageCoords' into MCS-1811-supportAllActions

  rartiss55

  committed
  e5e0023

• Update cursor for scene selection per PR comment (MCS-1810).

  rartiss55

  committed
  652b749

Commits on Jul 17, 2023

• Merge pull request #681 from NextCenturyCorporation/MCS-1810-clickImageCoords

  Show description for 361e836
  rartiss55

  authored
  361e836

• Update requirements for webenabled.

  rartiss55

  committed
  9a767a6

Commits on Jul 18, 2023

• Add goal info to UI (MCS-1812).

  rartiss55

  committed
  92f9641

• Update action list on a per step basis (MCS-1812).

  rartiss55

  committed
  1ed0fd9

• Changing img_ directory to output_, also saving relevant information from step metadata to json file within that directory (MCS-1812).

  rartiss55

  committed
  904b7c5

Commits on Jul 19, 2023

• Adding step output file to image output directory, rename img directory + related functions/properties (MCS-1812).

  rartiss55

  committed
  6588296

• Add step output info to UI (MCS-1812).

  rartiss55

  committed
  7112d85

• Adding last action taken to output section of UI (MCS-1812).

  rartiss55

  committed
  6ff1865

• Remove print statement.

  rartiss55

  committed
  03c42e5

Commits on Jul 20, 2023

• Merge pull request #682 from NextCenturyCorporation/MCS-1811-supportAllActions

  Show description for 8181a37
  rartiss55

  authored
  8181a37

Commits on Jul 27, 2023

• WIP - adding new error output file, get step_number from step output (MCS-1910).

  rartiss55

  committed
  f2a3e9a

• Remove old error files from output directory (MCS-1910).

  rartiss55

  committed
  9ef6d72

Commits on Aug 2, 2023

• Add seperate logic to handle app start up, fix timing issue with error file cleanup after init, display error message if applicable (MCS-1910).

  rartiss55

  committed
  49d5825

Commits on Aug 3, 2023

• Finalize error handling (MCS-1910).

  rartiss55

  committed
  a1b55d4

• Merge pull request #683 from NextCenturyCorporation/MCS-1812-output

  Show description for 8002bd5
  rartiss55

  authored
  8002bd5

Commits on Aug 8, 2023

• Merge pull request #684 from NextCenturyCorporation/MCS-1910-errorHandling

  Show description for c7a842f
  rartiss55

  authored
  c7a842f

• Remove non-existent function, change scene selection to dropdown (MCS-1816).

  rartiss55

  committed
  5526221

• Moving some things around (MCS-1816).

  rartiss55

  committed
  b35ffcf

• Taking out unnecessary tags, update CSS (MCS-1816).

  rartiss55

  committed
  6b6c61e

Commits on Aug 9, 2023

• Using flex layout, cleanup (MCS-1816).

  rartiss55

  committed
  7166b22

• Fix footer (MCS-1816).

  rartiss55

  committed
  140fa4a

Commits on Aug 10, 2023

• MCS-1813 Updated the webenabled app to be packageable with pyinstaller. Note the new run command.

  ThomasSchellenbergNextCentury

  committed
  7813a81

• Turn shortcuts info into a collapsible sidebar (MCS-1816).

  rartiss55

  committed
  6dd1dfe

• Fix naming conventions (MCS-1816).

  rartiss55

  committed
  61367f7

• Attempt to make seperators between different sections (MCS-1816).

  rartiss55

  committed
  faa0cd9

Commits on Aug 11, 2023

• MCS-1813 Got my pre-commit working again and fixed some issues.

  ThomasSchellenbergNextCentury

  committed
  cc30133

• MCS-1813 Fixing some stupid errors.

  ThomasSchellenbergNextCentury

  committed
  a66bdfe

Commits on Aug 14, 2023

• Simplifying layout + removing collapsible side bar for keyboard shortcuts, fixing colors (MCS-1816).

  rartiss55

  committed
  c49ad1d

• Moving things around.

  rartiss55

  committed
  16be579

• Making select scenes dropdown larger, moving more things to center div (MCS-1816).

  rartiss55

  committed
  79053db

• Making two columns for outputs, making scene select smaller (MCS-1816).

  rartiss55

  committed
  61e069e

• Moving output metadata beside unity image, fixing margins/padding (MCS-1816).

  rartiss55

  committed
  2379cb8

• Minor fixes.

  rartiss55

  committed
  092ce5b

• Making underscores dashes for div ids and labels (MCS-1816).

  rartiss55

  committed
  360ab5a

• Fix validation-errors margins (MCS-1816).

  rartiss55

  committed
  c686b78

• Trying out shortcuts section on the left (MCS-1816).

  rartiss55

  committed
  f157b3a

• Fix console message.

  rartiss55

  committed
  871ee2a

• Quick css fix for left section widths (MCS-1816).

  rartiss55

  committed
  469c96c

• Ignoring non-action keys (MCS-1925).

  rartiss55

  committed
  fe9d200

• Update variable reference (MCS-1925).

  rartiss55

  committed
  6fdbe8e

Commits on Aug 15, 2023

• Removing fetch.js -- should not cause an issue in modern browsers (MCS-1931).

  rartiss55

  committed
  84f9f1b

Commits on Aug 17, 2023

• Addressing PR comments.

  rartiss55

  committed
  3e0ac84

• Merge pull request #688 from NextCenturyCorporation/MCS-1931

  Show description for 5c97c3b
  rartiss55

  authored
  5c97c3b

• Addressing PR comments.

  rartiss55

  committed
  27ccd71

Commits on Aug 18, 2023

• Merge pull request #686 from NextCenturyCorporation/MCS-1816-styling

  Show description for 547ac1f
  rartiss55

  authored
  547ac1f

• Merge branch 'new-webenabled' into MCS-1813-pyinstaller

  rartiss55

  authored
  a8f4fbb

• Merge pull request #687 from NextCenturyCorporation/MCS-1925

  Show description for 66534c3
  rartiss55

  authored
  66534c3

Commits on Aug 29, 2023

• Attempt to close controller + unity when user closes browser (MCS-1817).

  rartiss55

  committed
  9781cd9

• Add psutil to correct requirements.txt, make sure to kill Unity process only if it is a child process of the controller (MCS-1817).

  rartiss55

  committed
  28c6cc0

• Fix isort.

  rartiss55

  committed
  939e8c3

• Fix isort.

  rartiss55

  committed
  7d9c298

• Add psutil back into top level requirements.txt.

  rartiss55

  committed
  0c54fc3

• Fix isort take 3.

  rartiss55

  committed
  6de246c

• Revert "Fix isort take 3."

  Show description for 3ec0bb0
  rartiss55

  committed
  3ec0bb0

• isort (again).

  rartiss55

  committed
  ef40bfb

Commits on Sep 7, 2023

• Use localStorage to detect an open webenabled tab (MCS-1945).

  rartiss55

  committed
  0ac41df

• Merge pull request #692 from NextCenturyCorporation/MCS-1817-closeUnityWithBrowser

  Show description for dee7f72
  rartiss55

  authored
  dee7f72

Commits on Sep 11, 2023

• Fix spelling.

  rartiss55

  committed
  ae9e49f

• Handle get_mcs_interface() on exit, better error messaging (MCS-1945).

  rartiss55

  committed
  9b8535d

• flake8 fix.

  rartiss55

  committed
  3ea996a

• Clean up exit case logic in get_mcs_interface (MCS-1945).

  rartiss55

  committed
  520c0ad

Commits on Sep 12, 2023

• Adding task description class (WIP) + return task description when scene is selected (MCS-1814).

  rartiss55

  committed
  b77fe7f

• Renaming tool use scene files to match appropriate naming convention for descriptions (MCS-1814).

  rartiss55

  committed
  ef93577

• Adding tool task descriptions (MCS-1814).

  rartiss55

  committed
  c1e605d

• Fix typo (MCS-1814).

  rartiss55

  committed
  47daac4

• Adding more interactive task descriptions (MCS-1814).

  rartiss55

  committed
  d93f185

Commits on Sep 13, 2023

• Adding the rest of the interactive task descriptions (MCS-1814).

  rartiss55

  committed
  1904e67

• Adding in task descriptions for passive physics task + seeing leads to knowing (MCS-1814).

  rartiss55

  committed
  91f1570

• Fixing bug with goal display for passive agency tasks.

  rartiss55

  committed
  e52dd0b

• Adding missing agency task descriptions (MCS-1814).

  rartiss55

  committed
  234ecb3

• Add comment about scene name conventions (MCS-1814).

  rartiss55

  committed
  f7c0d1e

• Fix styling issue with odd resizing upon new scene selection.

  rartiss55

  committed
  e7a0b71

• Fix isort.

  rartiss55

  committed
  d61b607

• Fix quotes in description (MCS-1814).

  rartiss55

  committed
  c649011

Commits on Sep 14, 2023

• Merge pull request #693 from NextCenturyCorporation/restrictToOneTab

  Show description for 9b0f7b4
  rartiss55

  authored
  9b0f7b4

• Merge pull request #695 from NextCenturyCorporation/MCS-1814

  Show description for 44cfb3f
  rartiss55

  authored
  44cfb3f

Commits on Sep 21, 2023

• Merge branch 'new-webenabled' into MCS-1813-pyinstaller

  ThomasSchellenbergNextCentury

  committed
  321675c

• MCS-1813 Added webenabled Windows pyinstaller instructions.

  ThomasSchellenbergNextCentury

  committed
  cc7e410

• Merge pull request #685 from NextCenturyCorporation/MCS-1813-pyinstaller

  Show description for 7f8124c
  ThomasSchellenbergNextCentury

  authored
  7f8124c

Commits on Oct 23, 2023

• Merge branch 'master' into new-webenabled

  ThomasSchellenbergNextCentury

  committed
  0e235a0

Commits on Oct 24, 2023

• Updated webenabled required MCS version and config file.

  ThomasSchellenbergNextCentury

  committed
  9a145de

Commits on Oct 25, 2023

• MCS-1923 Webenabled updates: added a list of previous images; added quick action buttons.

  ThomasSchellenbergNextCentury

  committed
  5a50aac

Commits on Nov 6, 2023

• MCS-1923 Fixed webenabled spacing inconsistency.

  ThomasSchellenbergNextCentury

  committed
  6d25d59

Commits on Nov 7, 2023

• updated output

  

  Le

  committed
  f987ed6

Commits on Nov 17, 2023

• Merge pull request #707 from NextCenturyCorporation/MCS-1976_WindowsIntTest

  Show description for cfa5ea5
  phile-caci

  authored
  cfa5ea5

Commits on Nov 18, 2023

• Merge pull request #706 from NextCenturyCorporation/MCS-1923-quick-actions

  Show description for 0967602
  ThomasSchellenbergNextCentury

  authored
  0967602

Commits on Dec 4, 2023

• MCS-1988 Added Eval 7 novel objects to schema doc.

  ThomasSchellenbergNextCentury

  committed
  4f7c30c

• Adding error check for more common errors with less of a wait (MCS-1982), check if scene is selected before using quick action buttons.

  rartiss55

  committed
  63aeeec

Commits on Dec 5, 2023

• MCS-1815 MCS-1930 Webenabled app now uses a production-ready server by default. Also added configurable command line settings.

  ThomasSchellenbergNextCentury

  committed
  9895158

• MCS-1815 MCS-1930 Updated webenabled README and requirements file.

  ThomasSchellenbergNextCentury

  committed
  25f89dd

Commits on Dec 6, 2023

• file removal. See TODO

  NDCACI

  committed
  f955b18

• file removal. See TODO

  NDCACI

  committed
  cb8670c

• rearranged import

  phile-caci

  committed
  2296278

• Update mcsweb.py

  NDCACI

  authored
  e9d20cf

Commits on Dec 8, 2023

• MCS-1991 Updating docs

  ThomasSchellenbergNextCentury

  committed
  a7d3e64

• Update TASK_LIST.md

  ThomasSchellenbergNextCentury

  authored
  1f4fac8

Commits on Dec 11, 2023

• MCS-2010 Added an integration test to ensure the soccer ball obstructs the tool during a RotateObject.

  ThomasSchellenbergNextCentury

  committed
  ccc049f

• Merge pull request #708 from NextCenturyCorporation/MCS-1988

  Show description for e9c955b
  ThomasSchellenbergNextCentury

  authored
  e9c955b

• Merge pull request #709 from NextCenturyCorporation/MCS-1982

  Show description for 9fbbdad
  ThomasSchellenbergNextCentury

  authored
  9fbbdad

• Update TASK_LIST.md

  ThomasSchellenbergNextCentury

  authored
  96c7509

• MCS-2010 Added new integration tests for RotateObject fixes.

  ThomasSchellenbergNextCentury

  committed
  0926d89

• Update TASK_LIST.md

  ThomasSchellenbergNextCentury

  authored
  e6000d9

Commits on Dec 12, 2023

• Update TASK_LIST.md

  ThomasSchellenbergNextCentury

  authored
  cba6a47

• Update runner_script.py

  NDCACI

  authored
  fab805b

• Merge remote-tracking branch 'origin/development' into MCS-1815-MCS-1930

  ThomasSchellenbergNextCentury

  committed
  18a0e69

• Merge remote-tracking branch 'origin/development' into new-webenabled

  ThomasSchellenbergNextCentury

  committed
  b11574a

• Merge branch 'new-webenabled' into MCS-1815-MCS-1930

  ThomasSchellenbergNextCentury

  committed
  876e86a

• Merge pull request #713 from NextCenturyCorporation/MCS-2010-RotateObject

  Show description for 2e0b3ea
  ThomasSchellenbergNextCentury

  authored
  2e0b3ea

• Update TASK_LIST.md

  ThomasSchellenbergNextCentury

  authored
  d6cd396

• Update TASK_LIST.md

  ThomasSchellenbergNextCentury

  authored
  5d2c365

Commits on Dec 13, 2023

• Update TASK_LIST.md

  ThomasSchellenbergNextCentury

  authored
  0ace711

• MCS-1991 Removed old example scenes.

  ThomasSchellenbergNextCentury

  committed
  54a5544

• MCS-1991 Added links in our sphinx docs to the new task list page.

  ThomasSchellenbergNextCentury

  committed
  4702f38

• Merge branch 'MCS-1991' of https://github.com/NextCenturyCorporation/mcs into MCS-1991

  ThomasSchellenbergNextCentury

  committed
  e2bd1e4

• Merge pull request #710 from NextCenturyCorporation/MCS-1815-MCS-1930

  Show description for e2f3f0e
  ThomasSchellenbergNextCentury

  authored
  e2f3f0e

• Merge pull request #712 from NextCenturyCorporation/mcs-1926

  Show description for 66bd017
  ThomasSchellenbergNextCentury

  authored
  66bd017

• MCS-1983 Removed old webenabled scenes.

  ThomasSchellenbergNextCentury

  committed
  2001afe

• MCS-1983 Added new webenabled scenes.

  ThomasSchellenbergNextCentury

  committed
  59df9fc

• MCS-1983 Updated webenabled task descriptions.

  ThomasSchellenbergNextCentury

  committed
  c41191b

Commits on Dec 14, 2023

• MCS-1983 Minor updates.

  ThomasSchellenbergNextCentury

  committed
  26432f0

• MCS-1983 Fixed capitalization.

  ThomasSchellenbergNextCentury

  committed
  3c06fe0

• Update TASK_LIST.md

  ThomasSchellenbergNextCentury

  authored
  4726450

Commits on Dec 15, 2023

• Merge pull request #714 from NextCenturyCorporation/MCS-1991

  Show description for 6a0d8d4
  phile-caci

  authored
  6a0d8d4

• commented out old names for now, causing enumeration issues

  phile-caci

  committed
  e1d266b

• Merge pull request #715 from NextCenturyCorporation/MCS-1983

  Show description for 336bc39
  phile-caci

  authored
  336bc39

• Change rotation amount

  NDCACI

  committed
  1213dff

Commits on Dec 18, 2023

• Merge pull request #718 from NextCenturyCorporation/mcs-2014

  Show description for 40f446c
  phile-caci

  authored
  40f446c

Commits on Dec 27, 2023

• Updating task descriptions for newly updated eval 7 scene files.

  rartiss55

  committed
  cc76c1a

• Merge pull request #716 from NextCenturyCorporation/new-webenabled

  Show description for cd97572
  phile-caci

  authored
  cd97572