Permalink
Switch branches/tags
Commits on Feb 20, 2015
  1. Merge remote-tracking branch 'remotes/origin/integration'

    Conflicts:
    	support/build/Scripts/install.sh
    allisoncorey committed Feb 20, 2015
  2. Merge pull request #469 from virtual-world-framework/branch/absolute-…

    …application-url-root-path
    
    Calculate the correct application component URL for components in "/".
    allisoncorey committed Feb 20, 2015
Commits on Feb 19, 2015
  1. Merge pull request #468 from virtual-world-framework/branch/drag-drop…

    …-fix
    
    Editor updates.
    allisoncorey committed Feb 19, 2015
  2. Merge pull request #467 from virtual-world-framework/branch/cesium-po…

    …lygon
    
    Copies the property value so nothing is modified
    allisoncorey committed Feb 19, 2015
Commits on Feb 18, 2015
  1. Merge pull request #464 from virtual-world-framework/branch/editor-pa…

    …th-fix
    
    Update models directory paths in admin files for both servers.
    allisoncorey committed Feb 18, 2015
  2. Merge pull request #465 from virtual-world-framework/branch/render-delay

    Delays rendering the scene until initialize
    allisoncorey committed Feb 18, 2015
  3. Merge pull request #463 from virtual-world-framework/branch/node-abso…

    …lute-application-url-component-relative-resources
    
    Branch/node absolute application url component relative resources
    allisoncorey committed Feb 18, 2015
Commits on Feb 17, 2015
  1. Merge pull request #461 from virtual-world-framework/branch/lesson-ID

    Replace '/' in lesson IDs with underscores to correct jQuery issues.
    allisoncorey committed Feb 17, 2015
  2. Merge pull request #460 from virtual-world-framework/branch/component…

    …-relative-resources
    
    Branch/component relative resources
    allisoncorey committed Feb 17, 2015
  3. Merge pull request #459 from virtual-world-framework/branch/absolute-…

    …application-url
    
    Load the application component using an absolute (host-relative) URL.
    allisoncorey committed Feb 17, 2015
  4. Merge pull request #458 from virtual-world-framework/branch/reload-on…

    …-disconnect
    
    Reload when the connection drops instead of reconnection + `setState`.
    allisoncorey committed Feb 17, 2015
Commits on Feb 13, 2015
  1. Merge pull request #454 from virtual-world-framework/branch/material-…

    …support
    
    Adds more functionality for Material creation
    scottnc27603 committed Feb 13, 2015
Commits on Feb 12, 2015
  1. Leave host-relative application IDs intact.

    Keep the application ID as `/path/to/application.vwf` instead of
    resolving all the way to `http://localhost:port/path/to/application.vwf`.
    davideaster committed Feb 12, 2015
  2. Stop treating .dae files as launchable resources.

    With absolute application URLs and component-relative references, .dae
    files are unintentionally being routed as applications and not treated
    as regular resources.
    davideaster committed Feb 12, 2015
  3. Resolve relative references with repect to the component when loading:

      - protoypes
      - behaviors
      - `include` components
      - `source` assets
      - scripts
    davideaster committed Feb 12, 2015
Commits on Feb 10, 2015
  1. Removes the hardcoded camera ID

    Also cleans up the handling of cameras.  This doesn’t fix all of the
    issues with glee however.  The navObject changes were never made in
    glge, and this would take too long to get working at this point
    scottnc27603 committed Feb 10, 2015