Brad Davis 3c1a0930da Merge remote-tracking branch 'upstream/master' into HEAD ... Conflicts: interface/src/avatar/MyAvatar.h libraries/script-engine/src/ScriptEngine.cpp libraries/script-engine/src/ScriptEngine.h		2015-10-28 13:38:22 -07:00
..
omniTool	Cleaning up some debugging spew and fixing UI HTML paths	2015-09-04 09:59:42 -07:00
avatarRelativeOverlays.js	Working on magballs polish	2015-09-03 20:09:54 -07:00
constants.js	Working on magballs polish	2015-09-03 20:09:54 -07:00
dataViewHelpers.js
entityCameraTool.js	Fix scripts syntax errors	2015-10-27 12:11:27 -07:00
entityList.js	Merge pull request #5789 from highfidelity/revert-5777-revert-5769-edit-js-adjustment	2015-10-02 16:28:54 -07:00
entityPropertyDialogBox.js	rename frameIndex to currentFrame	2015-10-07 13:02:58 -07:00
entitySelectionTool.js	damn you visual studio	2015-10-11 14:02:33 -07:00
globals.js
gridTool.js
highlighter.js	Working on magballs polish	2015-09-03 20:09:54 -07:00
htmlColors.js	Fixing colors	2015-09-02 15:56:38 -07:00
httpMultiPart.js
lightOverlayManager.js
omniTool.js	Moving omniTool to a route mapped input	2015-10-23 13:40:36 -07:00
overlayManager.js
overlayUtils.js
progressDialog.js
soundArray.js	Fix scripts syntax errors	2015-10-27 12:11:27 -07:00
stringHelpers.js
toolBars.js	fix comment typo	2015-08-25 16:41:10 -07:00
ToolTip.js
uiwidgets.js	Fixed sliders	2015-08-28 15:43:55 -07:00
unitTest.js
utils.js	Fixing omnitool	2015-10-23 13:40:36 -07:00
virtualKeyboard.js	Remove forgotten cursorVisible	2015-10-06 15:58:35 -07:00
walkApi.js	fix walkApi.js to detect hydra in official way	2015-10-23 17:53:34 -07:00
walkConstants.js	fix lin endings of some JS files	2015-10-20 13:26:19 -07:00
walkFilters.js	fix lin endings of some JS files	2015-10-20 13:26:19 -07:00
walkSettings.js	fix lin endings of some JS files	2015-10-20 13:26:19 -07:00