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

Template feature #3

Open
wants to merge 43 commits into
base: master
Choose a base branch
from
Open

Template feature #3

wants to merge 43 commits into from

Commits on Jan 7, 2020

  1. Merge remote-tracking branch 'upstream/AM-stable' into PR-master

    @preetiramaraj
    preetiramaraj committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    871c301 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2020

  1. Merge branch 'master' of https://github.com/SoarGroup/rosie into PR-m… 

    …aster
    @preetiramaraj
    preetiramaraj committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    67bdeeb View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/AM-stable' into PR-master

    @preetiramaraj
    preetiramaraj committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    fb915c4 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2020

  1. Merge branch 'master' of https://github.com/SoarGroup/rosie into PR-m… 

    …aster
    @preetiramaraj
    preetiramaraj committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    9c9b4d2 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2020

  1. Merge branch 'AM-stable' of https://github.com/SoarGroup/rosie into P… 

    …R-master
    @preetiramaraj
    preetiramaraj committed May 6, 2020
    Configuration menu
    Copy the full SHA
    bede2f4 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2020

  1. Resolving merge conflicts

    @preetiramaraj
    preetiramaraj committed May 12, 2020
    Configuration menu
    Copy the full SHA
    1f64174 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2020

  1. Merge branch 'AM-stable' of https://github.com/SoarGroup/rosie into P… 

    …R-master-study
    @preetiramaraj
    preetiramaraj committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    b6a5492 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'AM-stable' of https://github.com/SoarGroup/rosie into P… 

    …R-master-study
    @preetiramaraj
    preetiramaraj committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    77ed3e6 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2021

  1. Updated java target in build.xml to 1.6

    @amininger
    amininger committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    5562efd View commit details
    Browse the repository at this point in the history

  2. Moving evaluations to an examples folder

    @amininger
    amininger committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    07b55ba View commit details
    Browse the repository at this point in the history

  3. Updated the template directory

    @amininger
    amininger committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    29388e3 View commit details
    Browse the repository at this point in the history

  4. Merging AM-stable branch

    @preetiramaraj
    preetiramaraj committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    c08ad0d View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2021

  1. Working on tweaking how the rosie agent is configured

    @amininger
    amininger committed Apr 30, 2021
    Configuration menu
    Copy the full SHA
    90ebe30 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2021

  1. Working on documenting and refactoring agent settings

    @amininger
    amininger committed May 2, 2021
    Configuration menu
    Copy the full SHA
    1245e5a View commit details
    Browse the repository at this point in the history

Commits on May 3, 2021

  1. Continue to tweak how to run rosie and tests in python

    @amininger
    amininger committed May 3, 2021
    Configuration menu
    Copy the full SHA
    492690f View commit details
    Browse the repository at this point in the history

Commits on May 5, 2021

  1. More changes to example template agent

    @amininger
    amininger committed May 5, 2021
    Configuration menu
    Copy the full SHA
    3329bb6 View commit details
    Browse the repository at this point in the history

  2. small change to settings.md file

    @amininger
    amininger committed May 5, 2021
    Configuration menu
    Copy the full SHA
    3772452 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/AM-stable' into PR-master-study

    @preetiramaraj
    preetiramaraj committed May 5, 2021
    Configuration menu
    Copy the full SHA
    6ef378e View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2022

  1. Updated java function to trim string

    @preetiramaraj
    preetiramaraj committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    7d2b223 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2022

  1. Combining V and NP text boxes to create new command

    @preetiramaraj
    preetiramaraj committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    86390ca View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2022

  1. Updated GUI to accept action template 2 

    Changed two chat entries into a list of entries and added buttons to
switch between the two action templates
    @preetiramaraj
    preetiramaraj committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    f65bf35 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2022

  1. All templates included - toggle using button 

    This version of the code does not combine messages successfully.
Committing just the UI bit of it for safekeeping.
    @preetiramaraj
    preetiramaraj committed Sep 28, 2022
    Configuration menu
    Copy the full SHA
    2d6b31f View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2022

  1. List comprehensions -> for loops - best practices python

    @preetiramaraj
    preetiramaraj committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    27b89a1 View commit details
    Browse the repository at this point in the history

  2. Combine texts from textboxes based on template

    @preetiramaraj
    preetiramaraj committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    0229872 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2022

  1. Choose template based on option selected in listbox

    @preetiramaraj
    preetiramaraj committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    dad9118 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2022

  1. Created and populated template listboxes 

    - Replaced entries with autocomplete_entrylistboxes
- Create a folder with predefined parts of speech lists to make
available for participants
    @preetiramaraj
    preetiramaraj committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    6404100 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2022

  1. UI changes (buttons, verb lists, row/col adjust) 

    Changed optionmenu to individual buttons
Changed names to be clearer (verbs to actions etc)
Changed UI arrangement in terms of rows/columns to account for new values
Made a smaller list of all the parts of speech
Put the bigger list in different -extended files
    @preetiramaraj
    preetiramaraj committed Nov 13, 2022
    Configuration menu
    Copy the full SHA
    68129ef View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2022

  1. Changes to interior-guard 

    Moved old interior-guard to interior-guard-old
Current interior guard uses run_rosie_example template
    @preetiramaraj
    preetiramaraj committed Dec 11, 2022
    Configuration menu
    Copy the full SHA
    9389e4d View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2023

  1. Cannot send instruction if invalid/empty input

    @preetiramaraj
    preetiramaraj committed Jan 17, 2023
    Configuration menu
    Copy the full SHA
    a9e82ba View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2023

  1. Added "Rosie:" and "Instructor:" to precede msgs

    @preetiramaraj
    preetiramaraj committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    f04e60a View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2023

  1. Fixed bug for commit with invalid inputs 

    Sends you are done message even when text inputs are empty/invalid
    @preetiramaraj
    preetiramaraj committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    e50007e View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2023

  1. Enable goal template buttons only on Rosie request

    @preetiramaraj
    preetiramaraj committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    7374a31 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2023

  1. Fixed bug - no instruction sent if invalid input

    @preetiramaraj
    preetiramaraj committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    5c6f9bb View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2023

  1. Added put to verb list, modified RosieGUI to allow 

    it. The validation of verb list is now case-insensitive
    @preetiramaraj
    preetiramaraj committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    bd47880 View commit details
    Browse the repository at this point in the history

  2. Modified prepositions and being verbs

    @preetiramaraj
    preetiramaraj committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    a57555e View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2023

  1. call wait rhs when command is wait for x seconds

    @preetiramaraj
    preetiramaraj committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    5513ebf View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2023

  1. Changes to add oven to sim objects

    @preetiramaraj
    preetiramaraj committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    cd707ff View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2023

  1. Oven task kitchen environment

    @preetiramaraj
    preetiramaraj committed Apr 9, 2023
    Configuration menu
    Copy the full SHA
    b114608 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2023

  1. Modified rosie's simulated environment labels

    @preetiramaraj
    preetiramaraj committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    8c1100a View commit details
    Browse the repository at this point in the history

  2. Added wait for 30 seconds button

    @preetiramaraj
    preetiramaraj committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    0783c3c View commit details
    Browse the repository at this point in the history

  3. Final parts of speech for formative study

    @preetiramaraj
    preetiramaraj committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    2a51831 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2023

  1. Modified examples and row/column text arrangements

    @preetiramaraj
    preetiramaraj committed Apr 24, 2023
    Configuration menu
    Copy the full SHA
    65e7a35 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2023

  1. Adding pizza and bake and changes to source-rosie-env

    @preetiramaraj
    preetiramaraj committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    0c24e3e View commit details
    Browse the repository at this point in the history