Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MCS - 1926 #711

Closed
wants to merge 158 commits into from
Closed

MCS - 1926 #711

wants to merge 158 commits into from

Conversation

NDCACI
Copy link
Collaborator

@NDCACI NDCACI commented Dec 6, 2023

No description provided.

cedorman and others added 30 commits February 3, 2022 13:19
@cedorman
Init version
4df7786
@cedorman
Updated readme
8719d92
@cedorman
Scene files
351075f
@cedorman
Started laying out
d1587f1
@cedorman
More style changes
13ecd46
@cedorman
More improvements
a238570
@cedorman
Get list of scenes from dir
3446930
@cedorman
Load scene by command, not hard-coded, in run_scene_with_dir. WIP, st…
96df036 
…ill need to send command
@cedorman
Load scene by command, html and mcs_interface changes. WIP
6a55e1e
@cedorman
WIP
9488b1d
@cedorman
Cleanup; add newline at end of html
54273b6
@cedorman
WIP; get action list
3994cbc
@cedorman
Split respond to scene selection separately from updating image; retu…
b3009b7 
…rn list of actions for a scene; use a logger.
@cedorman
Put action list higher (so can see when you load); make sure action l…
dff5160 
…ist is formatted
@cedorman
Format action list; better debug statements.
f29d5ac
@cedorman
Do sessions properly, using random cookie value; when loading scene, …
fdb18d4 
…show blank; check to see if the controller is alive.
@cedorman
flake8 fixes
edb86c9
@cedorman
add scene filename to list of actions
5eb5ed9
@cedorman
applied isort
ebbed10
@cedorman
added lots of log info when looking for mcs_interface
1376020
@deanwetherby
Local isort changes
254dbc2
@deanwetherby
Local flake8 changes
ad28db3
@rartiss55
Merge branch 'development' into webenabled
7979db5
@rartiss55
Updates to get things in a semi-working state again.
ea38876
@ThomasSchellenbergNextCentury
Updated default actions in webenabled interface.
728b614
@ThomasSchellenbergNextCentury
Replaced scenes in webenabled interface with Eval 6 validation dataset.
8f6e54c
@rartiss55
Add webenabled directory to precommit.
2d34e5e
@rartiss55
flake8 fixes.
f201afc
@rartiss55
Merge branch 'new-webenabled' of https://github.com/NextCenturyCorpor…
a8d4d18 
…ation/MCS into new-webenabled
@rartiss55
add missing slash.
62d4878
rartiss55 and others added 28 commits September 11, 2023 12:20
@rartiss55
flake8 fix.
3ea996a
@rartiss55
Clean up exit case logic in get_mcs_interface (MCS-1945).
520c0ad
@rartiss55
Adding task description class (WIP) + return task description when sc…
b77fe7f 
…ene is selected (MCS-1814).
@rartiss55
Renaming tool use scene files to match appropriate naming convention …
ef93577 
…for descriptions (MCS-1814).
@rartiss55
Adding tool task descriptions (MCS-1814).
c1e605d
@rartiss55
Fix typo (MCS-1814).
47daac4
@rartiss55
Adding more interactive task descriptions (MCS-1814).
d93f185
@rartiss55
Adding the rest of the interactive task descriptions (MCS-1814).
1904e67
@rartiss55
Adding in task descriptions for passive physics task + seeing leads t…
91f1570 
…o knowing (MCS-1814).
@rartiss55
Fixing bug with goal display for passive agency tasks.
e52dd0b
@rartiss55
Adding missing agency task descriptions (MCS-1814).
234ecb3
@rartiss55
Add comment about scene name conventions (MCS-1814).
f7c0d1e
@rartiss55
Fix styling issue with odd resizing upon new scene selection.
e7a0b71
@rartiss55
Fix isort.
d61b607
@rartiss55
Fix quotes in description (MCS-1814).
c649011
@rartiss55
Merge pull request #693 from NextCenturyCorporation/restrictToOneTab
9b0f7b4 
MCS-1945 [Webenabled] Restrict to one tab
@rartiss55
Merge pull request #695 from NextCenturyCorporation/MCS-1814
44cfb3f 
MCS-1814 [Webenabled] Add task descriptions
@ThomasSchellenbergNextCentury
Merge branch 'new-webenabled' into MCS-1813-pyinstaller
321675c
@ThomasSchellenbergNextCentury
MCS-1813 Added webenabled Windows pyinstaller instructions.
cc7e410
@ThomasSchellenbergNextCentury
Merge pull request #685 from NextCenturyCorporation/MCS-1813-pyinstaller
7f8124c 
MCS-1813 Updated the webenabled app to be packageable with pyinstaller
@phile-caci
Merge pull request #705 from NextCenturyCorporation/development
e16aec7 
Merge dev to master
@ThomasSchellenbergNextCentury
Merge branch 'master' into new-webenabled
0e235a0
@ThomasSchellenbergNextCentury
Updated webenabled required MCS version and config file.
9a145de
@ThomasSchellenbergNextCentury
MCS-1923 Webenabled updates: added a list of previous images; added q…
5a50aac 
…uick action buttons.
@ThomasSchellenbergNextCentury
MCS-1923 Fixed webenabled spacing inconsistency.
6d25d59
@ThomasSchellenbergNextCentury
Merge pull request #706 from NextCenturyCorporation/MCS-1923-quick-ac…
0967602 
…tions

MCS-1923 MCS-1924 Webenabled Updates: Previous Images, Quick Actions
@NDCACI
file removal. See TODO
f955b18
@NDCACI
file removal. See TODO
cb8670c
@NDCACI NDCACI self-assigned this Dec 6, 2023
@NDCACI NDCACI closed this Dec 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@NDCACI NDCACI

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@NDCACI @cedorman @deanwetherby @rartiss55 @ThomasSchellenbergNextCentury @phile-caci