Commit graph

72789 commits

Author SHA1 Message Date
David Rowe
f2c13f193c Don't jump in HMD mode unless option is set 2018-09-28 16:05:20 +12:00
David Rowe
868a3a9219 Tweak vertical spacing 2018-09-28 15:42:48 +12:00
Roxanne Skelly
308deeaa8d Refactoring of NSIS setup files with respect to Sandbox vs Console 2018-09-27 19:54:42 -07:00
howard-stearns
b45677cd02 additionally handle item urls (marketplace links from cert inspections) 2018-09-27 19:42:01 -07:00
David Rowe
7b7447739a Remove unused code noticed in passing 2018-09-28 14:23:20 +12:00
David Rowe
45993ba475 Provide mini tablet details via API instead of messages 2018-09-28 14:23:08 +12:00
Bradley Austin Davis
3dea4fd10a Fix some Mac rendering issues 2018-09-27 19:21:50 -07:00
Sam Gateau
97de12fcbc Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-09-27 19:01:55 -07:00
Roxanne Skelly
79c71b0b79 Merge branch 'master' of https://github.com/highfidelity/hifi into sysTraySetup 2018-09-27 18:28:53 -07:00
howard-stearns
a6ef25f662 just whitespace and varname changes 2018-09-27 18:14:16 -07:00
John Conklin II
cd18578061
Merge pull request #14002 from roxanneskelly/sysTray
Tray Notifier updates
2018-09-27 18:08:25 -07:00
David Rowe
4813f4d042 Show/hide jumping & flying checkbox depending on movement mode 2018-09-28 13:02:27 +12:00
sabrina-shanman
411dbbbad3 Make scripts use the default scaleWithParent when creating ray/parabola
picks
2018-09-27 17:34:06 -07:00
sabrina-shanman
e7c70705b2 Actually make the result transform of a collision pick just a position, as documented 2018-09-27 17:33:52 -07:00
sabrina-shanman
44efe648e0 Add scaleWithParent option to collision pick creation 2018-09-27 17:29:42 -07:00
sabrina-shanman
e176143025 Make scaleWithParent true by default for parabola picks 2018-09-27 17:29:42 -07:00
sabrina-shanman
2dd8140158 Make scaleWithAvatar an alias for scaleWithParent in PointerScriptingInterface and make true the default for parabola pointers 2018-09-27 17:29:42 -07:00
sabrina-shanman
bc861c1368 Make path pointers use scaleWithParent behind the scenes instead of scaleWithAvatar 2018-09-27 17:29:37 -07:00
sam gateau
eb97f0d193 Bringing back packed normal and tangents for static mesh! 2018-09-27 17:27:55 -07:00
luiscuenca
195df9e0ec compute feet position offset in situ 2018-09-27 17:18:43 -07:00
sam gateau
215818e313 adjusting page size but still seeing a perf drop 2018-09-27 17:18:43 -07:00
Wayne Chen
5d27cddab5 consolidating getting oops message 2018-09-27 17:16:18 -07:00
Stephen Birarda
97d5e8f614 fix for row re-ordering causing no change alone 2018-09-27 17:11:10 -07:00
Howard Stearns
f96c7f4db4 minimal time handshake 2018-09-27 17:05:18 -07:00
David Back
215e7e6da7 remove unneeded variable 2018-09-27 17:04:43 -07:00
David Back
b7c098c260 remove unneeded variable 2018-09-27 17:02:54 -07:00
David Back
4204adf60f fix deselecting entity when re-clicking row, fix ctrl/shift selections 2018-09-27 16:59:23 -07:00
Wayne Chen
8b29f7c294 making text box smaller for no occlusion 2018-09-27 16:56:45 -07:00
Roxanne Skelly
6d0996c254 Show "Sandbox" as the server component for server installs, show
"Console" for client-only installs
2018-09-27 16:52:03 -07:00
Howard Stearns
75de305ec3 remove dead code 2018-09-27 16:37:07 -07:00
Howard Stearns
7616639a40 Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-27 16:12:21 -07:00
David Rowe
d98e7cea4e Fix not being able to grab tablet with other hand 2018-09-28 11:09:16 +12:00
Howard Stearns
ad676b14a1 doh - return with a newline (and no semicolon) does not continue. Don't
need extra handler in marketplace any more.
2018-09-27 16:06:55 -07:00
David Back
8c306b8428 disable debug pick plane 2018-09-27 16:04:18 -07:00
David Back
f5d9dd82d9 better pick plane for stretch, camera-facing pick plane for scale, debug pick plane, overall cleanup 2018-09-27 16:01:20 -07:00
Howard Stearns
4cf5b51124 works, using additional handler from wallet.js 2018-09-27 15:34:16 -07:00
Roxanne Skelly
57fcdddea2 Merge branch 'sysTrayOsx' of https://github.com/roxanneskelly/hifi into sysTraySetup 2018-09-27 15:22:38 -07:00
Roxanne Skelly
c3e956932b Fix OSX Build 2018-09-27 15:22:04 -07:00
Gabriel Calero
5fc24b2587 UI fixes in login and signup for S8 and S9 aspect ratio 2018-09-27 19:20:38 -03:00
David Rowe
1088a0f9ae Fix invalid state transition in desktop mode 2018-09-28 10:19:17 +12:00
David Rowe
fc78d0582e Tidying 2018-09-28 10:18:00 +12:00
Dante Ruiz
c1c853790b update soft entities and fix deadlock 2018-09-27 14:53:28 -07:00
sabrina-shanman
74937a1979 Serialize PickRay according to its variables 2018-09-27 14:41:38 -07:00
sabrina-shanman
c3df710396 Use bracket default initialization for PickQuery::_jointState 2018-09-27 14:34:36 -07:00
sabrina-shanman
bfa270375a Simplify PickRay calculations in RayPick::getMathematicalPick 2018-09-27 14:33:29 -07:00
sabrina-shanman
9e0d35e40d Combine PickScriptingInterface::getPickJointState and createTransformNode into one function 2018-09-27 14:28:10 -07:00
humbletim
025bc19d62 save "Create Grabbable" in menuItemEvent, not scriptEnding 2018-09-27 17:08:49 -04:00
David Rowe
2456fd0e99 Merge branch 'master' into M17428-f 2018-09-28 08:41:57 +12:00
Roxanne Skelly
ec4575f587 Merge branch 'sysTrayOsx' of https://github.com/roxanneskelly/hifi into sysTraySetup 2018-09-27 13:36:10 -07:00
Roxanne Skelly
b0b2c6f3ee Fixup path finding for interface 2018-09-27 13:31:28 -07:00