Branch/mars game development#476

Open

BrettASwift wants to merge 164 commits intodevelopmentfrom

branch/mars-game-development

Commits on Feb 23, 2015

Create event manager driver and component behavior

Brett Swift
authored and
Brett Swift
committed
Addressed PR comments
Brett Swift
committed
Added findInScene and findTypeInScene

kadst43
authored and
Brett Swift
committed
Added asserts.

kadst43
authored and
Brett Swift
committed
Improved documentation, made warnings and errors optional.

kadst43
authored and
Brett Swift
committed
Now, if there's an error parsing the YAML file, we print some details on

Nathan Marshak
authored and
Brett Swift
committed
Modify raycast results to remove circular references
Brett Swift
committed
Return sound instance id rather than instance object

Brett Swift
authored and
Brett Swift
committed
Remove blockly xml log statement

Brett Swift
authored and
Brett Swift
committed
Remove console.log in blockly driver

Brett Swift
authored and
Brett Swift
committed
Comment out line generating errors with repeat blocks
Brett Swift
committed
Remove centroid from raycast
Brett Swift
committed
More verbose/correct sceneGetter warning

AmbientOSX
authored and
Brett Swift
committed
Update light target matrix when target property is set.
Brett Swift
committed
Change graph visibility to a property
Brett Swift
committed
Fixed the sceneGetter so that it doesn't set this.scene incorrectly when called on the prototype.

kadst43
authored and
Brett Swift
committed
Really fix the sceneGetter this time.

kadst43
authored and
Brett Swift
committed
Start writing HUD driver and components
Brett Swift
committed
Finish HUD creation
Brett Swift
committed
Delete HUD.js for renaming
Brett Swift
committed
Re-add hud.js for renaming
Brett Swift
committed
Fix HUD export
Brett Swift
committed
Handle events
Brett Swift
committed
Properly handle empty image placeholders and extra properties
Brett Swift
committed
Code cleanup
Brett Swift
committed
Initialize empty image objects
Brett Swift
committed
Added support for pre/post draw functions
Brett Swift
committed
Fixed bugs with images
Brett Swift
committed
Moved hud.js to view folder and removed global reference
Brett Swift
committed
Allow an element to have no images
Brett Swift
committed
Fix setting properties on elements
Brett Swift
committed
Set draw functions after initialize to allow them to be defined in external scripts
Brett Swift
committed
Got the jPlayer driver to load...

Nathan Marshak
authored and
Brett Swift
committed
Got the new videoManager dropped in. Doesn't break TDG.

Nathan Marshak
authored and
Brett Swift
committed
Got the changes to the jPlayer model driver merged in. It loads and

Nathan Marshak
authored and
Brett Swift
committed
Removed unnecessary method which sets z-index.

Nathan Marshak
authored and
Brett Swift
committed
Debugged calling "play" along with passing in the URL.

Nathan Marshak
authored and
Brett Swift
committed
Got more stuff using "vwf." rather than this.kernel.

Nathan Marshak
authored and
Brett Swift
committed
Now it appears that we can inject divs dynamically?

Nathan Marshak
authored and
Brett Swift
committed
Div injection now works (I think?)

Nathan Marshak
authored and
Brett Swift
committed
Changed default names of jPlayer div container and player container BACK

Nathan Marshak
authored and
Brett Swift
committed
Corrected tabs vs spaces in the view driver.

Nathan Marshak
authored and
Brett Swift
committed

Commits on Feb 24, 2015

Fixed HUD prototype test
Brett Swift
committed

Commits on Feb 25, 2015

Fix prototype ids for jPlayer
Brett Swift
committed
Delete HUD components for renaming
Brett Swift
committed
Add hud components with renamed directory
Brett Swift
committed

Commits on Feb 27, 2015

Add information to element events
Brett Swift
committed

Commits on Mar 2, 2015

Div injection now works (I think?)

Nathan Marshak
authored and
Spencer Frazier
committed
Instead of creating a new mediaObject for every case of file format, we now create a single mediaObject and augment as necessary.
Spencer Frazier
committed
Beginnings of consuming an array of video input URLs is there...

Nathan Marshak
authored and
Spencer Frazier
committed
Adding multi-format support appears to work!

Nathan Marshak
authored and
Spencer Frazier
committed
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)
Spencer Frazier
committed
Adding some comments to explain what I commented out.
Spencer Frazier
committed
Removed two unnecessary lines of code.
Nathan Marshak
committed
Cleaned up the video URL. Now we are ready to test if it's a string or a
Nathan Marshak
committed

Commits on Mar 3, 2015

Added check to see if we're parsing a string or an array.
Nathan Marshak
committed
Cleand up the code a little bit - in setURL, we now determine if we're
Nathan Marshak
committed

Commits on Mar 4, 2015

Fixed spacing and removed some debug code.
Nathan Marshak
committed
Merge pull request #477 from virtual-world-framework/branch/jplayer-multi-format-support
Nathan Marshak
committed

Commits on Mar 11, 2015

we can now stop execution on a particular Blockly node,as opposed to
Nathan Marshak
committed

Commits on Mar 13, 2015

Now, per Brett's suggestion, we changed stopExecutingForNode in
Nathan Marshak
committed
Merge pull request #480 from virtual-world-framework/branch/blockly_single_stop_exec
Nathan Marshak
committed
Allow images to be inserted at run time
Brett Swift
committed
Remove UI visibility code from blockly_activeNodeID handler
Brett Swift
committed
Add blockly_interfaceVisible property
Brett Swift
committed
Only fire blocklyVisibleChanged if active node is defined
Brett Swift
committed
Fire blocklyVisibleChanged when active node changes
Brett Swift
committed
Merge pull request #481 from virtual-world-framework/branch/mg-hud-support
BrettASwift
committed

Commits on Mar 18, 2015

Commits on Mar 19, 2015

Merge pull request #483 from virtual-world-framework/branch/optimized-private-properties
kadst43
committed

Commits on Mar 23, 2015

Re-apply transparency fix to collada loader
Brett Swift
committed
Enable specular map from specularLevel node
Brett Swift
committed
Merge pull request #484 from virtual-world-framework/branch/collada-transparency-fix
kadst43
committed

Commits on Apr 7, 2015

Commits on Apr 8, 2015

Merge pull request #486 from virtual-world-framework/branch/blockly-capability-support
AmbientOSX
committed

Commits on Apr 9, 2015

Adds support to change the execution time of Blockly depending on the length of the task to be completed in the Blockly block.
AmbientOSX
committed

Commits on Apr 10, 2015

Remove log messages
AmbientOSX
committed

Commits on Apr 20, 2015

Now we are checking if the URL exists.
Nathan Marshak
committed
Separated setting the URL from playing the video. This should allow us
Nathan Marshak
committed

Commits on Apr 21, 2015

"load" now works in the jPlayer model.
Nathan Marshak
committed
Got the load functionality into the jPlayer driver...
Nathan Marshak
committed
Merge pull request #489 from virtual-world-framework/branch/jplayer-preload
Nathan Marshak
committed
Merge pull request #488 from virtual-world-framework/branch/Blockly-Change-Exe-Time
AmbientOSX
committed

Commits on Apr 22, 2015

Now we can pre-load the correct cutscenes in the scenario1* series of scenarios.
Nathan Marshak
committed
Now the jPlayer driver doesn't set the URL (which may cause a load to
Nathan Marshak
committed

Commits on Apr 23, 2015

Update jPlayer.js
Nathan Marshak
committed
Update jPlayer.js
Nathan Marshak
committed
Merge pull request #492 from virtual-world-framework/branch/video_load_on_url_set
Nathan Marshak
committed

Commits on Apr 24, 2015

Add lights property to shader material
Brett Swift
committed
Allow properties to be stored on material for use in updateFunction
Brett Swift
committed
Store custom properties on material object
Brett Swift
committed
Fix uniform generation with shader material components
Brett Swift
committed

Commits on Apr 27, 2015

Commits on Apr 28, 2015

Commits on Apr 30, 2015

Remove a log message
AmbientOSX
committed

Commits on May 5, 2015

Commits on May 9, 2015

Commits on May 11, 2015

Commits on May 12, 2015

Commits on May 15, 2015

Added ability to set defines in shaders
Brett Swift
committed

Commits on May 16, 2015

Merge pull request #496 from virtual-world-framework/branch/shader-material-defines
BrettASwift
committed

Commits on May 17, 2015

Commits on May 18, 2015

Commits on May 19, 2015

Commits on May 21, 2015

Commits on Jun 5, 2015

Commits on Jun 10, 2015

Fix for extending heightmap
Brett Swift
committed

Commits on Jun 17, 2015

Merge pull request #503 from virtual-world-framework/branch/mg-grid-removal
BrettASwift
committed

Commits on Jul 3, 2015

Modify analytic particle solver and convert tabs to spaces
Brett Swift
committed

Commits on Jul 5, 2015

More fixes to analytic solver
Brett Swift
committed

Commits on Jul 6, 2015

Merge pull request #504 from virtual-world-framework/branch/particle-support
BrettASwift
committed

Commits on Jul 8, 2015

Commits on Jul 9, 2015

Fix width issue with retrieving old blocks
AmbientOSX
committed

Commits on Jul 10, 2015

Undo changes to make rollback of Blockly work.
AmbientOSX
committed

Commits on Jul 13, 2015

Merge pull request #505 from virtual-world-framework/branch/blockly-refactor
AmbientOSX
committed

Commits on Jul 22, 2015

Commits on Jul 31, 2015

Add fog define toggle for shader materials
Brett Swift
committed

Commits on Aug 4, 2015

Reduces time between lines for Blockly.
AmbientOSX
committed
Allow manual setting of hud element draw order
Brett Swift
committed

Commits on Aug 5, 2015

Commits on Aug 12, 2015

Makes disabled blocks more visibly disabled - removes some dropdown categories and adds back comments category.
AmbientOSX
committed

Commits on Aug 17, 2015

Merge pull request #514 from virtual-world-framework/branch/blockly-core-v5
AmbientOSX
committed

Commits on Aug 18, 2015

Add a `scene.vwf` `enableRenderer` property.
davideaster
committed

Commits on Aug 19, 2015

Merge pull request #515 from virtual-world-framework/branch/no-render
BrettASwift
committed

Commits on Aug 24, 2015

Commits on Aug 26, 2015

Merge pull request #516 from virtual-world-framework/branch/blockly-reset-xml
AmbientOSX
committed

Commits on Sep 2, 2015

Address disabled block coloring issue, address behind toolbox issue, small changes to stickiness of blocks, blocks in procedures should now highlight.
AmbientOSX
committed

Commits on Sep 9, 2015

Merge pull request #517 from virtual-world-framework/branch/blockly-core-9-2
AmbientOSX
committed

Commits on Oct 14, 2015

Commits on Nov 4, 2015

Fix bug where disabling hud prevented mouse events on canvas
Brett Swift
committed

Commits on Nov 5, 2015

Merge pull request #520 from virtual-world-framework/branch/mg-hud-fix
BrettASwift
committed

Commits on Jan 20, 2016

Only call notifyDriverOfPrototypeAndBehaviorProps if node and threeObject exist
Brett Swift
committed

Commits on Jan 25, 2016

Merge pull request #530 from virtual-world-framework/branch/notify-driver-props-performance
BrettASwift
committed