7725 commits

Author	SHA1	Message	Date
Wayne Chen	d12655ed7b	sfx to login mousearea/hiding desktop toolbar	2018-11-21 12:21:19 -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
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
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
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
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