27665 commits

Author	SHA1	Message	Date
Wayne Chen	1258676d56	fixing text height/toolbar coming back	2018-11-26 21:01:34 -08:00
Wayne Chen	c53febceac	adding oculus to login dialog/adding focus wip	2018-11-26 15:10:04 -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
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	4d55081184	changing the keyboard password flag appropriately	2018-11-20 10:56:34 -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	e0eba2135a	Merge branch 'master' into loginInitiative2	2018-11-19 15:23:43 -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
Ryan Huffman	c87748830f	Merge pull request #14430 from thoys/fix/create/propertiesAutoScrollOnNewEntity ... MS19903: don't trigger virtual keyboard scroll on non input focus.	2018-11-19 13:52:22 -08:00
Thijs Wenker	84e8e21d85	don't trigger virtual keyboard scroll on non input focus.	2018-11-19 21:08:21 +01:00
John Conklin II	6b25179aa9	Merge pull request #14420 from danteruiz/fix-keyboard-loging-issue ... Dismiss keyboard when backout of the login screen	2018-11-19 09:58:54 -08:00
John Conklin II	d63a850ec0	Merge pull request #14409 from danteruiz/keyboard-touchups ... keyboard address some feedback	2018-11-19 09:48:00 -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
Dante Ruiz	4388763c34	fixing keyboard not being dismissing when backout of the login screen	2018-11-16 16:04:40 -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
Dante Ruiz	a77121a588	keyboard touch ups	2018-11-16 14:20:17 -08:00
Shannon Romano	ba699e3e9b	Merge pull request #14273 from NissimHadar/MAC ... Case 19722 - Auto-Tester on Mac.	2018-11-16 12:49:58 -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
Howard Stearns	8e1785bd90	security settings post-oculus-store wording	2018-11-15 15:59:52 -08:00
Jamil Akram	35ec0b60ab	Merge pull request #14251 from humbletim/fb18302-deprecated-package-model ... FB18302 Remove deprecated Package Model functionality	2018-11-15 15:52:04 -08:00
John Conklin II	1ea2ab338e	Merge pull request #13975 from ElderOrb/FB16697 ... Fix multiple issues on 'Calibration' tab of 'Controls' dialog	2018-11-15 14:54:26 -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
NissimHadar	e6190eb429	Merge branch 'master' of https://github.com/highfidelity/hifi into MAC	2018-11-15 10:45:05 -08:00
Jeff Clinton	c72dd3d690	Merge pull request #14395 from ctrlaltdavid/M19859 ... Fix Goto app clicks not working	2018-11-15 09:56:56 -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
humbletim	d0e4c62978	fix merge conflict	2018-11-14 23:50:02 -05:00
humbletim	21030fbe5b	Merge remote-tracking branch 'upstream/master' into fb18302-deprecated-package-model	2018-11-14 23:40:04 -05:00
NissimHadar	a74e123229	Merge branch 'master' of https://github.com/highfidelity/hifi into MAC	2018-11-14 20:20:41 -08:00
Atlante45	31033ad685	Update TTS audio API use	2018-11-14 15:42:39 -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	7f910a38e3	Update keyboard injector to new interface	2018-11-14 14:46:08 -08:00
Clement	7192aed131	Rework audio data memory ownership model	2018-11-14 14:45:18 -08:00
John Conklin II	b08283d9e9	Merge pull request #14401 from sethalves/rc76-revert-pr-14238 ... revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.	2018-11-14 14:38:34 -08:00
Wayne Chen	76f33ff853	dont allow auto-switch after display mode change	2018-11-14 13:27:00 -08:00
David Rowe	9c5d318341	Fix highlighting	2018-11-15 10:15:30 +13:00
Seth Alves	1593c1185a	revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.	2018-11-14 12:29:09 -08:00