7801 commits

Author	SHA1	Message	Date
Wayne Chen	1258676d56	fixing text height/toolbar coming back	2018-11-26 21:01:34 -08:00
Wayne Chen	bf285b3570	adding experimental login state sound	2018-11-21 14:14:07 -08:00
Wayne Chen	51f5942a7f	adding sound to login screen	2018-11-21 13:36:36 -08:00
sam gateau	be03859ed6	Warnings from build	2018-11-21 13:31:54 -08:00
Wayne Chen	d12655ed7b	sfx to login mousearea/hiding desktop toolbar	2018-11-21 12:21:19 -08:00
sam gateau	44b9b92450	Getting ready for merge	2018-11-20 17:32:04 -08:00
Wayne Chen	cdee10d0b8	getting dominant hand laser + sign up working	2018-11-20 16:54:16 -08:00
Wayne Chen	5f658b90ff	Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2	2018-11-20 10:44:29 -08:00
Wayne Chen	d55c9467e7	fixing keyboard offset	2018-11-20 10:37:30 -08:00
Wayne Chen	2820328137	Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2	2018-11-19 15:21:24 -08:00
Wayne Chen	1419ec907b	adding wip	2018-11-19 13:57:55 -08:00
David Rowe	7ffa70d0ac	Fix memory accumulating while Interface is minimized	2018-11-20 09:36:58 +13:00
Wayne Chen	3555276817	Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2	2018-11-19 09:02:30 -08:00
Wayne Chen	b8d8710604	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-19 09:02:16 -08:00
Sam Gateau	5f062bbcf5	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-11-16 20:05:08 -08:00
Jason Najera	da3ea682ba	Merge pull request #14347 from r3tk0n/19550-oculus-store-v2 ... MS19550 - Don't show help for HMDs that aren't plugged in and active	2018-11-16 15:49:46 -08:00
SamGondelman	cbe5814c64	shader compilation prototype	2018-11-16 15:18:56 -08:00
Shannon Romano	6425a474ac	Merge pull request #14378 from danteruiz/fix-case-of-infinate-loading ... Fixing case of interstitial not finishing loading	2018-11-16 14:53:01 -08:00
Wayne Chen	4f1361c0ea	adding keyboard following login dialog	2018-11-16 12:31:22 -08:00
Wayne Chen	a2a09bc2b9	fixing compile error	2018-11-16 11:16:24 -08:00
Sam Gateau	0166d7748a	Merging with master around rc76 cut time	2018-11-15 22:52:37 -08:00
Wayne Chen	27f02c072a	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-15 18:49:49 -08:00
Wayne Chen	02248e77e4	got the overlay to start recentering	2018-11-15 17:03:55 -08:00
r3tk0n	60832b071c	Fix logic for cases with rift headset but no touch controllers.	2018-11-15 14:08:38 -08:00
John Conklin II	8177d5bbcd	Merge pull request #14275 from Atlante45/fix/injector-crash ... Rework audio data memory ownership model to fix injector crashes	2018-11-15 13:25:42 -08:00
Dante Ruiz	20ad05726e	entity server timout	2018-11-15 10:52:40 -08:00
Wayne Chen	bf731f32b9	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-15 09:46:32 -08:00
Jamil Akram	60b58977cd	Merge pull request #14267 from humbletim/fb17479-fix-handshake-keyrelease ... FB17479 - Fix scripted key release events for handshakes.	2018-11-15 09:21:32 -08:00
Wayne Chen	e787fd5371	experimenting with overlay pos/rot. update	2018-11-15 08:02:28 -08:00
Wayne Chen	c85b840db0	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-14 14:47:56 -08:00
Wayne Chen	6707bf55ef	experimenting login overlay following hmd	2018-11-14 14:46:59 -08:00
Clement	7192aed131	Rework audio data memory ownership model	2018-11-14 14:45:18 -08:00
Wayne Chen	76f33ff853	dont allow auto-switch after display mode change	2018-11-14 13:27:00 -08:00
Wayne Chen	7375840eda	adding 3d keyboard/get anchor id wip for reposition	2018-11-13 17:09:47 -08:00
Thijs Wenker	cc207537a3	Fix for unintended snapshots while parenting/un-parenting	2018-11-14 01:05:38 +01:00
r3tk0n	dd8bbeb0e5	Clean up code and remove comments.	2018-11-13 15:36:25 -08:00
r3tk0n	ecee319602	Get logic working correctly.	2018-11-13 15:20:46 -08:00
Wayne Chen	e84361f267	getting hmd/desktop switch working	2018-11-13 14:20:23 -08:00
Jamil Akram	822e4bfe48	Merge pull request #14386 from ctrlaltdavid/M19820 ... Fix entities not loading when Interface doesn't have focus	2018-11-13 13:45:42 -08:00
Brad Hefta-Gaub	bb2239c0bd	Merge pull request #14359 from howard-stearns/no-url-logging ... remove urls from logs in Interface	2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub	4cab805392	Merge pull request #12718 from gcalero/tester_flag ... Detect if Interface is running on an android testing device	2018-11-13 13:13:52 -08:00
Brad Hefta-Gaub	41d8220cbd	Merge pull request #14362 from ctrlaltdavid/M19768 ... Add option to enable/disable the mini tablet	2018-11-13 11:59:24 -08:00
Brad Hefta-Gaub	47cd6b332c	Merge pull request #14349 from hyperlogic/bug-fix/head-trackers-in-desktop-mode ... Bug fix for head trackers in desktop mode	2018-11-13 11:49:24 -08:00
Dante Ruiz	10d045b11b	fix infinate loading if entity server is not running	2018-11-13 11:07:26 -08:00
Brad Hefta-Gaub	4bafcd2cfa	Merge pull request #14271 from SamGondelman/oculus ... Case 19475: Fix various Oculus Store test failures	2018-11-13 11:06:39 -08:00
Wayne Chen	5b021041bb	adding play area center for overlay position	2018-11-13 10:23:28 -08:00
Howard Stearns	545b85bc9d	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-13 09:55:54 -08:00
Seth Alves	969776e476	Merge pull request #14312 from ctrlaltdavid/M18577 ... Add option to start up at home location	2018-11-13 09:29:37 -08:00
David Rowe	e12833da23	Fix entities not loading when Interface doesn't have focus ... Reverts https://github.com/highfidelity/hifi/pull/14286	2018-11-13 14:50:02 +13:00
r3tk0n	597f83e6d5	HoMerge branch 'master' of https://github.com/highfidelity/hifi into 19550-oculus-store-v2	2018-11-12 13:58:37 -08:00
Howard Stearns	66ae01e0c3	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-12 12:55:20 -08:00
John Conklin II	9d404a6cf3	Merge pull request #14379 from Cristo86/gles_use_tbo_no_ssbo ... case 19562: GLES - Use TBO instead of SSBO and make shaders use it when it is not gl45 (master)	2018-11-12 10:45:52 -08:00
Wayne Chen	c927cd6287	wip on overlay spawn in play area	2018-11-09 15:02:14 -08:00
Wayne Chen	b500a9ebbb	using experimental play area	2018-11-08 17:13:14 -08:00
David Rowe	c9b3fda724	Merge branch 'master' into M19768 ... # Conflicts: # interface/src/scripting/HMDScriptingInterface.h	2018-11-09 13:56:44 +13:00
r3tk0n	d2a1b35f96	Fix desktop case showing Vive controls.	2018-11-08 16:50:11 -08:00
Wayne Chen	f66326fc4d	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-08 15:51:24 -08:00
Wayne Chen	f4ae55d534	adding experimental play area position for overlay	2018-11-08 15:46:27 -08:00
Wayne Chen	fe0bbe19d7	creating login overlay upon startup in HMD/feedback changes	2018-11-08 14:32:11 -08:00
John Conklin II	3fabe557c2	Merge pull request #13948 from danteruiz/3d-keyboard ... 3D Keyboard.	2018-11-08 13:35:13 -08:00
Zach Fox	1de4f9c3cc	Correct portal math	2018-11-08 13:07:49 -08:00
Wayne Chen	e266532888	Merge branch 'master' into loginInitiative2	2018-11-08 11:17:24 -08:00
Jamil Akram	7c22a1954c	Merge pull request #14237 from NissimHadar/addNoLogin ... case 18450: Do not show login dialog if requested not to on the command line.	2018-11-08 10:43:21 -08:00
Dante Ruiz	358aa547b1	feedback changes	2018-11-08 09:58:53 -08:00
Dante Ruiz	501746b156	3D Keyboard	2018-11-08 09:58:53 -08:00
Zach Fox	1ab1cb95d8	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-08 09:57:10 -08:00
Zach Fox	d2d5132f72	It's working!	2018-11-07 14:51:19 -08:00
Wayne Chen	b837cbd8a0	removing debug statement	2018-11-07 14:05:50 -08:00
Wayne Chen	8e075c2a7c	fixing login qml/using HMD position for overlay	2018-11-07 14:05:06 -08:00
Zach Fox	668e4aeafd	The Beginnings	2018-11-07 11:55:10 -08:00
Wayne Chen	fc32ba9ce3	fixing create app window on desktop	2018-11-07 09:26:34 -08:00
David Rowe	28097933ed	Add setting to enable/disable the mini tablet	2018-11-07 14:39:06 +13:00
Wayne Chen	1ded4b6fb8	hiding previous username/hiding dev menu	2018-11-06 16:45:45 -08:00
Wayne Chen	7c2dd973b7	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-06 15:34:34 -08:00
Wayne Chen	8797c40d94	cleanup unused functions	2018-11-06 15:04:51 -08:00
Howard Stearns	05becb870f	remove urls from logs in Interface	2018-11-06 13:47:07 -08:00
Wayne Chen	c8071e81b1	sending user to saved address if logged in	2018-11-06 13:32:31 -08:00
Wayne Chen	9beedf9292	changing login overlay size + add keyboard	2018-11-06 12:56:50 -08:00
Zach Fox	c33f9b6ea3	Fix build error	2018-11-06 11:26:09 -08:00
Zach Fox	58dd690c0a	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-11-06 10:29:05 -08:00
Wayne Chen	77b47d4b32	adding class for creating overlay and lasers	2018-11-05 17:29:01 -08:00
Anthony Thibault	ac8281075b	Code review feedback ... Added comment to explain removal of displayPlugin->resetSensors from Application::resetSensors()	2018-11-05 17:25:00 -08:00
Anthony Thibault	ac8869eb61	Bug fix for head trackers in desktop mode ... Sitting and standing modes work even in desktop mode. We were inadvertently checking for HMD Mode instead of if the head was valid. * A change was made to the ViveControllerManager to return head poses in the correct standing universe when in desktop mode. * The default sensorToWorld matrix in desktop mode is similar to the one returned by the system for Vive and Oculus sensor frame; y = 0 is at floor level. * Sitting mode, walking mode and recentering flags are now visible in the AnimStats.	2018-11-05 16:21:19 -08:00
Gabriel Calero	344774dcec	Merge remote-tracking branch 'upstream/master' into tester_flag	2018-11-05 19:13:04 -03:00
Wayne Chen	9deeee6534	removing unused classes	2018-11-05 11:07:29 -08:00
Wayne Chen	2dd20de1bd	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-05 09:13:25 -08:00
Wayne Chen	23141662ff	changing button channel to enum	2018-11-02 20:09:28 -07:00
Zach Fox	a87142b8b7	Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce	2018-11-02 16:49:20 -07:00
Zach Fox	402c23e359	Use useragent instead of queryparam to determine limitedCommerce	2018-11-02 16:07:29 -07:00
Sam Gateau	fa0c58fa0e	Assign the correct binding slots for the Resource Buffers to fix the deformed mesh rendering of the Avatar in gles backend	2018-11-02 00:08:47 -07:00
Wayne Chen	7f805ebcb4	more wip	2018-11-01 17:16:15 -07:00
Zach Fox	20cd1df22c	Lotsa changes	2018-11-01 16:48:08 -07:00
Wayne Chen	c28ed9fc4b	enabling certain menus/key events in login	2018-11-01 13:38:27 -07:00
Zach Fox	b43ad15fa7	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-11-01 11:32:38 -07:00
Wayne Chen	6822287d67	sending to tutorial if dismiss login	2018-10-31 16:13:01 -07:00
Zach Fox	d4e9a70564	Almost there	2018-10-31 16:12:16 -07:00
Zach Fox	41a0d09389	First pass	2018-10-31 15:31:51 -07:00
Wayne Chen	f62c8ae87a	overlay HMD implementation	2018-10-31 15:26:49 -07:00
David Rowe	ae2715af31	Add option to start up at home location	2018-11-01 08:57:12 +13:00
Wayne Chen	67539bc87a	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-10-31 09:00:37 -07:00