6798 commits

Author	SHA1	Message	Date
Sam Gateau	46a50b04ea	Merge pull request #14034 from samcake/black-bis ... Refactor Deformed mesh rendering pipeline for better scalability and performances at runtime	2018-10-04 20:41:28 -07:00
Sam Gateau	c194e795ac	Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis	2018-10-03 12:12:15 -07:00
sabrina-shanman	2ef85dfdba	Merge branch 'master' into stt_parenting2	2018-10-03 11:39:00 -07:00
John Conklin II	4805d3564a	Merge pull request #14075 from ctrlaltdavid/M18586 ... Teleport with play area	2018-10-03 11:02:33 -07:00
John Conklin II	9a614d7523	Merge pull request #13977 from dback2/newEntityListView ... New optimized entity list view	2018-10-03 09:23:11 -07:00
John Conklin II	8bd8d05409	Merge pull request #14118 from luiscuenca/handTouchLMFix ... Disable Hand Touch when Leap Motion is running	2018-10-03 09:03:43 -07:00
sam gateau	680f5f5703	Merge branch 'master' of github.com:highfidelity/hifi into black-bis	2018-10-02 15:25:19 -07:00
David Rowe	2bdd8bfdc7	Update play area and sensor overlay models and raise a little	2018-10-03 11:09:04 +13:00
David Rowe	488599dbb0	Update teleport play area FBX model to be visible from below	2018-10-03 09:31:11 +13:00
David Rowe	c0231057f8	Revert foot calc scaling change	2018-10-03 09:28:19 +13:00
John Conklin II	2cd9e565b0	Merge pull request #14101 from dback2/editHandlePickPlaneImprovements ... Edit handle pick plane improvements	2018-10-02 10:42:46 -07:00
Sam Gateau	d1d4920c35	Check and fixed the shader for nvidia regarding the unpacked variable name, adjust luci.js to be able to move the viewport	2018-10-01 21:35:18 -07:00
David Rowe	f7fd76b316	Merge branch 'master' into M18586 ... # Conflicts: # interface/src/scripting/HMDScriptingInterface.h	2018-10-02 16:49:16 +13:00
David Rowe	84a06fbe64	Don't immediately hide occlusion highlights after teleporting	2018-10-02 16:11:01 +13:00
Sam Gateau	c593f00839	Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis	2018-10-01 19:10:18 -07:00
sabrina-shanman	67dc526ee2	Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2	2018-10-01 17:17:32 -07:00
Brad Hefta-Gaub	7c9464572a	Merge pull request #14027 from huffman/feat/deprecate-undo-stack ... Remove UndoStack API	2018-10-01 17:13:48 -07:00
John Conklin II	9cbd819a39	Merge pull request #13965 from ctrlaltdavid/M17428-f ... Mini tablet in palm	2018-10-01 16:56:36 -07:00
John Conklin II	3bbc01477e	Merge pull request #14055 from davidkelly/dk/18147 ... Do not have active buy button on invalidated items	2018-10-01 16:50:53 -07:00
John Conklin II	878d2a6f25	Merge pull request #14102 from howard-stearns/account-managed-wallet-punchlist2 ... Account-managed wallet flow improvements	2018-10-01 16:43:01 -07:00
David Back	b5edf42fd0	Merge branch 'master' into editHandlePickPlaneImprovements	2018-10-01 16:36:30 -07:00
Brad Hefta-Gaub	edd5db7768	Merge pull request #14042 from thoys/perf/create/getMultipleEntities ... Speed up Entity List properties fetching by adding Entities.getMultipleEntities API	2018-10-01 16:16:48 -07:00
Brad Hefta-Gaub	ef063a4072	Merge pull request #14026 from huffman/fix/edit-rotation ... Fix edit rotation handle fidgeting	2018-10-01 16:15:32 -07:00
Brad Hefta-Gaub	6eae178389	Merge pull request #13997 from gcalero/case_18057 ... Fix switch from Top View to My View	2018-10-01 16:13:07 -07:00
David Rowe	87ff6dd56d	Fix play area sizing and positioning for different base avatar sizes	2018-10-02 10:53:31 +13:00
David Rowe	6ccd73ea47	Merge branch 'master' into M18586	2018-10-02 10:17:24 +13:00
luiscuenca	5ccbc5c029	Disable Hand Touch when Leap Motion is running	2018-10-01 10:47:06 -07:00
Thijs Wenker	eeda7400c9	check if id matches in filtered getMultipleEntityProperties	2018-10-01 19:36:53 +02:00
sam gateau	305ea80a18	Merge branch 'master' of github.com:highfidelity/hifi into black-bis	2018-10-01 08:37:19 -07:00
David Rowe	7560a2a923	Short circuit unnecessary repetition	2018-09-29 16:00:44 +12:00
David Rowe	2449868ea9	Fix mini tablet sizing for different sizes of avatar	2018-09-29 13:51:00 +12:00
Thijs Wenker	e266e2ebbf	filter getEntity(Multiple)Properties entities unitTest	2018-09-29 02:44:11 +02:00
David Rowe	8464a70c9e	Fix initial tablet scale	2018-09-29 12:42:41 +12:00
John Conklin II	130e8dfbe9	Merge pull request #14023 from dback2/selectEntityEveryFrameFix ... Only call selectEntity once triggered when using edit handles	2018-09-28 16:38:10 -07:00
John Conklin II	789062d0b9	Merge pull request #14103 from howard-stearns/shorter-handshake ... minimal time handshake	2018-09-28 16:29:38 -07:00
Ryan Huffman	feb230b3bd	Remove old comment in entitySelectionTool.js	2018-09-28 16:17:52 -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
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
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
Sam Gateau	97de12fcbc	Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis	2018-09-27 19:01:55 -07:00
howard-stearns	a6ef25f662	just whitespace and varname changes	2018-09-27 18:14:16 -07:00
sabrina-shanman	411dbbbad3	Make scripts use the default scaleWithParent when creating ray/parabola ... picks	2018-09-27 17:34:06 -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