72476 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Roxanne Skelly	537c0aaf25	Revert "Add temporary code to test for interface paths" ... This reverts commit 6393f907b8.	2018-09-28 13:15:04 -07:00
John Conklin II	5d00aa0bdb	Merge pull request #14009 from sethalves/fix-worn-shape-double-scale ... fix scaling of worn shape entities	2018-09-28 13:08:46 -07:00
John Conklin II	b4abaabe5e	Merge pull request #14107 from kkurian/hotfix-marketplace-item-tester ... Fix application uninstall in marketplace item tester	2018-09-28 12:58:33 -07:00
Roxanne Skelly	6393f907b8	Add temporary code to test for interface paths	2018-09-28 12:33:38 -07:00
Howard Stearns	053f22182a	fix inspection case	2018-09-28 11:57:36 -07:00
Howard Stearns	2d29906e3c	Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2	2018-09-28 11:22:57 -07:00
Roxanne Skelly	ee8290f71c	Fix comment	2018-09-28 11:10:42 -07:00
Roxanne Skelly	1aaaca4e6c	Code review changes	2018-09-28 10:48:20 -07:00
Gabriel Calero	b7c421ba47	Fixes according to review	2018-09-28 14:39:15 -03:00
Roxanne Skelly	fb3205a847	More OSX Path fixes	2018-09-28 10:02:03 -07:00
sabrina-shanman	e51f48d7ef	Add collision pick documentation on scaleWithParent option	2018-09-28 09:55:02 -07:00
Gabriel Calero	c0c95a1d33	Fix flickering between login and signup screens	2018-09-28 13:53:18 -03:00
sabrina-shanman	8f2d3b17d3	Fix parabola scaling issues and raypick velocity denormalization due to transform affecting direction scale	2018-09-28 09:27:38 -07:00
Roxanne Skelly	2f1f1d896c	Merge branch 'sysTraySetup' of https://github.com/roxanneskelly/hifi into sysTraySetup	2018-09-28 09:24:52 -07:00
Roxanne Skelly	dde106e42e	Make tray icon light map to notification status of various menus	2018-09-28 09:24:00 -07:00
Wayne Chen	a8b86bd555	removing debug statement	2018-09-28 08:44:49 -07:00
Gabriel Calero	0d40d78343	Expand clic area for forget password	2018-09-28 12:04:05 -03:00
Sam Gateau	faf489855c	Packing the offsets and catching up performances	2018-09-28 02:13:08 -07:00
David Rowe	1c4bde3e84	Fix build warnings	2018-09-28 18:38:38 +12:00
Roxanne Skelly	4257a4dfdd	Try fixing binary name for 'running process' detection of interface	2018-09-27 23:12:24 -07:00
Kerry Ivan Kurian	440e2062f5	Fix application uninstall in marketplace item tester	2018-09-27 22:14:02 -07:00
Wayne Chen	5c9094d81f	removing debug print statement	2018-09-27 21:24:04 -07:00
Wayne Chen	d5950db2a4	fix for showing the text overlay in mac	2018-09-27 21:20:06 -07:00
David Rowe	545c2591e3	Merge branch 'master' into M18586	2018-09-28 16:19:44 +12:00
David Rowe	7f518d0aa1	Make teleport parabolas semi-transparent	2018-09-28 16:13:25 +12:00
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