Bradley Austin Davis 7e60aee1bf Merge branch 'master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/avatar/Head.cpp interface/src/avatar/MyAvatar.cpp interface/src/avatar/MyAvatar.h interface/src/avatar/SkeletonModel.cpp interface/src/avatar/SkeletonModel.h interface/src/devices/3DConnexionClient.cpp interface/src/ui/overlays/Overlays.cpp		2015-08-06 11:03:37 -07:00
..
audio	Added .js file to examples/example/audio and added public bucket url functionality.	2015-07-27 12:14:50 -04:00
avatarcontrol	restore camera lookAt and keepLookingAt features	2015-01-07 13:41:07 -08:00
entities	Initial file placement into job.	2015-07-21 18:10:13 -04:00
games	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-30 12:55:22 -07:00
metavoxels	More Script updates	2015-01-06 22:32:45 -08:00
misc	refined the names of the key light porperties in Stage	2015-04-21 11:04:14 -07:00
scripts	;) (added semicolons to js example)	2015-06-09 09:45:19 -07:00
ui	Fix click and drag logic for floatingUIExample.js.	2015-08-03 12:01:15 -07:00
brownianFun.js	added brownianFun script to apply random forces to balls in a pen	2015-05-29 17:02:51 -07:00
downloadInfoExample.js	Add downloads information changed event for JavaScript	2015-01-07 11:20:46 -08:00
dynamicLandscape.js	added meditative ocean landscape and common utilities file	2015-06-08 14:02:38 -07:00
entityCollisionExample.js	Update header.	2015-05-26 13:27:37 -07:00
globalCollisionsExample.js	typo	2015-05-25 17:23:22 -07:00
solarsystem.js	refactoring variables and constants, fix update loop to continue over unlaunched satellites	2015-07-28 13:01:20 -07:00
soundToys.js	Sound toys script (in examples/soundToys.js)	2015-06-04 14:20:19 -07:00