6839 commits

Author	SHA1	Message	Date
divya	91df342ae9	Merge pull request #14094 from wayne-chen/interstitialMerged ... Merged interstitial page/redirect domain improvements	2018-10-08 10:32:29 -07:00
Wayne Chen	f758438dcc	Merge pull request #9 from danteruiz/interstitialMerged ... fix for failing to enter domain	2018-10-05 16:19:25 -07:00
Dante Ruiz	36c2cceb57	fix for failing to enter domain	2018-10-05 15:39:51 -07:00
Wayne Chen	8abbd51bb1	removing unused variable	2018-10-04 23:11:27 -07:00
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
Wayne Chen	89e2cf7153	Merge pull request #7 from danteruiz/interstitialMerged ... Interstitial merged	2018-10-04 17:10:27 -07:00
Wayne Chen	a2237aa48a	reverting click overlay behavior	2018-10-04 16:41:14 -07:00
Wayne Chen	c423305bd1	check overlay visibility before showing back up again	2018-10-04 16:30:48 -07:00
Dante Ruiz	651f37aceb	Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged	2018-10-04 15:01:39 -07:00
Dante Ruiz	bda9735b5d	fix loading progress	2018-10-04 15:01:16 -07:00
Wayne Chen	2e3566bc73	hide overlays after clicking on them	2018-10-04 14:24:43 -07:00
Wayne Chen	0a7102b4d3	Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged	2018-10-04 08:59:26 -07:00
Wayne Chen	22a9030fb5	hiding text overlays when out of error state	2018-10-03 17:54:55 -07:00
Wayne Chen	d6af09ca62	ignoring entities in interstitial/saving address on 404 error	2018-10-03 17:40:42 -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
Wayne Chen	efeb598495	fixing bug with hover overlay	2018-10-03 10:12:07 -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
Wayne Chen	36dbcd41ba	Merge branch 'interstitialMerged' of https://github.com/wayne-chen/hifi into interstitialMerged	2018-10-01 16:11:40 -07:00
Wayne Chen	69b547a9fe	text overlays for consistency	2018-10-01 16:11:27 -07:00
Wayne Chen	8f36bc0850	Merge pull request #4 from danteruiz/interstitialMerged ... Interstitial screen updates	2018-10-01 15:43:04 -07:00
Dante Ruiz	66bb5f68d2	updating interstitialmode	2018-10-01 15:26:56 -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
Wayne Chen	eab57633a5	Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged	2018-10-01 09:21:26 -07: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