7562 commits

Author	SHA1	Message	Date
Shannon Romano	6d297d91f6	Merge pull request #15073 from danteruiz/fix-tablet-button-rotation ... Case 21512: Very difficult to use the close button on the tablet (0.81.0)	2019-03-04 10:49:16 -08:00
r3tk0n	12ffa41984	Prevent HUD and Web Surface lasers from interrupting FarGrab.	2019-03-02 13:55:06 -08:00
Sam Gateau	cc9a3e2541	Merge pull request #15052 from amerhifi/quest-demo ... case 21485: removing quest-demo specific changes	2019-03-01 15:03:44 -08:00
Jason Najera	d41c2d296b	Merge pull request #15043 from r3tk0n/fargrab-manipulation ... FarGrab Entity Rotation with Off-Hand	2019-03-01 14:42:59 -08:00
danteruiz	618a1d5b83	fix tablet button and gizmos rotation	2019-03-01 14:31:12 -08:00
Jason Najera	6346df54af	Merge pull request #15061 from r3tk0n/away_bubble_protection ... [MS#21495] Enable Bubble/Shield on Away	2019-03-01 11:17:48 -08:00
amer cerkic	6ebc57994b	Merge branch 'master' into quest-demo	2019-03-01 10:23:41 -08:00
Shannon Romano	33e061b09b	Merge pull request #15022 from danteruiz/fix-tablet-scaling ... Case 21424: Tablet does not properly resize when scaling avatar.	2019-03-01 09:37:47 -08:00
SamGondelman	8d5a3debfa	fix chat.js textSize	2019-02-28 15:28:18 -08:00
r3tk0n	1476251dcb	Enable bubble on AFK, respect user setting upon return from AFK.	2019-02-28 15:21:24 -08:00
amerhifi	35dc13e06a	Merge branch 'master' into quest-demo	2019-02-28 14:06:47 -08:00
danteruiz	f715dbe243	fix tablet scaling	2019-02-28 13:32:12 -08:00
r3tk0n	a72b02cd25	Clean up code and add comments.	2019-02-28 13:08:05 -08:00
r3tk0n	ca740c6254	Add a 2x multiplier for controller movement to entity rotation when manipulating with fargrab.	2019-02-26 18:44:00 -08:00
r3tk0n	52d80476a8	Fix activation criteria.	2019-02-26 17:55:16 -08:00
r3tk0n	9559f9ffd3	Add off-hand controller manipulation to fargrab.	2019-02-26 17:52:18 -08:00
SamGondelman	4d591e0624	fix web interaction and debug print filling logs	2019-02-26 16:30:31 -08:00
Shannon Romano	badd0b8bd3	Merge pull request #14968 from davidkelly/dk/20726 ... Guard against accidentally calling wrong api/v1/places endpoint	2019-02-25 17:16:33 -08:00
amer cerkic	0775392759	adding market place back to the default scripts	2019-02-25 14:05:54 -08:00
Sam Gateau	dab0df1113	Trying to fix the damn gamma	2019-02-22 18:03:23 -08:00
amer cerkic	f04fdb2187	added esc key event to fire for the away animation when cycling pause/resume. Reverted change on surface destroy that nullified the surface. Forgot to remove that during testin. Removed comment in away.js with syntax error. Setting cpu/gpu levels back to 1/1 after vr mode is released. Noticed that OS stays in same cpu/gpu level after app closes. Hoping this will help reduce battery drain for user	2019-02-22 09:11:24 -08:00
amer cerkic	9097d9c57c	working on pause -> away mode. Even doesn't seem to be firing. Also found a spot where I left commented out code from lifecycle testing.	2019-02-21 16:33:25 -08:00
shanzzam	adb6f559dc	Changing twitter handle from inc to VR	2019-02-20 18:31:32 -08:00
John Conklin II	87556059d3	Merge pull request #13901 from Cristo86/android_handshake ... case 20058: Android - Handshake implementation	2019-02-20 13:33:52 -08:00
David Kelly	2202b69575	Guard against accidentally calling wrong api/v1/places endpoint ... spaces	2019-02-20 13:09:29 -07:00
Dante Ruiz	6189aff6b3	Merge pull request #14933 from danteruiz/pick-manager-perf ... Case 21271: Remove unnessary picks for quest	2019-02-19 14:20:56 -08:00
John Conklin II	051ab61b66	Merge pull request #14951 from SamGondelman/ssao ... Case 20993: Fix AO	2019-02-19 11:19:03 -08:00
SamGondelman	27f05db825	fix ao	2019-02-18 01:12:00 -08:00
SamGondelman	1163cbea70	improving web surface interaction and tablet hiding	2019-02-16 22:03:55 -08:00
SamGondelman	7677e3bf44	just in case	2019-02-16 20:41:57 -08:00
SamGondelman	71653f95d7	working on overlay bugs	2019-02-16 20:08:36 -08:00
danteruiz	b00746c096	Trim picks in use during quest:	2019-02-15 16:24:17 -08:00
Roxanne Skelly	1154414a07	remove unneeded marketplaceInject.js	2019-02-15 12:36:35 -08:00
David Back	158e255319	Merge pull request #14902 from huffman/fix/duplicating-grabbed-entities ... Case 21029: Fix duplicating non-dynamic grabbed entities in edit.js	2019-02-15 11:25:42 -08:00
David Back	af25a7bf6e	Merge pull request #14919 from dback2/selectAllClearAll ... Case 19930: Entity List - add select/clear all to entity type dropdown	2019-02-15 10:12:30 -08:00
David Back	e944e284a6	design feedback	2019-02-14 17:37:58 -08:00
David Back	f6baa2432a	design feedback	2019-02-14 17:27:05 -08:00
David Back	46ff3a8405	add select/clear all buttons to entity type dropdown	2019-02-14 16:16:33 -08:00
Ryan Huffman	e800a6e030	Update hard-coded vec3 zero with Vec3.ZERO	2019-02-14 15:56:17 -08:00
Shannon Romano	453c081d9b	Merge pull request #14901 from huffman/fix/dropdown-close-on-click ... Case 19999: Update edit.js to auto close dropdowns when clicking outside	2019-02-14 14:48:03 -08:00
Bradley Austin Davis	d45d87031d	Merge pull request #14782 from SamGondelman/NOverlaysFinal ... Case 20723, Case 20334: Internally, replace all overlays with local entities	2019-02-14 13:49:47 -08:00
SamGondelman	b418e43ef2	ctrlaltdavid's minitablet fix	2019-02-12 13:15:58 -08:00
Ryan Huffman	2728654d35	Fix duplicating non-dynamic grabbed entities in edit.js	2019-02-12 10:09:28 -08:00
Ryan Huffman	fcfb1b7a4a	Update edit.js to auto close dropdowns when clicking outside	2019-02-12 10:06:25 -08:00
Sam Gateau	afb6c838eb	REverting all the changes from the brown branch not used	2019-02-11 20:13:37 -08:00
Sam Gateau	8a4f7fe2b6	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2019-02-11 18:57:33 -08:00
SamGondelman	a9767e4c22	working on mini tablet	2019-02-11 15:46:29 -08:00
Ryan Huffman	16b48046c6	Fix not being able to type text into particle url field	2019-02-11 15:27:30 -08:00
SamGondelman	f53ccf7363	fix create, working on mini tablet	2019-02-11 14:54:53 -08:00
SamGondelman	d988de4a17	Merge remote-tracking branch 'upstream/master' into NOverlaysFinal	2019-02-11 10:27:12 -08:00