21701 commits

Author	SHA1	Message	Date
Chris Collins	9c9bcd80b8	Merge pull request #11191 from SamGondelman/logging ... Miscellaneous logging fixes	2017-08-16 15:46:32 -07:00
Zach Fox	ecd1f13197	Allow users to take a snapshot from the secondary camera	2017-08-16 15:34:06 -07:00
David Kelly	73e943daaf	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys	2017-08-16 10:13:08 -07:00
Zach Fox	c024bd2d83	Merge pull request #11195 from zfox23/commerce_securityImage1 ... Commerce: First pass at security images (NOT FINAL)	2017-08-16 09:57:55 -07:00
SamGondelman	86cc938a47	Merge remote-tracking branch 'upstream/master' into sharks	2017-08-16 09:54:12 -07:00
SamGondelman	a641fb7a7f	rename qvector findRayIntersection to avoid script conflicts	2017-08-15 18:03:52 -07:00
Zach Fox	2fa1bd25a8	Clipping and mipping!	2017-08-15 16:45:46 -07:00
Zach Fox	984a5aea2c	You can now spawn infinite copies of items you've previously purchased	2017-08-15 16:32:23 -07:00
Zach Fox	5c157a7397	Move security image to top left	2017-08-15 16:24:14 -07:00
Zach Fox	ccf2d71036	V1 done	2017-08-15 16:11:34 -07:00
Zach Fox	29a9ae28e9	Fixes	2017-08-15 15:36:28 -07:00
Zach Fox	d376630bde	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_securityImage1	2017-08-15 15:03:02 -07:00
Zach Fox	768eb7f91c	Getting closer	2017-08-15 15:02:28 -07:00
Liv	aea5f170f2	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup	2017-08-15 13:58:22 -07:00
Liv	49eab847fd	Refactor handleOctreeFileReplacement, style changes, align with handler for other file types	2017-08-15 13:58:02 -07:00
Liv	c0fa446b75	Remove domain management scripting interface	2017-08-15 13:49:13 -07:00
Zach Fox	b7282cc776	Lots of fixes	2017-08-15 13:46:20 -07:00
Anthony Thibault	342f8acff5	Merge pull request #11176 from hyperlogic/feature/improve-hand-body-collision ... Improve avatar hand vs body collision	2017-08-15 13:43:21 -07:00
SamGondelman	9bb7e66859	separate raypickscriptinginterface, cleanup	2017-08-15 13:36:41 -07:00
Zach Fox	528d2072f9	Bugfixes and improvements	2017-08-15 12:14:32 -07:00
Anthony J. Thibault	6e0ddadb29	Fix for array size.	2017-08-15 11:45:22 -07:00
David Kelly	0f7db74ef1	missed a couple warnings	2017-08-15 11:44:15 -07:00
Anthony J. Thibault	04006a9f76	code review feedback	2017-08-15 11:19:41 -07:00
Zach Fox	bddce9328b	V1	2017-08-15 11:08:03 -07:00
David Kelly	a6390edf46	ugh	2017-08-15 10:10:48 -07:00
Elisa Lupin-Jimenez	3d7995da34	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-15 10:01:24 -07:00
Sam Gateau	2a75cde48a	Merge pull request #11185 from samcake/blue ... Fixing the graphics setting for Ambient Occlusion	2017-08-15 09:26:45 -07:00
Sam Gateau	d624413c14	Merge pull request #11189 from SamGondelman/line3DFix ... Fix drawInFront overlays only rendering in left eye	2017-08-15 09:26:18 -07:00
David Kelly	c08fce967f	forgot a warning	2017-08-15 08:58:16 -07:00
SamGondelman	1c27335193	a couple logging fixes	2017-08-14 17:34:32 -07:00
Seth Alves	21cef482a5	Merge pull request #11190 from druiz17/fix-table-dialog ... Fixed unable to select items in a TreeView	2017-08-14 17:05:42 -07:00
David Kelly	ef5863d169	warnings squashed	2017-08-14 16:24:50 -07:00
Dante Ruiz	459f2c5cdc	fixed tab issue	2017-08-14 16:03:12 -07:00
Dante Ruiz	99617600c4	fix selection issue for TreeView.qml	2017-08-14 15:58:28 -07:00
Zach Fox	823f2fb252	Merge pull request #11181 from cain-kilgore/skybox-changer ... WL 21447 - Create a Skybox Changer	2017-08-14 15:08:03 -07:00
Zach Fox	ee4a07b10d	Merge pull request #11187 from zfox23/context_removeWhenDeleting ... Remove context overlay (if present) when removing entity	2017-08-14 15:06:20 -07:00
SamGondelman	8163430282	fix depth buffer issue that was messing with drawInFront, plus some small fixes to line3ds	2017-08-14 15:03:14 -07:00
Cain Kilgore	e7a4bff705	Made Changes per Review, added js	2017-08-14 22:47:18 +01:00
druiz17	97aa92bc44	Merge pull request #11170 from cain-kilgore/web-browser-assets ... Added Assets for Web Browser MP Script	2017-08-14 13:50:11 -07:00
David Kelly	170d2b186b	url encode the base64 signature/key	2017-08-14 13:48:09 -07:00
Zach Fox	c1d771842d	Remove context overlay (if present) when removing entity	2017-08-14 13:37:50 -07:00
David Kelly	803a5c6690	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys	2017-08-14 13:15:04 -07:00
David Kelly	b4b592cc00	one key file with (for now) both public and private keys in there	2017-08-14 12:53:10 -07:00
Zach Fox	199ba3bff0	Use new JSON inventory format	2017-08-14 11:55:21 -07:00
samcake	f86f22309b	fix render.json	2017-08-14 11:31:40 -07:00
samcake	db1536c521	Reactivate watch dog exit	2017-08-14 10:47:58 -07:00
samcake	05b78b0df0	Just fixing the ao combo box field	2017-08-14 10:46:33 -07:00
Cain Kilgore	28c81534c4	Updated Text at Top	2017-08-14 05:11:53 +01:00
samcake	ff98dedbb2	Debugging the graphics fields activation	2017-08-11 18:10:44 -07:00
Anthony J. Thibault	cd57c0706a	more warning fixes	2017-08-11 17:46:50 -07:00
Cain Kilgore	8c9f3ae977	Skybox Changer PR	2017-08-12 01:35:48 +01:00
David Kelly	f784bc42de	Initial cut using RSA keys for now	2017-08-11 16:54:04 -07:00
Zach Fox	0835b7b8e6	Bugfix	2017-08-11 16:36:26 -07:00
Zach Fox	d8e5f7a067	Small improvements	2017-08-11 16:32:35 -07:00
Zach Fox	c38837c200	Remove fixmes	2017-08-11 16:21:39 -07:00
Zach Fox	9120e678f1	Use asynchronous commerce API	2017-08-11 16:17:13 -07:00
howard-stearns	d7f83a2fdf	Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce	2017-08-11 15:53:53 -07:00
Anthony J. Thibault	9e1218b4a4	Use k-dop collision to prevent hands from entering body.	2017-08-11 14:50:00 -07:00
Zach Fox	a21ff75a49	Big progress!	2017-08-11 12:54:55 -07:00
howard-stearns	8ee54c7b36	Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce	2017-08-11 11:46:20 -07:00
howard-stearns	551ea921cd	Make API asynchronous, for communicating with server	2017-08-11 11:45:40 -07:00
Zach Fox	080c6da71a	Get HFC balance from QmlCommerce API	2017-08-11 10:49:11 -07:00
Zach Fox	e1064938cd	Add inventory; also fix some bugs	2017-08-11 10:31:32 -07:00
SamGondelman	f058781f49	just kidding shared_mutexes are c++17	2017-08-11 10:07:20 -07:00
Elisa Lupin-Jimenez	6c2bf63392	Back button works	2017-08-10 17:51:19 -07:00
Anthony J. Thibault	49adf04913	Added Developer > Avatar > Show Detailed Collision menu option	2017-08-10 16:36:09 -07:00
Elisa Lupin-Jimenez	da5bb03187	Trying to add in a back button	2017-08-10 16:34:37 -07:00
SamGondelman	e4c954e862	merge from master	2017-08-10 16:30:33 -07:00
SamGondelman	353a3e8c68	properly fix AA stenciling	2017-08-10 16:07:40 -07:00
SamGondelman	96b179386f	working on fixing non-AA overlays	2017-08-10 16:07:40 -07:00
Seth Alves	972a24fea9	Merge pull request #11169 from anshuman64/new-branch ... High Fidelity Interface Application Rename	2017-08-10 15:57:10 -07:00
Anthony J. Thibault	ae98974d79	improve 14-dop generation for avatar joint collision ... Also added debug rendering functionality.	2017-08-10 15:52:51 -07:00
SamGondelman	4c55849290	merge from master	2017-08-10 15:43:23 -07:00
SamGondelman	d0d5ac8dd1	switch to stl wherever possible, use bitset instead of unsigned ints	2017-08-10 15:33:55 -07:00
Brad Davis	eb143c42d0	Merge pull request #11168 from sethalves/avatar-url-command-line-flag ... cancel effects of --replaceAvatarURL when avatar is changed with preference dialog	2017-08-10 15:18:21 -07:00
Cain Kilgore	4e81ebf85c	Added Assets for Web Browser MP Script	2017-08-10 22:53:35 +01:00
Seth Alves	1d07bc3b4e	try, try again	2017-08-10 14:32:52 -07:00
Elisa Lupin-Jimenez	b0c91547b4	Fixed WebGL rendering	2017-08-10 14:14:09 -07:00
Seth Alves	ff83a8158b	cancel effects of --replaceAvatarURL when avatar is changed with preference dialog	2017-08-10 13:49:48 -07:00
Sam Gateau	79f3be1efe	Merge pull request #11021 from Zvork/fade2 ... Fade dissolve effect JUST AVATARS	2017-08-10 13:48:30 -07:00
Anshuman Dewangan	f79bf4e009	High Fidelity Interface rename	2017-08-10 13:40:00 -07:00
Zach Fox	334f71e4fb	Merge pull request #11166 from howard-stearns/commerce-blance-inventory ... balance and inventory stubs	2017-08-10 13:33:56 -07:00
howard-stearns	8f0fd10e2b	fix	2017-08-10 12:51:05 -07:00
howard-stearns	ca13d58b0b	blance and inventory stubs	2017-08-10 12:44:50 -07:00
Seth Alves	d812c293e8	Merge pull request #11120 from mukulHF/bug-lock-default-scripts ... Disable the ability for a user to edit default scripts if developer settings is not enabled - adjusting values	2017-08-10 12:29:23 -07:00
druiz17	005c5a9278	Update TabletRunningScripts.qml	2017-08-10 12:26:57 -07:00
anshuman64	95b1d5fb91	Merge pull request #11146 from ElderOrb/help_buttons ... 5351: Help Button has Old UI	2017-08-10 11:56:11 -07:00
Elisa Lupin-Jimenez	af95d7f892	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-10 10:13:27 -07:00
anshuman64	0f163a6a7c	Merge pull request #11153 from hyperlogic/bug-fix/you-spin-me-right-round-baby-right-round ... Bug fix for HMD roll causing avatar yaw when standing still	2017-08-09 18:00:03 -07:00
Seth Alves	f125ef04f1	Merge pull request #11150 from ElderOrb/Case6742 ... 6742: Multiple highlighted buttons	2017-08-09 17:53:55 -07:00
Elisa Lupin-Jimenez	d3c76c99c2	See all markets button working again	2017-08-09 17:28:05 -07:00
Liv	6bde4db0d7	wrap in marketplace check and change landing point	2017-08-09 16:35:25 -07:00
Elisa Lupin-Jimenez	a2e407f786	fixed merge conflicts in marketplacesInject.js	2017-08-09 15:59:20 -07:00
Elisa Lupin-Jimenez	1ac9536f95	Downloading blocks from marketplace in own asset folder	2017-08-09 15:56:07 -07:00
Anthony J. Thibault	4d845bd208	Bug fix for HMD roll causing avatar yaw when standing still ... HMD roll should only cause the avatar to yaw when actively driving.	2017-08-09 15:52:27 -07:00
Zach Fox	65f9b0052f	Working buy button	2017-08-09 13:59:21 -07:00
Sam Gondelman	85c3f94976	Merge branch 'master' into sharks	2017-08-09 13:36:18 -07:00
Howard Stearns	cc634a2d1b	Merge pull request #11148 from zfox23/commerce_singleSetting ... New commerce mode now depends on 1 setting; bugfixes; Tablet -> TAB key	2017-08-09 13:25:10 -07:00
howard-stearns	f1ab91edd1	PR feedback	2017-08-09 12:41:16 -07:00
beholder	802b5733c5	6742: Multiple highlighted buttons	2017-08-09 22:26:13 +03:00
howard-stearns	a726b01263	remove duplicated line	2017-08-09 12:11:12 -07:00
howard-stearns	7414bf0d9a	oops. didn't test what I thought I did	2017-08-09 12:09:03 -07:00
howard-stearns	1cf81495ab	basic commerce infrastructure	2017-08-09 11:50:52 -07:00
Zach Fox	33fa8c4f86	Fix bugs and also change to single setting	2017-08-09 11:44:09 -07:00
Elisa Lupin-Jimenez	17acf0520d	Download from blocks in marketplace working	2017-08-09 11:08:14 -07:00
beholder	836b09b83d	5351: Help Button has Old UI	2017-08-09 20:56:02 +03:00
Liv	0784686450	small typo fix	2017-08-09 10:17:31 -07:00
howard-stearns	9349e72eeb	Merge branch 'master' of https://github.com/highfidelity/hifi into buy	2017-08-09 10:00:36 -07:00
Liv	bd1619b1b2	update error message wording	2017-08-09 09:14:46 -07:00
Elisa Lupin-Jimenez	d599753771	Started blocks download catch, fixed a debug typo	2017-08-08 18:43:35 -07:00
SamGondelman	3645bf04b6	possibly fix most annoying crash	2017-08-08 18:10:53 -07:00
Zach Fox	4f85923517	Tons of fixes and improvements!	2017-08-08 17:58:41 -07:00
Zach Fox	03729bf165	Actually fix context menu	2017-08-08 16:38:12 -07:00
Zach Fox	871a5ff1ab	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_CheckoutQMLInvestigation	2017-08-08 15:53:22 -07:00
Zach Fox	69fc69cffb	Comment fix and overlay click fix	2017-08-08 15:52:59 -07:00
Zach Fox	7d26d2d88b	Switch and fix overlay clicks	2017-08-08 14:29:44 -07:00
Liv	ab8f5c1288	add user logging detail message	2017-08-08 13:55:07 -07:00
SamGondelman	684001a756	workaround deadlock in editRenderState	2017-08-08 11:11:19 -07:00
Liv	3f30162215	Make spawning point not 0,0,0 and change error message	2017-08-08 09:44:36 -07:00
SamGondelman	6d253fcc5f	cleaning up	2017-08-07 18:37:55 -07:00
Zach Fox	1493a310af	Beginning of stack stuff	2017-08-07 17:02:24 -07:00
Zach Fox	45424f0cfe	Prototype V1	2017-08-07 16:25:42 -07:00
Zach Fox	7e922cb2c2	Layout	2017-08-07 16:16:17 -07:00
Zach Fox	517128a939	More steps	2017-08-07 16:03:42 -07:00
SamGondelman	42147640e2	remove LaserPointerManager as a dependency	2017-08-07 14:18:56 -07:00
SamGondelman	489e08aef0	Merge branch 'master' of https://github.com/highfidelity/hifi into sharks	2017-08-07 13:29:00 -07:00
Seth Alves	60895872ca	Merge pull request #11123 from vladest/attachment_speedup ... Remove snap to item. Add caching for scrolling speedup	2017-08-07 13:18:50 -07:00
Seth Alves	af1e27dc36	Merge pull request #11053 from hyperlogic/feature/secondary-pose-support ... Improved support for Vive Trackers on biceps	2017-08-07 13:11:48 -07:00
howard-stearns	9bad26c2db	stub files	2017-08-07 12:51:30 -07:00
mukulHF	780644fa38	Update TabletRunningScripts.qml	2017-08-07 11:37:27 -07:00
mukulHF	fadc19d8bb	Update RunningScripts.qml	2017-08-07 11:36:37 -07:00
mukulHF	cf7b2ba547	Update LetterboxMessage.qml	2017-08-07 11:35:42 -07:00
mukulHF	3ca2bc0571	Update DesktopLetterboxMessage.qml	2017-08-07 11:35:27 -07:00
Zach Fox	07a4beac73	Fix the crash	2017-08-07 10:28:36 -07:00
Liv Erickson	da70071b5a	Merge branch 'master' into feat/domain-setup	2017-08-07 10:04:54 -07:00
mukulHF	e9f268ff26	Update LetterboxMessage.qml	2017-08-07 10:01:50 -07:00
mukulHF	4382f22622	Update DesktopLetterboxMessage.qml	2017-08-07 10:01:26 -07:00
Seth Alves	c570d483d8	Merge pull request #11113 from elisa-lj11/zip_drag ... Zip drag (needs review)	2017-08-07 03:17:31 -07:00
Seth Alves	8798e47f99	Merge pull request #11117 from hyperlogic/bug-fix/misc-crash-fixes ... Crash fixes for avatars without Hips, and web overlays	2017-08-06 18:48:07 -07:00
vladest	134bad9534	fixed typo leads to lost touch or mouse release events	2017-08-06 19:09:40 +02:00
vladest	3a013bf86e	Remove snap to item. Add caching for scrolling speedup	2017-08-05 13:28:08 +02:00
SamGondelman	8b1c24e636	added setLockEndUUID, update handControllerGrab and grab	2017-08-04 18:26:11 -07:00
mukulHF	1ce1e29368	Update DesktopLetterboxMessage.qml	2017-08-04 17:44:43 -07:00
mukulHF	7aad4af533	Update LetterboxMessage.qml	2017-08-04 17:44:16 -07:00
Elisa Lupin-Jimenez	a246c59277	changed debug print for unsupported entity files	2017-08-04 16:59:21 -07:00
Elisa Lupin-Jimenez	8c9ce82986	Fixed Mac and Ubuntu platform build issue (hopefully)	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	ebc28a6557	Renamed isBlocks to isZip, added debug print for non-entity files	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	06ff766952	Drag zip cleaned up, marketplaces stylized, back button fixed	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	692aa4c4b9	Clara download working again, still can drag in Blocks zip	2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez	c6d5b1a5e6	Removed extraneous print statements	2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez	c3d943ff72	Drag zip folder works	2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez	ed1ed4f3e0	Blocks drag does not work yet	2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez	ca6a323d54	Can drag blocks zip folder into hifi and upload the .obj	2017-08-04 16:57:48 -07:00
Anthony J. Thibault	98bbe887b9	Merge branch 'master' into feature/secondary-pose-support	2017-08-04 16:11:13 -07:00
Brad Davis	86e3489167	Updates from Threaded Rendering project	2017-08-04 15:22:14 -07:00
Brad Hefta-Gaub	57f62f59fb	Merge pull request #11110 from Armads/WL21423 ... Camera mode on startup is determined by user settings and HMD status	2017-08-04 13:16:34 -07:00
Brad Hefta-Gaub	0f85769098	Merge pull request #11116 from vladest/fix_menu_caps ... Cleanup top menu on menu re instantiation	2017-08-04 12:37:14 -07:00
SamGondelman	bd942ec406	merge from master	2017-08-04 12:17:54 -07:00
Brad Hefta-Gaub	0d0a1af166	Merge pull request #11085 from jherico/script_console_crash ... Fix for potential crash in JS console	2017-08-04 11:44:20 -07:00
Anthony J. Thibault	9fdc044ae1	Crash fix for web3d overlays that are not the tablet.	2017-08-04 11:19:59 -07:00
Anthony J. Thibault	85500841fb	Crash fix for avatars that are missing "Hips", "Head" and other required joints.	2017-08-04 11:19:09 -07:00
Dante Ruiz	9be60ee658	made more requested changes	2017-08-04 17:57:53 +01:00
Dante Ruiz	b72ac63662	Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts	2017-08-04 17:19:06 +01:00
vladest	9058a8e2ca	Cleanup top menu on menu reinstantiation	2017-08-04 16:36:00 +02:00
anshuman64	83e50f894a	Merge pull request #11106 from seefo/tracked-objects ... Added Vive pucks as an input channel and added new puck-attach script	2017-08-03 17:03:45 -07:00
Howard Stearns	71ce5a6494	Merge pull request #11016 from highfidelity/context-overlays ... Context Overlays	2017-08-03 16:28:14 -07:00
druiz17	27f508ad9b	Merge pull request #11088 from vladest/fix_opened_running_scripts ... Fix opened running scripts	2017-08-03 13:09:50 -07:00
Chris Collins	6d57b4df38	Merge pull request #11108 from jherico/installer_remove_pdb ... Fix installer issues	2017-08-03 12:51:58 -07:00
Armads	dff4e6e32c	WL21423 Changing order of camera setup steps	2017-08-03 15:40:38 -04:00
vladest	b049b0f415	Merge conflicts	2017-08-03 19:43:42 +02:00
David Kelly	4b7779f0f5	add flag to outline render flags, fix pal.js/edit.js interaction	2017-08-03 07:57:21 -07:00
Armads	24718e2424	WL21423 Camera mode on startup is determined by user settings and HMD status	2017-08-03 09:03:23 -04:00
Dante Ruiz	1e1ddf2941	making requested changes	2017-08-02 22:22:55 +01:00
Brad Davis	5a7a6bab70	Remove PDB files, eliminate sixense	2017-08-02 14:08:46 -07:00
seefo	106b0ad8bb	Added Vive pucks as an input channel	2017-08-02 13:08:43 -07:00
druiz17	6680be2a03	Merge pull request #11103 from vladest/fix_toolbar_apps_switch ... Fix toolbar apps switch	2017-08-02 12:59:31 -07:00
vladest	7d361c69c2	Audio mic bar show only rectangle on mouse over	2017-08-02 19:52:47 +02:00
Dante Ruiz	90db4aa9c0	Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts	2017-08-02 18:18:17 +01:00
vladest	2d4396ac8e	Merge branch 'master' into fix_toolbar_apps_switch	2017-08-02 16:34:49 +02:00
vladest	4330e31212	Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create	2017-08-02 16:32:09 +02:00
David Kelly	588afaaa85	unused variable...	2017-08-01 16:59:42 -07:00
Anthony Thibault	8a87ebd2a8	Merge pull request #11036 from AndrewMeadows/walkabout ... fix bugs preventing avatar from walking on spherical planet	2017-08-01 16:36:35 -07:00
David Kelly	762b409814	unused variable	2017-08-01 16:20:33 -07:00
David Kelly	479d6abc58	Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde	2017-08-01 16:18:20 -07:00
David Kelly	6ae516c46a	Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde	2017-08-01 15:45:34 -07:00
anshuman64	9bf4977e09	Merge pull request #11096 from humbletim/21487 ... WL 21487: Fix Camera behavior in Mirror mode	2017-08-01 14:59:06 -07:00
Dante Ruiz	51652482a4	Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts	2017-08-01 20:51:56 +01:00
anshuman64	97b4fd4032	Merge pull request #11071 from vladest/fix_menu_landscape ... Fix Landscape mode, when menu pushed in Create mode	2017-08-01 11:29:15 -07:00
humbletim	3a9b8c02a6	* disable Avatar "follow" / recentering behavior when using HMD + "View > Mirror" ... * restore access to "View > Mirror" from HMD mode	2017-08-01 13:41:28 -04:00
Brad Davis	bea91be521	Fix for potential crash in JS console	2017-07-31 17:50:30 -07:00
David Kelly	b371c875c4	undo tab mapping to bring up tablet, for now	2017-07-31 14:46:26 -07:00
David Kelly	43c8079f03	temporary inspectionMode setting to turn ContextOverlays completely off/on	2017-07-31 13:55:43 -07:00
David Kelly	bd7c4b3b26	Merge remote-tracking branch 'upstream/master' into context-overlays	2017-07-31 13:14:53 -07:00
Anthony J. Thibault	2383933252	Merge branch 'master' into feature/secondary-pose-support	2017-07-31 10:55:40 -07:00
vladest	e30e0b1a5f	Make sure Tablet will be shown with opened running scripts dialog. Fixed potential stack corruption	2017-07-31 16:45:21 +02:00
Olivier Prat	490aad2a06	Merged from master	2017-07-31 12:00:35 +02:00
humbletim	3bcbec87e0	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-07-30 16:15:34 -04:00
Brad Davis	7d18d2e017	Restore corrected touch event simulation	2017-07-29 08:51:51 -07:00
vladest	3c9ab36416	Remove already already implemented fix	2017-07-29 12:00:41 +02:00
vladest	0333849aa8	Merge branch 'master' into fix_menu_landscape	2017-07-29 11:44:58 +02:00