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

Branch/mars game development #476

Open
wants to merge 164 commits into
base: development
Choose a base branch
from
Open

Branch/mars game development #476

wants to merge 164 commits into from

Commits on Feb 23, 2015

  1. Create event manager driver and component behavior

    Brett Swift authored and Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    cd1f769 View commit details
    Browse the repository at this point in the history

  2. Addressed PR comments

    Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    84449f3 View commit details
    Browse the repository at this point in the history

  3. Added findInScene and findTypeInScene

    @kadst43
    kadst43 authored and Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    c08be94 View commit details
    Browse the repository at this point in the history

  4. Added asserts.

    @kadst43
    kadst43 authored and Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    3785977 View commit details
    Browse the repository at this point in the history

  5. Improved documentation, made warnings and errors optional.

    @kadst43
    kadst43 authored and Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    38336af View commit details
    Browse the repository at this point in the history

  6. Now, if there's an error parsing the YAML file, we print some details on 

    the error.
    Nathan Marshak authored and Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    2607a09 View commit details
    Browse the repository at this point in the history

  7. Modify raycast results to remove circular references

    Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    1a9602a View commit details
    Browse the repository at this point in the history

  8. Return sound instance id rather than instance object

    Brett Swift authored and Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    c5912fd View commit details
    Browse the repository at this point in the history

  9. Remove blockly xml log statement

    Brett Swift authored and Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    e7116c9 View commit details
    Browse the repository at this point in the history

  10. Remove console.log in blockly driver

    Brett Swift authored and Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    3abae6d View commit details
    Browse the repository at this point in the history

  11. Comment out line generating errors with repeat blocks

    Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    b081bf6 View commit details
    Browse the repository at this point in the history

  12. Remove centroid from raycast

    Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    c9f0607 View commit details
    Browse the repository at this point in the history

  13. More verbose/correct sceneGetter warning

    @AmbientOSX
    AmbientOSX authored and Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    e7a3695 View commit details
    Browse the repository at this point in the history

  14. Update light target matrix when target property is set.

    Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    d969ed2 View commit details
    Browse the repository at this point in the history

  15. Change graph visibility to a property

    Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    84a74b8 View commit details
    Browse the repository at this point in the history

  16. Fixed the sceneGetter so that it doesn't set this.scene incorrectly w… 

    …hen called on the prototype.
    @kadst43
    kadst43 authored and Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    7e77816 View commit details
    Browse the repository at this point in the history

  17. Really fix the sceneGetter this time.

    @kadst43
    kadst43 authored and Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    862d9af View commit details
    Browse the repository at this point in the history

  18. Start writing HUD driver and components

    Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    28d8925 View commit details
    Browse the repository at this point in the history

  19. Finish HUD creation

    Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    f942ef6 View commit details
    Browse the repository at this point in the history

  20. Delete HUD.js for renaming

    Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    6153341 View commit details
    Browse the repository at this point in the history

  21. Re-add hud.js for renaming

    Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    44ec0a6 View commit details
    Browse the repository at this point in the history

  22. Fix HUD export

    Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    56cef00 View commit details
    Browse the repository at this point in the history

  23. Handle events

    Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    1a816da View commit details
    Browse the repository at this point in the history

  24. Properly handle empty image placeholders and extra properties

    Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    82933d8 View commit details
    Browse the repository at this point in the history

  25. Code cleanup

    Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    816eb46 View commit details
    Browse the repository at this point in the history

  26. Initialize empty image objects

    Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    c47478e View commit details
    Browse the repository at this point in the history

  27. Added support for pre/post draw functions

    Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    6325240 View commit details
    Browse the repository at this point in the history

  28. Fixed bugs with images

    Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    24c1842 View commit details
    Browse the repository at this point in the history

  29. Moved hud.js to view folder and removed global reference

    Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    3848f5e View commit details
    Browse the repository at this point in the history

  30. Allow an element to have no images

    Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    9a21ae0 View commit details
    Browse the repository at this point in the history

  31. Fix setting properties on elements

    Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    d1e3782 View commit details
    Browse the repository at this point in the history

  32. Set draw functions after initialize to allow them to be defined in ex… 

    …ternal scripts
    Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    8762eb2 View commit details
    Browse the repository at this point in the history

  33. Got the jPlayer driver to load...

    Nathan Marshak authored and Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    8efddd9 View commit details
    Browse the repository at this point in the history

  34. Got the new videoManager dropped in. Doesn't break TDG.

    Nathan Marshak authored and Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    c2d1e24 View commit details
    Browse the repository at this point in the history

  35. Got the changes to the jPlayer model driver merged in. It loads and 

    nothing breaks horifically.
    Nathan Marshak authored and Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    577d6e7 View commit details
    Browse the repository at this point in the history

  36. Removed unnecessary method which sets z-index.

    Nathan Marshak authored and Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    72dd773 View commit details
    Browse the repository at this point in the history

  37. Debugged calling "play" along with passing in the URL.

    Nathan Marshak authored and Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    47fb8fb View commit details
    Browse the repository at this point in the history

  38. Got more stuff using "vwf." rather than this.kernel.

    Nathan Marshak authored and Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    a46f39a View commit details
    Browse the repository at this point in the history

  39. Now it appears that we can inject divs dynamically?

    Nathan Marshak authored and Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    79c42a1 View commit details
    Browse the repository at this point in the history

  40. Div injection now works (I think?)

    Nathan Marshak authored and Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    ad8fdbd View commit details
    Browse the repository at this point in the history

  41. Changed default names of jPlayer div container and player container BACK 

    so that TDG doesn't break!
    Nathan Marshak authored and Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    d8af39b View commit details
    Browse the repository at this point in the history

  42. Corrected tabs vs spaces in the view driver.

    Nathan Marshak authored and Brett Swift committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    26751b4 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2015

  1. Fixed HUD prototype test

    Brett Swift committed Feb 24, 2015
    Configuration menu
    Copy the full SHA
    a055a03 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2015

  1. Fix prototype ids for jPlayer

    Brett Swift committed Feb 25, 2015
    Configuration menu
    Copy the full SHA
    f7dc38d View commit details
    Browse the repository at this point in the history

  2. Delete HUD components for renaming

    Brett Swift committed Feb 25, 2015
    Configuration menu
    Copy the full SHA
    d9b22f3 View commit details
    Browse the repository at this point in the history

  3. Add hud components with renamed directory

    Brett Swift committed Feb 25, 2015
    Configuration menu
    Copy the full SHA
    09eff14 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2015

  1. Add information to element events

    Brett Swift committed Feb 27, 2015
    Configuration menu
    Copy the full SHA
    e2335a6 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2015

  1. Div injection now works (I think?)

    @spencerfrazier
    Nathan Marshak authored and spencerfrazier committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    1a46caa View commit details
    Browse the repository at this point in the history

  2. Instead of creating a new mediaObject for every case of file format, … 

    …we now create a single mediaObject and augment as necessary.
    @spencerfrazier
    spencerfrazier committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    96efc54 View commit details
    Browse the repository at this point in the history

  3. Beginnings of consuming an array of video input URLs is there...

    @spencerfrazier
    Nathan Marshak authored and spencerfrazier committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    654f7eb View commit details
    Browse the repository at this point in the history

  4. Adding multi-format support appears to work!

    @spencerfrazier
    Nathan Marshak authored and spencerfrazier committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    5768c41 View commit details
    Browse the repository at this point in the history

  5. Now, mars-game appears to pass both test cases: playing on a browser … 

    …without h.264 support, but with webM support (Chromium) and vice versa (Safari)
    @spencerfrazier
    spencerfrazier committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    d3437e2 View commit details
    Browse the repository at this point in the history

  6. Adding some comments to explain what I commented out.

    @spencerfrazier
    spencerfrazier committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    df3db10 View commit details
    Browse the repository at this point in the history

  7. Removed two unnecessary lines of code.

    Nathan Marshak committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    72c415c View commit details
    Browse the repository at this point in the history

  8. Cleaned up the video URL. Now we are ready to test if it's a string or a 

    list.
    Nathan Marshak committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    3c96ab0 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2015

  1. Added check to see if we're parsing a string or an array.

    Nathan Marshak committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    177569d View commit details
    Browse the repository at this point in the history

  2. Cleand up the code a little bit - in setURL, we now determine if we're 

    feeding it an array or a single string.
    Nathan Marshak committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    9b3697b View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2015

  1. Fixed spacing and removed some debug code.

    Nathan Marshak committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    22f6a62 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #477 from virtual-world-framework/branch/jplayer-m… 

    …ulti-format-support

jPlayer now can do both WebM and h.264 in Mars Game. Tested using Chromium (webM but no h.264) and Safari (h.264 but no WebM).
    Nathan Marshak committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    7bdbd14 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2015

  1. we can now stop execution on a particular Blockly node,as opposed to 

    just one of them.
    Nathan Marshak committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    f58860c View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2015

  1. Now, per Brett's suggestion, we changed stopExecutingForNode in 

    manager.vwf.yaml to stopExecuting in controller.vwf.yaml. This way we
don't have to pass the node ID as an argument.
    Nathan Marshak committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    bc7c369 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #480 from virtual-world-framework/branch/blockly_s… 

    …ingle_stop_exec

Blockly - single stop exec
    Nathan Marshak committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    63de81b View commit details
    Browse the repository at this point in the history

  3. Allow images to be inserted at run time

    Brett Swift committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    f36355f View commit details
    Browse the repository at this point in the history

  4. Remove UI visibility code from blockly_activeNodeID handler

    Brett Swift committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    a563a6c View commit details
    Browse the repository at this point in the history

  5. Add blockly_interfaceVisible property

    Brett Swift committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    56b69a5 View commit details
    Browse the repository at this point in the history

  6. Only fire blocklyVisibleChanged if active node is defined

    Brett Swift committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    f70cf77 View commit details
    Browse the repository at this point in the history

  7. Fire blocklyVisibleChanged when active node changes

    Brett Swift committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    5a8ba67 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #481 from virtual-world-framework/branch/mg-hud-su… 

    …pport

Allow images to be inserted at run time
    @BrettASwift
    BrettASwift committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    813e429 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2015

  1. Treat properties with names ending in $ as private record values only.

    @davideaster @AmbientOSX
    davideaster authored and AmbientOSX committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    bccb8bc View commit details
    Browse the repository at this point in the history

  2. Optimized kernel.application calls in view/threejs

    @AmbientOSX
    AmbientOSX committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    81e8f32 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2015

  1. Merge pull request #483 from virtual-world-framework/branch/optimized… 

    …-private-properties

Branch/optimized private properties
    @kadst43
    kadst43 committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    b67a365 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2015

  1. Re-apply transparency fix to collada loader

    Brett Swift committed Mar 23, 2015
    Configuration menu
    Copy the full SHA
    7b7159f View commit details
    Browse the repository at this point in the history

  2. Enable specular map from specularLevel node

    Brett Swift committed Mar 23, 2015
    Configuration menu
    Copy the full SHA
    9b9040a View commit details
    Browse the repository at this point in the history

  3. Merge pull request #484 from virtual-world-framework/branch/collada-t… 

    …ransparency-fix

Branch/collada transparency fix
    @kadst43
    kadst43 committed Mar 23, 2015
    Configuration menu
    Copy the full SHA
    6f40570 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2015

  1. Brings back the trashcan and removes an offset that isn't needed (whi… 

    …ch should fix tooltips and mutator callout origins for Blockly).
    @AmbientOSX
    AmbientOSX committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    147b793 View commit details
    Browse the repository at this point in the history

  2. Clean up changes

    @AmbientOSX
    AmbientOSX committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    d70e9de View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2015

  1. Merge pull request #486 from virtual-world-framework/branch/blockly-c… 

    …apability-support

Blockly Added Capability
    @spencerfrazier
    spencerfrazier committed Apr 8, 2015
    Configuration menu
    Copy the full SHA
    be8d366 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2015

  1. Adds support to change the execution time of Blockly depending on the… 

    … length of the task to be completed in the Blockly block.
    @AmbientOSX
    AmbientOSX committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    9fda43c View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2015

  1. Remove log messages

    @AmbientOSX
    AmbientOSX committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    dcfa9c2 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2015

  1. Now we are checking if the URL exists.

    Nathan Marshak committed Apr 20, 2015
    Configuration menu
    Copy the full SHA
    242deb7 View commit details
    Browse the repository at this point in the history

  2. Separated setting the URL from playing the video. This should allow us 

    to preload.
    Nathan Marshak committed Apr 20, 2015
    Configuration menu
    Copy the full SHA
    f183bd9 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2015

  1. "load" now works in the jPlayer model.

    Nathan Marshak committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    18ca8f4 View commit details
    Browse the repository at this point in the history

  2. Got the load functionality into the jPlayer driver...

    Nathan Marshak committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    4463792 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #489 from virtual-world-framework/branch/jplayer-p… 

    …reload

Branch/jplayer preload
    Nathan Marshak committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    61daccf View commit details
    Browse the repository at this point in the history

  4. Merge pull request #488 from virtual-world-framework/branch/Blockly-C… 

    …hange-Exe-Time

Branch/blockly-change-exe-time
    @spencerfrazier
    spencerfrazier committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    4288c1a View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2015

  1. Now we can pre-load the correct cutscenes in the scenario1* series of… 

    … scenarios.
    Nathan Marshak committed Apr 22, 2015
    Configuration menu
    Copy the full SHA
    53be4d1 View commit details
    Browse the repository at this point in the history

  2. Now the jPlayer driver doesn't set the URL (which may cause a load to 

    trigger) if its being set to the same URL as before.
    Nathan Marshak committed Apr 22, 2015
    Configuration menu
    Copy the full SHA
    f321e9e View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2015

  1. Update jPlayer.js 

    Got rid of unnecessary, commented-out code.
    Nathan Marshak committed Apr 23, 2015
    Configuration menu
    Copy the full SHA
    f9f7b39 View commit details
    Browse the repository at this point in the history

  2. Update jPlayer.js 

    Got rid of another commented-out block that has no relevance.
    Nathan Marshak committed Apr 23, 2015
    Configuration menu
    Copy the full SHA
    ad33667 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #492 from virtual-world-framework/branch/video_loa… 

    …d_on_url_set

Branch/video load on url set
    Nathan Marshak committed Apr 23, 2015
    Configuration menu
    Copy the full SHA
    8d23971 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2015

  1. Add lights property to shader material

    Brett Swift committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    36214c5 View commit details
    Browse the repository at this point in the history

  2. Allow properties to be stored on material for use in updateFunction

    Brett Swift committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    a015f89 View commit details
    Browse the repository at this point in the history

  3. Store custom properties on material object

    Brett Swift committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    5692c50 View commit details
    Browse the repository at this point in the history

  4. Fix uniform generation with shader material components

    Brett Swift committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    8db9cbf View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2015

  1. Texture arrays and texture wrapping to shader materials

    Brett Swift committed Apr 27, 2015
    Configuration menu
    Copy the full SHA
    6032785 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #493 from virtual-world-framework/branch/shader-ma… 

    …terial-support

Branch/shader material support
    @BrettASwift
    BrettASwift committed Apr 27, 2015
    Configuration menu
    Copy the full SHA
    404b06b View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2015

  1. Refinements in progress...

    @AmbientOSX
    AmbientOSX committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    847fbcc View commit details
    Browse the repository at this point in the history

  2. Speed up working.

    @AmbientOSX
    AmbientOSX committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    1c084a5 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2015

  1. Remove a log message

    @AmbientOSX
    AmbientOSX committed Apr 30, 2015
    Configuration menu
    Copy the full SHA
    e619348 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2015

  1. Fix error message

    @AmbientOSX
    AmbientOSX committed May 5, 2015
    Configuration menu
    Copy the full SHA
    01a6f61 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #494 from virtual-world-framework/branch/blockly-r… 

    …efinements

Blockly Speedup and Slowdown
    @spencerfrazier
    spencerfrazier committed May 5, 2015
    Configuration menu
    Copy the full SHA
    9f50fb5 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2015

  1. Use kernel.prototypes instead of getPrototypes in each driver.

    @davideaster
    davideaster committed May 9, 2015
    Configuration menu
    Copy the full SHA
    e62fc4f View commit details
    Browse the repository at this point in the history

  2. Remove attempts to follow the driver chain using kernel.kernel.

    @davideaster
    davideaster committed May 9, 2015
    Configuration menu
    Copy the full SHA
    1feaa0e View commit details
    Browse the repository at this point in the history

Commits on May 11, 2015

  1. No stage/log.

    @davideaster
    davideaster committed May 11, 2015
    Configuration menu
    Copy the full SHA
    58b79c1 View commit details
    Browse the repository at this point in the history

  2. Optimize kernel.application.

    @davideaster
    davideaster committed May 11, 2015
    Configuration menu
    Copy the full SHA
    b248459 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2015

  1. Setting up to be merged into mars-game-dev

    @AmbientOSX
    AmbientOSX committed May 12, 2015
    Configuration menu
    Copy the full SHA
    61de7c1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #495 from virtual-world-framework/branch/optimizat… 

    …ion-tests-mars-game

Mars Game Optimization Tests
    @spencerfrazier
    spencerfrazier committed May 12, 2015
    Configuration menu
    Copy the full SHA
    e234163 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2015

  1. Added ability to set defines in shaders

    Brett Swift committed May 15, 2015
    Configuration menu
    Copy the full SHA
    8f75776 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2015

  1. Merge pull request #496 from virtual-world-framework/branch/shader-ma… 

    …terial-defines

Added ability to set defines in shaders
    @BrettASwift
    BrettASwift committed May 16, 2015
    Configuration menu
    Copy the full SHA
    0516816 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2015

  1. Update shader material when defines are modified

    Brett Swift committed May 17, 2015
    Configuration menu
    Copy the full SHA
    d41d2f3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #497 from virtual-world-framework/branch/shader-ma… 

    …terial-defines

Update shader material when defines are modified
    @BrettASwift
    BrettASwift committed May 17, 2015
    Configuration menu
    Copy the full SHA
    16533b3 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2015

  1. Prevents invalid xml from being loaded

    @AmbientOSX
    AmbientOSX committed May 18, 2015
    Configuration menu
    Copy the full SHA
    61e2214 View commit details
    Browse the repository at this point in the history

  2. Fix handling of Blockly clear

    @AmbientOSX
    AmbientOSX committed May 18, 2015
    Configuration menu
    Copy the full SHA
    3510aac View commit details
    Browse the repository at this point in the history

  3. Merge pull request #498 from virtual-world-framework/branch/blockly-c… 

    …lear-xml

Branch/blockly clear xml
    @spencerfrazier
    spencerfrazier committed May 18, 2015
    Configuration menu
    Copy the full SHA
    0cc0bdb View commit details
    Browse the repository at this point in the history

Commits on May 19, 2015

  1. Adds a grid and updates blockly version for new goodness.

    @AmbientOSX
    AmbientOSX committed May 19, 2015
    Configuration menu
    Copy the full SHA
    09305d1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #499 from virtual-world-framework/branch/blockly-u… 

    …pdates+grid

Adds a grid + Updates Blockly version for use of new features
    @spencerfrazier
    spencerfrazier committed May 19, 2015
    Configuration menu
    Copy the full SHA
    1aea167 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2015

  1. Check if blocklyNode and previousBlocklyNode are defined before setti… 

    …ng the blockXML.
    Brett Swift committed May 21, 2015
    Configuration menu
    Copy the full SHA
    fbb1922 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #500 from virtual-world-framework/branch/fix-toolb… 

    …ox-update

Fix For Toolbox Setting When Switching Missions
    @kadst43
    kadst43 committed May 21, 2015
    Configuration menu
    Copy the full SHA
    6d61407 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2015

  1. Add ability to use a 2d canvas as a texture in shader materials

    Brett Swift committed Jun 5, 2015
    Configuration menu
    Copy the full SHA
    6ecb32a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #502 from virtual-world-framework/branch/canvas-ma… 

    …terial

Canvas Textures
    @BrettASwift
    BrettASwift committed Jun 5, 2015
    Configuration menu
    Copy the full SHA
    f038814 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2015

  1. Fix for extending heightmap

    Brett Swift committed Jun 10, 2015
    Configuration menu
    Copy the full SHA
    872502c View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2015

  1. Merge pull request #503 from virtual-world-framework/branch/mg-grid-r… 

    …emoval

Fix for extending heightmap
    @BrettASwift
    BrettASwift committed Jun 17, 2015
    Configuration menu
    Copy the full SHA
    03695e9 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2015

  1. Modify analytic particle solver and convert tabs to spaces

    Brett Swift committed Jul 3, 2015
    Configuration menu
    Copy the full SHA
    050c68a View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2015

  1. More fixes to analytic solver

    Brett Swift committed Jul 5, 2015
    Configuration menu
    Copy the full SHA
    ec21545 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2015

  1. Merge pull request #504 from virtual-world-framework/branch/particle-… 

    …support

Branch/particle support
    @BrettASwift
    BrettASwift committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    1cf86d5 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2015

  1. Start of refactor for new version of blockly.

    @AmbientOSX
    AmbientOSX committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    c33e55b View commit details
    Browse the repository at this point in the history

  2. Refactor in progress... addressing some deprecated Blockly function c… 

    …alls
    @AmbientOSX
    AmbientOSX committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    37e4c7d View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2015

  1. Fix width issue with retrieving old blocks

    @AmbientOSX
    AmbientOSX committed Jul 9, 2015
    Configuration menu
    Copy the full SHA
    426aa6f View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2015

  1. Undo changes to make rollback of Blockly work.

    @AmbientOSX
    AmbientOSX committed Jul 10, 2015
    Configuration menu
    Copy the full SHA
    2f8ec1f View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2015

  1. Merge pull request #505 from virtual-world-framework/branch/blockly-r… 

    …efactor

Kevin says 👍
    @spencerfrazier
    spencerfrazier committed Jul 13, 2015
    Configuration menu
    Copy the full SHA
    e83dec4 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2015

  1. Core changes made (trashcan, toolbox autoclose, tooltip speed, select… 

    …ion CSS)
    @AmbientOSX
    AmbientOSX committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    5d18418 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #506 from virtual-world-framework/branch/blockly-c… 

    …ore-changes-mars-game

Core Blockly Changes Part 2
    @spencerfrazier
    spencerfrazier committed Jul 22, 2015
    Configuration menu
    Copy the full SHA
    3cb67fe View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2015

  1. Add fog define toggle for shader materials

    Brett Swift committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    a09aa7d View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2015

  1. Core changes that support some flyout/aesthetic/UI changes 

    Conflicts:
	support/client/lib/vwf/model/blockly/blockly_compressed.js
    @AmbientOSX
    AmbientOSX committed Aug 1, 2015
    Configuration menu
    Copy the full SHA
    70feaf6 View commit details
    Browse the repository at this point in the history

  2. Fix alignment, fix coloring, update closing dropdown window, add vari… 

    …able icon.
    @AmbientOSX
    AmbientOSX committed Aug 1, 2015
    Configuration menu
    Copy the full SHA
    1bbd8d0 View commit details
    Browse the repository at this point in the history

  3. Really update variable

    @AmbientOSX
    AmbientOSX committed Aug 1, 2015
    Configuration menu
    Copy the full SHA
    c35531d View commit details
    Browse the repository at this point in the history

  4. Merge pull request #507 from virtual-world-framework/branch/fog-property 

    Fog for Shader Materials
    @BrettASwift
    BrettASwift committed Aug 1, 2015
    Configuration menu
    Copy the full SHA
    e7f2494 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2015

  1. Allow entire HUD to be disabled

    Brett Swift committed Aug 3, 2015
    Configuration menu
    Copy the full SHA
    819da5b View commit details
    Browse the repository at this point in the history

  2. Disable events when hud is disabled

    Brett Swift committed Aug 3, 2015
    Configuration menu
    Copy the full SHA
    d590b05 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #508 from virtual-world-framework/branch/blockly-c… 

    …ore-v3

Blockly Core Changes
    @AmbientOSX
    AmbientOSX committed Aug 3, 2015
    Configuration menu
    Copy the full SHA
    56382bf View commit details
    Browse the repository at this point in the history

  4. Merge pull request #509 from virtual-world-framework/branch/disable-hud 

    Branch/disable hud
    @AmbientOSX
    AmbientOSX committed Aug 3, 2015
    Configuration menu
    Copy the full SHA
    210b413 View commit details
    Browse the repository at this point in the history

  5. Changes radial select to use 90 degree angles only, removes comment a… 

    …nd help fields from context menus.
    @AmbientOSX
    AmbientOSX committed Aug 3, 2015
    Configuration menu
    Copy the full SHA
    17a0f8c View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2015

  1. Reduces time between lines for Blockly.

    @AmbientOSX
    AmbientOSX committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    0904b1b View commit details
    Browse the repository at this point in the history

  2. Allow manual setting of hud element draw order

    Brett Swift committed Aug 4, 2015
    Configuration menu
    Copy the full SHA
    08f8a04 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2015

  1. Merge pull request #511 from virtual-world-framework/branch/blockly-e… 

    …xecution-speed-fix

Blockly Execution Speed Change
    @AmbientOSX
    AmbientOSX committed Aug 5, 2015
    Configuration menu
    Copy the full SHA
    a79d7bd View commit details
    Browse the repository at this point in the history

  2. Merge pull request #512 from virtual-world-framework/branch/hud-draw-… 

    …order

branch/hud-draw-order
    @BrettASwift
    BrettASwift committed Aug 5, 2015
    Configuration menu
    Copy the full SHA
    468a539 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #510 from virtual-world-framework/branch/blockly-c… 

    …ore-v4

Blockly Core Changes v4
    @AmbientOSX
    AmbientOSX committed Aug 5, 2015
    Configuration menu
    Copy the full SHA
    01653f8 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2015

  1. Makes disabled blocks more visibly disabled - removes some dropdown c… 

    …ategories and adds back comments category.
    @AmbientOSX
    AmbientOSX committed Aug 12, 2015
    Configuration menu
    Copy the full SHA
    4a4bec4 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2015

  1. Merge pull request #514 from virtual-world-framework/branch/blockly-c… 

    …ore-v5

Blockly Core v5
    @AmbientOSX
    AmbientOSX committed Aug 17, 2015
    Configuration menu
    Copy the full SHA
    bdf16fe View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2015

  1. Add a scene.vwf enableRenderer property. 

    Setting `enableRenderer` to `false` will disable the renderer.
    @davideaster
    davideaster committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    9522976 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2015

  1. Merge pull request #515 from virtual-world-framework/branch/no-render 

    Add a `scene.vwf` `enableRenderer` property.
    @BrettASwift
    BrettASwift committed Aug 19, 2015
    Configuration menu
    Copy the full SHA
    4ea2e3a View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2015

  1. Fixes satProperty for blockly_xml

    @AmbientOSX
    AmbientOSX committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    2fe2f09 View commit details
    Browse the repository at this point in the history

  2. Revert change/clean up code

    @AmbientOSX
    AmbientOSX committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    e625c42 View commit details
    Browse the repository at this point in the history

  3. Another reversion

    @AmbientOSX
    AmbientOSX committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    9af8ade View commit details
    Browse the repository at this point in the history

  4. Add support for reset.

    @AmbientOSX
    AmbientOSX committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    7567902 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2015

  1. Merge pull request #516 from virtual-world-framework/branch/blockly-r… 

    …eset-xml

Blockly Driver Fixes
    @AmbientOSX
    AmbientOSX committed Aug 26, 2015
    Configuration menu
    Copy the full SHA
    0b69713 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2015

  1. Address disabled block coloring issue, address behind toolbox issue, … 

    …small changes to stickiness of blocks, blocks in procedures should now highlight.
    @AmbientOSX
    AmbientOSX committed Sep 2, 2015
    Configuration menu
    Copy the full SHA
    1ed659c View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2015

  1. Merge pull request #517 from virtual-world-framework/branch/blockly-c… 

    …ore-9-2

Blockly Core Changes 9-2
    @AmbientOSX
    AmbientOSX committed Sep 9, 2015
    Configuration menu
    Copy the full SHA
    02353c3 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2015

  1. Reset internal array when uniform length changes

    Brett Swift committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    b65ac8c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #519 from virtual-world-framework/branch/uniform-a… 

    …rray-length

Reset internal array when uniform length changes
    @BrettASwift
    BrettASwift committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    d119a26 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2015

  1. Fix bug where disabling hud prevented mouse events on canvas

    Brett Swift committed Nov 4, 2015
    Configuration menu
    Copy the full SHA
    795ea1d View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2015

  1. Merge pull request #520 from virtual-world-framework/branch/mg-hud-fix 

    Fix HUD Event Disabling
    @BrettASwift
    BrettASwift committed Nov 5, 2015
    Configuration menu
    Copy the full SHA
    d0fda58 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2016

  1. Only call notifyDriverOfPrototypeAndBehaviorProps if node and threeOb… 

    …ject exist
    Brett Swift committed Jan 20, 2016
    Configuration menu
    Copy the full SHA
    b1eeafa View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2016

  1. Merge pull request #530 from virtual-world-framework/branch/notify-dr… 

    …iver-props-performance

Restrict notifyDriverOfPrototypeAndBehaviorProps to 3D nodes
    @BrettASwift
    BrettASwift committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    270d238 View commit details
    Browse the repository at this point in the history