Code

Branch/mars game development#476

Code

Open

BrettASwift wants to merge 164 commits intodevelopmentvirtual-world-framework/vwf:developmentfrom branch/mars-game-developmentvirtual-world-framework/vwf:branch/mars-game-developmentCopy head branch name to clipboard

+3,418-1,808

Commits

Commits on Feb 23, 2015

• Create event manager driver and component behavior

  

  Brett Swift

  authored and

  Brett Swift

  committed
  cd1f769

• Addressed PR comments

  

  Brett Swift

  committed
  84449f3

• Added findInScene and findTypeInScene

  

  kadst43

  authored and

  Brett Swift

  committed
  c08be94

• Added asserts.

  

  kadst43

  authored and

  Brett Swift

  committed
  3785977

• Improved documentation, made warnings and errors optional.

  

  kadst43

  authored and

  Brett Swift

  committed
  38336af

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

  Show description for 2607a09
  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  2607a09

• Modify raycast results to remove circular references

  

  Brett Swift

  committed
  1a9602a

• Return sound instance id rather than instance object

  

  Brett Swift

  authored and

  Brett Swift

  committed
  c5912fd

• Remove blockly xml log statement

  

  Brett Swift

  authored and

  Brett Swift

  committed
  e7116c9

• Remove console.log in blockly driver

  

  Brett Swift

  authored and

  Brett Swift

  committed
  3abae6d

• Comment out line generating errors with repeat blocks

  

  Brett Swift

  committed
  b081bf6

• Remove centroid from raycast

  

  Brett Swift

  committed
  c9f0607

• More verbose/correct sceneGetter warning

  

  AmbientOSX

  authored and

  Brett Swift

  committed
  e7a3695

• Update light target matrix when target property is set.

  

  Brett Swift

  committed
  d969ed2

• Change graph visibility to a property

  

  Brett Swift

  committed
  84a74b8

• Fixed the sceneGetter so that it doesn't set this.scene incorrectly when called on the prototype.

  

  kadst43

  authored and

  Brett Swift

  committed
  7e77816

• Really fix the sceneGetter this time.

  

  kadst43

  authored and

  Brett Swift

  committed
  862d9af

• Start writing HUD driver and components

  

  Brett Swift

  committed
  28d8925

• Finish HUD creation

  

  Brett Swift

  committed
  f942ef6

• Delete HUD.js for renaming

  

  Brett Swift

  committed
  6153341

• Re-add hud.js for renaming

  

  Brett Swift

  committed
  44ec0a6

• Fix HUD export

  

  Brett Swift

  committed
  56cef00

• Handle events

  

  Brett Swift

  committed
  1a816da

• Properly handle empty image placeholders and extra properties

  

  Brett Swift

  committed
  82933d8

• Code cleanup

  

  Brett Swift

  committed
  816eb46

• Initialize empty image objects

  

  Brett Swift

  committed
  c47478e

• Added support for pre/post draw functions

  

  Brett Swift

  committed
  6325240

• Fixed bugs with images

  

  Brett Swift

  committed
  24c1842

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

  

  Brett Swift

  committed
  3848f5e

• Allow an element to have no images

  

  Brett Swift

  committed
  9a21ae0

• Fix setting properties on elements

  

  Brett Swift

  committed
  d1e3782

• Set draw functions after initialize to allow them to be defined in external scripts

  

  Brett Swift

  committed
  8762eb2

• Got the jPlayer driver to load...

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  8efddd9

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

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  c2d1e24

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

  Show description for 577d6e7
  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  577d6e7

• Removed unnecessary method which sets z-index.

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  72dd773

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

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  47fb8fb

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

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  a46f39a

• Now it appears that we can inject divs dynamically?

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  79c42a1

• Div injection now works (I think?)

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  ad8fdbd

• Changed default names of jPlayer div container and player container BACK

  Show description for d8af39b
  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  d8af39b

• Corrected tabs vs spaces in the view driver.

  

  Nathan Marshak

  authored and

  Brett Swift

  committed
  26751b4

Commits on Feb 24, 2015

• Fixed HUD prototype test

  

  Brett Swift

  committed
  a055a03

Commits on Feb 25, 2015

• Fix prototype ids for jPlayer

  

  Brett Swift

  committed
  f7dc38d

• Delete HUD components for renaming

  

  Brett Swift

  committed
  d9b22f3

• Add hud components with renamed directory

  

  Brett Swift

  committed
  09eff14

Commits on Feb 27, 2015

• Add information to element events

  

  Brett Swift

  committed
  e2335a6

Commits on Mar 2, 2015

• Div injection now works (I think?)

  

  Nathan Marshak

  authored and

  spencerfrazier

  committed
  1a46caa

• Instead of creating a new mediaObject for every case of file format, we now create a single mediaObject and augment as necessary.

  spencerfrazier

  committed
  96efc54

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

  

  Nathan Marshak

  authored and

  spencerfrazier

  committed
  654f7eb

• Adding multi-format support appears to work!

  

  Nathan Marshak

  authored and

  spencerfrazier

  committed
  5768c41

• 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

  committed
  d3437e2

• Adding some comments to explain what I commented out.

  spencerfrazier

  committed
  df3db10

• Removed two unnecessary lines of code.

  

  Nathan Marshak

  committed
  72c415c

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

  Show description for 3c96ab0
  

  Nathan Marshak

  committed
  3c96ab0

Commits on Mar 3, 2015

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

  

  Nathan Marshak

  committed
  177569d

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

  Show description for 9b3697b
  

  Nathan Marshak

  committed
  9b3697b

Commits on Mar 4, 2015

• Fixed spacing and removed some debug code.

  

  Nathan Marshak

  committed
  22f6a62

• Merge pull request #477 from virtual-world-framework/branch/jplayer-multi-format-support

  Show description for 7bdbd14
  

  Nathan Marshak

  committed
  7bdbd14

Commits on Mar 11, 2015

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

  Show description for f58860c
  

  Nathan Marshak

  committed
  f58860c

Commits on Mar 13, 2015

• Now, per Brett's suggestion, we changed stopExecutingForNode in

  Show description for bc7c369
  

  Nathan Marshak

  committed
  bc7c369

• Merge pull request #480 from virtual-world-framework/branch/blockly_single_stop_exec

  Show description for 63de81b
  

  Nathan Marshak

  committed
  63de81b

• Allow images to be inserted at run time

  

  Brett Swift

  committed
  f36355f

• Remove UI visibility code from blockly_activeNodeID handler

  

  Brett Swift

  committed
  a563a6c

• Add blockly_interfaceVisible property

  

  Brett Swift

  committed
  56b69a5

• Only fire blocklyVisibleChanged if active node is defined

  

  Brett Swift

  committed
  f70cf77

• Fire blocklyVisibleChanged when active node changes

  

  Brett Swift

  committed
  5a8ba67

• Merge pull request #481 from virtual-world-framework/branch/mg-hud-support

  Show description for 813e429
  BrettASwift

  committed
  813e429

Commits on Mar 18, 2015

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

  

  davideaster

  authored and

  AmbientOSX

  committed
  bccb8bc

• Optimized kernel.application calls in view/threejs

  AmbientOSX

  committed
  81e8f32

Commits on Mar 19, 2015

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

  Show description for b67a365
  kadst43

  committed
  b67a365

Commits on Mar 23, 2015

• Re-apply transparency fix to collada loader

  

  Brett Swift

  committed
  7b7159f

• Enable specular map from specularLevel node

  

  Brett Swift

  committed
  9b9040a

• Merge pull request #484 from virtual-world-framework/branch/collada-transparency-fix

  Show description for 6f40570
  kadst43

  committed
  6f40570

Commits on Apr 7, 2015

• Brings back the trashcan and removes an offset that isn't needed (which should fix tooltips and mutator callout origins for Blockly).

  AmbientOSX

  committed
  147b793

• Clean up changes

  AmbientOSX

  committed
  d70e9de

Commits on Apr 8, 2015

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

  Show description for be8d366
  spencerfrazier

  committed
  be8d366

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
  9fda43c

Commits on Apr 10, 2015

• Remove log messages

  AmbientOSX

  committed
  dcfa9c2

Commits on Apr 20, 2015

• Now we are checking if the URL exists.

  

  Nathan Marshak

  committed
  242deb7

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

  Show description for f183bd9
  

  Nathan Marshak

  committed
  f183bd9

Commits on Apr 21, 2015

• "load" now works in the jPlayer model.

  

  Nathan Marshak

  committed
  18ca8f4

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

  

  Nathan Marshak

  committed
  4463792

• Merge pull request #489 from virtual-world-framework/branch/jplayer-preload

  Show description for 61daccf
  

  Nathan Marshak

  committed
  61daccf

• Merge pull request #488 from virtual-world-framework/branch/Blockly-Change-Exe-Time

  Show description for 4288c1a
  spencerfrazier

  committed
  4288c1a

Commits on Apr 22, 2015

• Now we can pre-load the correct cutscenes in the scenario1* series of scenarios.

  

  Nathan Marshak

  committed
  53be4d1

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

  Show description for f321e9e
  

  Nathan Marshak

  committed
  f321e9e

Commits on Apr 23, 2015

• Update jPlayer.js

  Show description for f9f7b39
  

  Nathan Marshak

  committed
  f9f7b39

• Update jPlayer.js

  Show description for ad33667
  

  Nathan Marshak

  committed
  ad33667

• Merge pull request #492 from virtual-world-framework/branch/video_load_on_url_set

  Show description for 8d23971
  

  Nathan Marshak

  committed
  8d23971

Commits on Apr 24, 2015

• Add lights property to shader material

  

  Brett Swift

  committed
  36214c5

• Allow properties to be stored on material for use in updateFunction

  

  Brett Swift

  committed
  a015f89

• Store custom properties on material object

  

  Brett Swift

  committed
  5692c50

• Fix uniform generation with shader material components

  

  Brett Swift

  committed
  8db9cbf

Commits on Apr 27, 2015

• Texture arrays and texture wrapping to shader materials

  

  Brett Swift

  committed
  6032785

• Merge pull request #493 from virtual-world-framework/branch/shader-material-support

  Show description for 404b06b
  BrettASwift

  committed
  404b06b

Commits on Apr 28, 2015

• Refinements in progress...

  AmbientOSX

  committed
  847fbcc

• Speed up working.

  AmbientOSX

  committed
  1c084a5

Commits on Apr 30, 2015

• Remove a log message

  AmbientOSX

  committed
  e619348

Commits on May 5, 2015

• Fix error message

  AmbientOSX

  committed
  01a6f61

• Merge pull request #494 from virtual-world-framework/branch/blockly-refinements

  Show description for 9f50fb5
  spencerfrazier

  committed
  9f50fb5

Commits on May 9, 2015

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

  davideaster

  committed
  e62fc4f

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

  davideaster

  committed
  1feaa0e

Commits on May 11, 2015

• No stage/log.

  davideaster

  committed
  58b79c1

• Optimize kernel.application.

  davideaster

  committed
  b248459

Commits on May 12, 2015

• Setting up to be merged into mars-game-dev

  AmbientOSX

  committed
  61de7c1

• Merge pull request #495 from virtual-world-framework/branch/optimization-tests-mars-game

  Show description for e234163
  spencerfrazier

  committed
  e234163

Commits on May 15, 2015

• Added ability to set defines in shaders

  

  Brett Swift

  committed
  8f75776

Commits on May 16, 2015

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

  Show description for 0516816
  BrettASwift

  committed
  0516816

Commits on May 17, 2015

• Update shader material when defines are modified

  

  Brett Swift

  committed
  d41d2f3

• Merge pull request #497 from virtual-world-framework/branch/shader-material-defines

  Show description for 16533b3
  BrettASwift

  committed
  16533b3

Commits on May 18, 2015

• Prevents invalid xml from being loaded

  AmbientOSX

  committed
  61e2214

• Fix handling of Blockly clear

  AmbientOSX

  committed
  3510aac

• Merge pull request #498 from virtual-world-framework/branch/blockly-clear-xml

  Show description for 0cc0bdb
  spencerfrazier

  committed
  0cc0bdb

Commits on May 19, 2015

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

  AmbientOSX

  committed
  09305d1

• Merge pull request #499 from virtual-world-framework/branch/blockly-updates+grid

  Show description for 1aea167
  spencerfrazier

  committed
  1aea167

Commits on May 21, 2015

• Check if blocklyNode and previousBlocklyNode are defined before setting the blockXML.

  

  Brett Swift

  committed
  fbb1922

• Merge pull request #500 from virtual-world-framework/branch/fix-toolbox-update

  Show description for 6d61407
  kadst43

  committed
  6d61407

Commits on Jun 5, 2015

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

  

  Brett Swift

  committed
  6ecb32a

• Merge pull request #502 from virtual-world-framework/branch/canvas-material

  Show description for f038814
  BrettASwift

  committed
  f038814

Commits on Jun 10, 2015

• Fix for extending heightmap

  

  Brett Swift

  committed
  872502c

Commits on Jun 17, 2015

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

  Show description for 03695e9
  BrettASwift

  committed
  03695e9

Commits on Jul 3, 2015

• Modify analytic particle solver and convert tabs to spaces

  

  Brett Swift

  committed
  050c68a

Commits on Jul 5, 2015

• More fixes to analytic solver

  

  Brett Swift

  committed
  ec21545

Commits on Jul 6, 2015

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

  Show description for 1cf86d5
  BrettASwift

  committed
  1cf86d5

Commits on Jul 8, 2015

• Start of refactor for new version of blockly.

  AmbientOSX

  committed
  c33e55b

• Refactor in progress... addressing some deprecated Blockly function calls

  AmbientOSX

  committed
  37e4c7d

Commits on Jul 9, 2015

• Fix width issue with retrieving old blocks

  AmbientOSX

  committed
  426aa6f

Commits on Jul 10, 2015

• Undo changes to make rollback of Blockly work.

  AmbientOSX

  committed
  2f8ec1f

Commits on Jul 13, 2015

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

  Show description for e83dec4
  spencerfrazier

  committed
  e83dec4

Commits on Jul 22, 2015

• Core changes made (trashcan, toolbox autoclose, tooltip speed, selection CSS)

  AmbientOSX

  committed
  5d18418

• Merge pull request #506 from virtual-world-framework/branch/blockly-core-changes-mars-game

  Show description for 3cb67fe
  spencerfrazier

  committed
  3cb67fe

Commits on Jul 31, 2015

• Add fog define toggle for shader materials

  

  Brett Swift

  committed
  a09aa7d

Commits on Aug 1, 2015

• Core changes that support some flyout/aesthetic/UI changes

  Show description for 70feaf6
  AmbientOSX

  committed
  70feaf6

• Fix alignment, fix coloring, update closing dropdown window, add variable icon.

  AmbientOSX

  committed
  1bbd8d0

• Really update variable

  AmbientOSX

  committed
  c35531d

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

  Show description for e7f2494
  BrettASwift

  committed
  e7f2494

Commits on Aug 3, 2015

• Allow entire HUD to be disabled

  

  Brett Swift

  committed
  819da5b

• Disable events when hud is disabled

  

  Brett Swift

  committed
  d590b05

• Merge pull request #508 from virtual-world-framework/branch/blockly-core-v3

  Show description for 56382bf
  AmbientOSX

  committed
  56382bf

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

  Show description for 210b413
  AmbientOSX

  committed
  210b413

• Changes radial select to use 90 degree angles only, removes comment and help fields from context menus.

  AmbientOSX

  committed
  17a0f8c

Commits on Aug 4, 2015

• Reduces time between lines for Blockly.

  AmbientOSX

  committed
  0904b1b

• Allow manual setting of hud element draw order

  

  Brett Swift

  committed
  08f8a04

Commits on Aug 5, 2015

• Merge pull request #511 from virtual-world-framework/branch/blockly-execution-speed-fix

  Show description for a79d7bd
  AmbientOSX

  committed
  a79d7bd

• Merge pull request #512 from virtual-world-framework/branch/hud-draw-order

  Show description for 468a539
  BrettASwift

  committed
  468a539

• Merge pull request #510 from virtual-world-framework/branch/blockly-core-v4

  Show description for 01653f8
  AmbientOSX

  committed
  01653f8

Commits on Aug 12, 2015

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

  AmbientOSX

  committed
  4a4bec4

Commits on Aug 17, 2015

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

  Show description for bdf16fe
  AmbientOSX

  committed
  bdf16fe

Commits on Aug 18, 2015

• Add a scene.vwf enableRenderer property.

  Show description for 9522976
  davideaster

  committed
  9522976

Commits on Aug 19, 2015

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

  Show description for 4ea2e3a
  BrettASwift

  committed
  4ea2e3a

Commits on Aug 24, 2015

• Fixes satProperty for blockly_xml

  AmbientOSX

  committed
  2fe2f09

• Revert change/clean up code

  AmbientOSX

  committed
  e625c42

• Another reversion

  AmbientOSX

  committed
  9af8ade

• Add support for reset.

  AmbientOSX

  committed
  7567902

Commits on Aug 26, 2015

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

  Show description for 0b69713
  AmbientOSX

  committed
  0b69713

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
  1ed659c

Commits on Sep 9, 2015

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

  Show description for 02353c3
  AmbientOSX

  committed
  02353c3

Commits on Oct 14, 2015

• Reset internal array when uniform length changes

  

  Brett Swift

  committed
  b65ac8c

• Merge pull request #519 from virtual-world-framework/branch/uniform-array-length

  Show description for d119a26
  BrettASwift

  committed
  d119a26

Commits on Nov 4, 2015

• Fix bug where disabling hud prevented mouse events on canvas

  

  Brett Swift

  committed
  795ea1d

Commits on Nov 5, 2015

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

  Show description for d0fda58
  BrettASwift

  committed
  d0fda58

Commits on Jan 20, 2016

• Only call notifyDriverOfPrototypeAndBehaviorProps if node and threeObject exist

  

  Brett Swift

  committed
  b1eeafa

Commits on Jan 25, 2016

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

  Show description for 270d238
  BrettASwift

  committed
  270d238