26105 commits

Author	SHA1	Message	Date
Dante Ruiz	2a6204ca8d	remove option for mouse sensivtity	2018-05-16 15:47:55 -07:00
samcake	ade1d6c056	use the correct call to toggle the debugFXAA on the AaConfig	2018-05-16 15:37:13 -07:00
Dante Ruiz	f8e9afb115	fixing damn build issues	2018-05-16 15:08:09 -07:00
Zach Fox	bc590f556a	Get first page	2018-05-16 14:43:43 -07:00
Dante Ruiz	3be4b01d2c	move overlays menu back	2018-05-16 14:36:55 -07:00
Zach Fox	486f33b4bd	Merge branch 'master' of github.com:highfidelity/hifi into MS15103_snapFolderCrash	2018-05-16 14:14:35 -07:00
Dante Ruiz	237b0d7483	Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates	2018-05-16 13:49:02 -07:00
Dante Ruiz	fbc3d97af3	adding back overlay menu and avatar size	2018-05-16 13:48:29 -07:00
Zach Fox	585957409d	Merge pull request #13141 from zfox23/spectatorCameraImprovements ... Spectator Camera V2	2018-05-16 13:38:07 -07:00
Zach Fox	97bb014734	Almost working for Purchases!	2018-05-16 13:20:23 -07:00
samcake	21e069c90c	Adding a toggle button to the developer/Render menu to be able to disable taa and fall back to Fxaa	2018-05-16 13:09:55 -07:00
John Conklin II	8d437892cb	Merge pull request #13175 from luiscuenca/fixAvatarDisappearing ... Fix hips position when flying	2018-05-16 12:37:07 -07:00
Zach Fox	0021af8714	Merge in in-progress changes from old commerce_paginationAndFiltering branch	2018-05-16 12:28:52 -07:00
Zach Fox	154d70866f	It's working	2018-05-16 12:17:17 -07:00
vladest	8c146521cf	remove double crash options	2018-05-16 21:10:51 +02:00
vladest	7501b8818e	removed shadows quality	2018-05-16 21:01:50 +02:00
Zach Fox	79f8232c14	Merge branch 'master' of github.com:highfidelity/hifi into PSFListModel	2018-05-16 11:11:24 -07:00
Zach Fox	f8215b5999	Fix final? crash	2018-05-16 11:05:21 -07:00
Zach Fox	c3ea176b58	Give me my reticle back!	2018-05-16 10:54:58 -07:00
Dante Ruiz	37c51a7246	Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates	2018-05-16 10:41:40 -07:00
Dante Ruiz	e676348c4f	fixing some menu reog bugs	2018-05-16 10:40:28 -07:00
luiscuenca	7b48dc2370	normalize vector	2018-05-16 10:17:38 -07:00
Zach Fox	c34605f686	GIF snapshots using the Snap app are still weird, but the bug is fixed	2018-05-16 10:15:51 -07:00
Zach Fox	012ae741a5	Fix MS15103: Interface crashes on snap if snap dir is deleted	2018-05-16 09:52:19 -07:00
Simon Walton	b43cb5b86f	Take out VS's auto reformatting	2018-05-16 09:36:55 -07:00
Sam Gateau	523d57d948	Merge pull request #13162 from AndrewMeadows/avatar-collisions ... avatars collide again	2018-05-16 09:25:05 -07:00
Gabriel Calero	5afc9c6df3	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-16 12:45:17 -03:00
vladest	72838f6d34	Implemented radio button preferences. Reimplemented snap smooth turn to radio buttons	2018-05-16 17:06:31 +02:00
vladest	5127cb0ea6	Merge branch 'master' into menu-updates	2018-05-16 14:37:00 +02:00
vladest	a9930d53a9	Reorder VR menu	2018-05-16 14:25:58 +02:00
John Conklin II	aca261af3e	Merge pull request #12939 from Cristo86/android_places_goto ... Android Search & Go To	2018-05-15 16:43:38 -07:00
Simon Walton	f4d24a3d0e	Quiet MacOS warning	2018-05-15 16:40:21 -07:00
David Rowe	f571e90ef5	Merge branch 'master' into 21872-b	2018-05-16 10:20:53 +12:00
David Rowe	f629022b8c	AvatarList API JSDoc stubs	2018-05-16 10:16:13 +12:00
John Conklin II	1313d28b9d	Merge pull request #13112 from sethalves/fix-overlay-asan-warning ... Fix overlay asan warning	2018-05-15 14:51:05 -07:00
Simon Walton	2b30c1389e	Try reducing concurrent downloads for Android	2018-05-15 14:30:08 -07:00
David Rowe	fdeb0e3305	Avatar API JSDoc stubs	2018-05-16 09:20:54 +12:00
luiscuenca	4b09f1dc30	Fix vector transformation when calculating flying hip position	2018-05-15 14:19:17 -07:00
John Conklin II	a6cda2166a	Merge pull request #13158 from highfidelity/stable ... RC67.1 stable mergeback to master	2018-05-15 14:01:06 -07:00
Andrew Meadows	c5773cbe84	restore 'virtual' keyword for overrides	2018-05-15 13:59:22 -07:00
vladest	7ea6181520	Merge branch 'master' into menu-updates	2018-05-15 21:54:45 +02:00
vladest	dd05afa974	Remove double setting	2018-05-15 21:43:43 +02:00
Thijs Wenker	8b4298514e	send out one last blendshape update when setting MyAvatar.hasScriptedBlendshapes to false	2018-05-15 21:39:17 +02:00
Gabriel Calero	b80597a436	Restore display plugin activation/deactivation	2018-05-15 15:51:11 -03:00
Zach Fox	bccaa2dbe5	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-15 11:50:38 -07:00
Zach Fox	ccab2dd641	Starting the work	2018-05-15 11:48:33 -07:00
Dante Ruiz	c6ff301aac	Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates	2018-05-15 11:32:23 -07:00
Dante Ruiz	71633105de	adding back some menus	2018-05-15 11:31:58 -07:00
Gabriel Calero	306b8cc68a	Set HomeActivity transparent to avoid texture corruption (black and white)	2018-05-15 15:14:17 -03:00
vladest	e2a8ee2a4c	Fixed About date format. Increased space between logo and build info	2018-05-15 20:02:29 +02:00
Dante Ruiz	931c8f5abe	Merge pull request #13110 from ctrlaltdavid/21866 ... Don't unnecessarily scroll HTML content when keyboard is raised	2018-05-15 11:00:38 -07:00
Seth Alves	78a8e8e500	quiet asan warning	2018-05-15 11:00:08 -07:00
Seth Alves	24404afe26	Merge pull request #13115 from sethalves/fix-autoAdjustLOD-asan ... fix divide-by-zero asan warning in LODManager::autoAdjustLOD	2018-05-15 10:58:00 -07:00
John Conklin II	574a52fdbe	Merge pull request #13154 from NissimHadar/perfTest_1 ... Added method to test namespace to save JSON object to a file.	2018-05-15 10:30:34 -07:00
John Conklin II	e9cb46a2a5	Merge pull request #13169 from hyperlogic/bug-fix/remove-unused-menu-item ... OpenVR: Remove reference to HMD Standing Mode menu item	2018-05-15 10:30:00 -07:00
Andrew Meadows	c7c4324b3c	Merge 'master' into 'workload'	2018-05-15 10:22:50 -07:00
Thijs Wenker	bfe210da75	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-05-15 16:48:51 +02:00
vladest	a6ef459723	Open browser within Interface	2018-05-15 16:07:32 +02:00
vladest	fee3cc0aca	Implemented backend for About dialog	2018-05-15 15:49:20 +02:00
David Rowe	b7a0ff523a	LaserPointers API JSDoc stubs	2018-05-15 17:36:23 +12:00
David Rowe	8e9799b80f	Pointers API JSDoc fix up	2018-05-15 16:36:42 +12:00
vladest	58f04121b7	Correct link colors	2018-05-15 06:22:10 +02:00
Dante Ruiz	82422edb59	fixinig the controller settings page and have menu option on by default	2018-05-14 18:51:39 -07:00
Zach Fox	a54ce96ac2	Clement's CR	2018-05-14 17:46:58 -07:00
Zach Fox	e607c68bea	Thanks Mukul!	2018-05-14 16:48:40 -07:00
David Rowe	9040e45be7	RayPick API JSDoc stubs	2018-05-15 11:43:49 +12:00
NissimHadar	d4d2f3c957	Moved ownership of test location into the Test Scripting class.	2018-05-14 16:32:04 -07:00
NissimHadar	8e3844a235	Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1	2018-05-14 16:23:36 -07:00
David Rowe	3fb6fd1afb	Picks API JSDoc stubs	2018-05-15 11:22:47 +12:00
Zach Fox	43254e2981	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-14 15:12:44 -07:00
vladest	2a3004079e	About UI	2018-05-14 23:22:06 +02:00
Anthony J. Thibault	ed726c9d77	OpenVR: Remove reference to HMD Standing Mode menu item ... This menu item has not existed for over a year. I was sometimes seeing a crash on startup when the display plugin attempted to reference this menu item.	2018-05-14 13:51:13 -07:00
Anthony J. Thibault	ec638d9d91	Avatar can now look straight down without spinning 180. ... Also, come code clean up and removal of unnecessary Y_180 flips.	2018-05-14 13:48:04 -07:00
Zach Fox	83cae54601	Show 'invalidated' label for valid = false	2018-05-14 13:34:20 -07:00
NissimHadar	5f219e27f7	Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1	2018-05-14 10:35:48 -07:00
Andrew Meadows	a30e06d594	don't blend avatar position when far from target	2018-05-14 09:58:16 -07:00
Zach Fox	2a1c2ba7b1	PurchasedItem logic	2018-05-14 09:54:05 -07:00
Zach Fox	81ebb681bb	Show invalidated items in My Purchases	2018-05-14 09:35:34 -07:00
Anthony J. Thibault	1cc7eb635f	Fix ubuntu warning by removing cancelOutRollAndPitch2()	2018-05-14 09:13:26 -07:00
Anthony J. Thibault	274ac98bd6	Merge branch 'master' into nativeCGCode	2018-05-14 09:12:08 -07:00
David Rowe	77021f3236	Fix up Stats JSDoc	2018-05-14 17:32:18 +12:00
David Rowe	d0596f8205	Fix Wallet JSDoc stubs	2018-05-14 10:43:55 +12:00
David Rowe	5378d64913	Remove erroneously added function declarations	2018-05-13 18:06:30 +12:00
David Rowe	176dbb5557	Wallet API JSDoc stubs	2018-05-13 11:02:09 +12:00
vladest	f8ebe7e669	remoed no more used LOD dialogs. Fixed Slider properties min and max settings	2018-05-12 16:01:43 +02:00
vladest	0a67fc3b36	Merge conflicts	2018-05-12 11:24:35 +02:00
David Rowe	81a621890a	Stats API JSDoc stubs	2018-05-12 18:01:55 +12:00
David Rowe	74617822fa	Snapshot API JSDoc stubs	2018-05-12 16:32:33 +12:00
David Rowe	bf7863ad10	LocationBookmarks API JSDoc stubs	2018-05-12 14:23:03 +12:00
Andrew Meadows	6de175e794	avatars collide again	2018-05-11 17:01:48 -07:00
David Rowe	cf9053c873	Merge branch 'master' into 21872-b	2018-05-12 10:50:31 +12:00
Gabriel Calero	9b5da09dc7	Fix connection issue syncing two AccountManagers	2018-05-11 18:08:56 -03:00
Gabriel Calero	db460e9856	Put back the worker thread for account manager in android	2018-05-11 16:09:40 -03:00
Seth Alves	c624528f72	Merge pull request #13157 from druiz17/fix-qml-crash ... fix qml crash on start up	2018-05-11 11:38:12 -07:00
John Conklin II	5cd225e4de	Merge pull request #12947 from jherico/feature/splash2 ... Additional work on splash screen	2018-05-11 11:26:37 -07:00
Dante Ruiz	4eba727849	fix qml crash on start up	2018-05-11 10:47:41 -07:00
Zach Fox	a6dd95e31b	Merge pull request #13146 from sethalves/fix-logging-less-when-verbose ... don't enable so much logging when 'verbose logging' is turned on	2018-05-11 10:44:48 -07:00
Dante Ruiz	9e9852d67b	Merge pull request #12989 from Triplelexx/21774_file_browser ... Worklist #21774: Fix Windows.browseAssets() bugs	2018-05-11 08:50:17 -07:00
David Rowe	fb175d7110	AudioEffectOptions API JSDoc stubs	2018-05-11 20:36:10 +12:00
NissimHadar	1364f4391d	Can store JSON object.	2018-05-10 18:02:44 -07:00
Anthony J. Thibault	0ac12fa317	Bug fix for Vive Tracker Calibration Settings ... This issue was inadvertently introduced by the name change of the Vive display plugin.	2018-05-10 17:56:54 -07:00
Seth Alves	826c427e2a	trying to sort-out audio-stream logging	2018-05-10 15:42:59 -07:00
Seth Alves	32d10641dc	don't enable so much logging when 'verbose logging' is turned on	2018-05-10 14:41:54 -07:00
Gabriel Calero	a1a48d9b9e	Merge remote-tracking branch 'upstream/master' into android_places_goto	2018-05-10 18:24:26 -03:00
Triplelexx	a061e84ad7	remove unused commented code	2018-05-10 19:40:02 +01:00
Zach Fox	0236bc0c44	Cleanup after merge conflict	2018-05-10 09:51:45 -07:00
Zach Fox	ce575d367a	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-10 09:31:02 -07:00
vladest	a3f8148165	Added enable disable shadows menu	2018-05-10 12:40:13 +02:00
vladest	62aa2df836	Merge branch 'master' into menu-updates	2018-05-10 10:36:38 +02:00
vladest	399e18dfc1	Disable non implemented sound notifications until further notice	2018-05-10 10:28:48 +02:00
Seth Alves	4410402c7d	Merge pull request #13114 from sethalves/more-logging-suppression ... more suppression of logging	2018-05-09 17:36:12 -07:00
Zach Fox	44cfa95830	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-09 15:01:24 -07:00
amantley	20c960c0da	removed white space in MyAvatar.cpp	2018-05-09 15:00:20 -07:00
amantley	eff84de99f	added more straight forward computation of the hips rotation inMyAvatar.cpp contributed by AJT	2018-05-09 14:55:10 -07:00
John Conklin II	59b9e08f58	Merge pull request #13131 from zfox23/MS14937_CheckoutContentSetFix ... MS14937: Fix Replace button for content sets during Checkout	2018-05-09 13:04:10 -07:00
Seth Alves	16e832ac08	use setFilterRules rather than specifying each logging category to suppress	2018-05-09 13:01:49 -07:00
Seth Alves	7466d08f1f	more suppression of logging	2018-05-09 13:01:49 -07:00
amantley	50f225777a	removed debug code from cg code in MyAvatar.cpp	2018-05-09 11:31:19 -07:00
amantley	a7955b642a	removed the follow hips code from pre physics update	2018-05-09 11:27:04 -07:00
amantley	77aedc1512	changed lerp to saferLerp in cg code	2018-05-09 11:14:13 -07:00
Howard Stearns	bf466344ee	Merge pull request #13135 from zfox23/MS14951_fixSnapshotHotkeySound ... MS14951: Fix Snapshot hotkey sound playback	2018-05-09 11:07:46 -07:00
Sam Gateau	17350a79dd	Merge pull request #13046 from NissimHadar/commandLineParametersForAutotester ... Command line parameters for autotester	2018-05-09 10:51:31 -07:00
Gabriel Calero	843282739e	Remove unused includes and white spaces	2018-05-09 14:16:51 -03:00
Thijs Wenker	a42491ded7	Merge pull request #13055 from misslivirose/remove-help-ftue ... Do not open help on first run	2018-05-09 18:48:05 +02:00
Zach Fox	542e707de8	MS14951: Fix Snapshot hotkey sound playback	2018-05-09 09:40:51 -07:00
Zach Fox	06c6f55069	MS14951: Fix Snapshot hotkey sound playback	2018-05-09 09:35:42 -07:00
Gabriel Calero	b0fee3fd8b	Improve code based on changes requested in the PR	2018-05-09 11:06:32 -03:00
amantley	8000bcd272	cleaned up cg code ie computeNewHipsRotation	2018-05-08 18:12:53 -07:00
Zach Fox	22c26c348d	MS14937: Fix Replace button for content sets during Checkout	2018-05-08 16:37:11 -07:00
Zach Fox	540f200b99	MS14937: Fix Replace button for content sets during Checkout	2018-05-08 16:34:28 -07:00
NissimHadar	175fa9108e	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-08 15:52:15 -07:00
Stephen Birarda	4165ab3667	Merge branch 'RC67' of github.com:highfidelity/hifi into 67-to-master	2018-05-08 14:08:21 -07:00
Gabriel Calero	5e337e90a3	Deactivates display plugin when qt app goes to background	2018-05-08 16:55:04 -03:00
Gabriel Calero	da69c9d077	Make qt application not stop in background and remove separete thread	2018-05-08 15:45:33 -03:00
NissimHadar	d5bb582811	Per Austin's comments.	2018-05-08 11:40:56 -07:00
NissimHadar	eb14658bc5	Per Austin's comments.	2018-05-08 11:13:06 -07:00
amantley	6051f4b8ff	Merge remote-tracking branch 'origin/nativeCGCode' into nativeCGCode ... synching the branch with the remote repo	2018-05-08 10:55:14 -07:00
amantley	544967ef3b	added test function to cancel out roll and pitch	2018-05-08 10:55:10 -07:00
amantley	bbf8c73572	code review changes to declare functions static	2018-05-08 10:52:28 -07:00
amantley	3a10cacec0	1.added the swing twist code to update the follow rotation in MyAvatar.cpp ... 2.added step.js and cg_lean.js to the developer folder 3.added menu item for toggling the hips following between head and hips 4.added new function to return true if the root of MyAvatar is translating to be under the head. Used to smooth the path of the hips 5.added computeCounterBalance to MyAvatar.h and cpp 6.added the menu item under developer/avatar to enable debug draw of the base of support in menu.h menu.cpp MyAvatar.h MyAvatar.cpp 7.added head yaw into the calculation of the hip rotation for the center of gravity. This is already was happening in the deriveBodyFromHMD code that is default 8.Changed Constants in Avatar constants for the base of support 9.fixed the over rotation of the shoulders 10.fixed scaling problem in cg computation 11.added room for going up on the toes without stretching	2018-05-07 17:41:35 -07:00
NissimHadar	8ad13826bd	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-07 13:11:39 -07:00
NissimHadar	2e51a66441	Use 'standard' format for command line parameter with multiple options.	2018-05-07 13:01:18 -07:00
Gabriel Calero	9b63b76b68	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-07 16:06:02 -03:00
Gabriel Calero	66b975192d	Merge remote-tracking branch 'cristo86/android_places_goto' into android_new_login	2018-05-07 15:56:43 -03:00
John Conklin II	bec015db5c	Merge pull request #13116 from ElderOrb/FB14818 ... Fix for 'Login page for steam is blank'	2018-05-07 11:26:39 -07:00
John Conklin II	6ac43c34c2	Merge pull request #13032 from druiz17/fix-spamming-reset-sensors ... don't spam resetSensors function when holding down Qt::Key_Apostrophe	2018-05-07 10:52:51 -07:00
John Conklin II	286bed25bd	Merge pull request #13106 from zfox23/RC67_MS14758 ... RC67: MS14758: Fix avatar reset when gifting worn avatar	2018-05-07 10:10:41 -07:00
NissimHadar	481eddb2a3	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-07 08:24:03 -07:00
Alexander Ivash	b4cfea2fbc	FB14818 Login page for steam is blank	2018-05-06 17:17:06 +03:00
vladest	afe04f3a4f	cleanup	2018-05-06 14:24:54 +02:00
vladest	1794113f37	Check global switch as well	2018-05-06 12:51:59 +02:00
vladest	ac413c8854	Tablet opening notification sound settings added	2018-05-06 09:41:10 +02:00
Seth Alves	30c5fa6fa1	fix divide-by-zero asan warning in LODManager::autoAdjustLOD	2018-05-05 20:45:06 -07:00
vladest	c7ab1f3dbf	Merge branch 'master' into menu-updates	2018-05-05 20:48:40 +02:00
vladest	5a5bfcfe02	Merge branch 'master' into menu-updates	2018-05-05 07:11:39 +02:00
Clement	5a3773ba72	Fix compile error on linux/windows	2018-05-04 18:18:46 -07:00
David Rowe	5021778dc0	Merge branch 'master' into 21866	2018-05-05 12:17:18 +12:00
David Rowe	5e6b83a634	Lint	2018-05-05 12:14:51 +12:00
David Rowe	1be948ee28	Scroll element into view if it's been moved off the screen	2018-05-05 12:03:18 +12:00
Bradley Austin Davis	38f43bdc68	Disable current splash frame implementaton	2018-05-04 16:40:05 -07:00
Bradley Austin Davis	803bd284a6	Alternate shader	2018-05-04 16:40:05 -07:00
Brad Davis	72526781d9	Additional work on splash screen	2018-05-04 16:40:05 -07:00
Clement	da9fb9c751	Fix non self-sufficient headers	2018-05-04 16:26:41 -07:00
Cristian Luis Duarte	03ca427234	Merge remote-tracking branch 'hifi/master' into android_places_goto	2018-05-04 20:18:15 -03:00
Stephen Birarda	ec354620db	Merge pull request #12956 from huffman/feat/client-texture-selection-baking ... Add support for client texture selection	2018-05-04 16:14:43 -07:00
Anthony J. Thibault	8480bb962b	Fix for crash deep in QML after useFullAvatarURL ... Here we avoid calling FSTReader::downloadMapping() from within MyAvatar::useFullAvatarURL(). This prevents the error case where a QEventLoop is entered during QML execution.	2018-05-04 16:08:44 -07:00
Zach Fox	4ebed7605c	MS14758: Fix avatar reset when gifting worn avatar	2018-05-04 16:04:05 -07:00
Clément Brisset	39e2a78b1a	Merge pull request #13074 from Atlante45/fix/spec-cam-punchlist ... Multifrustum queries punchlist	2018-05-04 15:50:44 -07:00
John Conklin II	b314d496ec	Merge pull request #13103 from zfox23/MS14699_clearCachedPasscode ... MS14699: Prevent Wallet passcode from being sticky in certain cases	2018-05-04 15:22:41 -07:00
Gabriel Calero	087c6ff730	Patch for secondary camera assert error on Android	2018-05-04 18:45:39 -03:00
Cristian Luis Duarte	8c96d2be3c	Patch for secondary camera assert error on Android	2018-05-04 18:44:07 -03:00
Clement	ad60a79180	Fix for android builds	2018-05-04 14:43:28 -07:00
Clement	b04c5bd0db	CR	2018-05-04 14:43:16 -07:00
Cristian Luis Duarte	9f5365a277	Merge remote-tracking branch 'hifi/master' into android_places_goto	2018-05-04 18:38:08 -03:00
Gabriel Calero	1330132a32	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-04 18:35:51 -03:00
Liv Erickson	ee0af079cf	merge from upstream master and fix conflict	2018-05-04 14:34:38 -07:00
NissimHadar	2311fa33fb	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-04 14:13:43 -07:00
Zach Fox	53fe0bc616	MS14699: Prevent Wallet passcode from being sticky in certain cases	2018-05-04 14:08:21 -07:00
Gabriel Calero	868b58e66d	Un-expose Application from javascript. Restore displayplugin deactivation when goes to background	2018-05-04 18:01:01 -03:00
vladest	9e5dbf9a99	Snapshot notification sound settings	2018-05-04 22:01:44 +02:00
NissimHadar	aef5ea0936	Correct usage of the test script URL.	2018-05-04 12:30:13 -07:00
John Conklin II	c7bc479c60	Merge pull request #13094 from hyperlogic/bug-fix/case-14639 ... Fix for crash deep in QML after useFullAvatarURL	2018-05-04 11:33:28 -07:00
Zach Fox	1da840984b	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-04 10:24:28 -07:00
Zach Fox	e48d39ec38	MS14758: Fix avatar reset when gifting worn avatar	2018-05-04 10:10:48 -07:00
David Rowe	03da2f0946	Only scroll keyboard if necessary	2018-05-04 20:32:53 +12:00
milad nazeri	b32039f895	Merge branch 'master' of https://github.com/highfidelity/hifi into gravprep-redo	2018-05-03 23:08:06 -07:00
Clement	487a63025f	Fix warning	2018-05-03 18:19:52 -07:00
Clement	d87cd2af6e	Update avatar query names	2018-05-03 18:19:30 -07:00
Clement	27c471ee97	Move all wire frustums to conical frustums	2018-05-03 18:19:29 -07:00
Clement	e400eb4ed2	Rename ViewFrustum packets to AvatarQuery	2018-05-03 18:19:29 -07:00
Stephen Birarda	21396287a4	Merge pull request #12990 from Atlante45/fix/spec-cam-av ... Add support for multifrustum avatar queries	2018-05-03 18:18:51 -07:00
Stephen Birarda	31d5633b4a	Merge pull request #12930 from Atlante45/fix/spec-cam ... Add support for multifrustum entity queries	2018-05-03 18:13:51 -07:00
NissimHadar	da621d99d3	Removed unneeded pragma.	2018-05-03 16:52:03 -07:00
Stephen Birarda	48aeebdd50	Merge pull request #13007 from Atlante45/fix/crashes-hotfix ... Keep CrashpadClient around for application lifetime	2018-05-03 16:48:29 -07:00
NissimHadar	e07039266d	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-03 16:44:57 -07:00
NissimHadar	887b8285cd	Removed unneeded pragma.	2018-05-03 16:44:04 -07:00
NissimHadar	2c6c0a25fc	Add testSnapshotLocation parameter to takeSnapshot.	2018-05-03 15:15:30 -07:00
NissimHadar	fe9c6052f7	Added quitWhenFinished parameter to the command line.	2018-05-03 15:02:11 -07:00
NissimHadar	3a5425122b	Shutdown interface when test script finishes.	2018-05-03 14:31:01 -07:00
MiladNazeri	6efb710222	Merge pull request #13076 from ctrlaltdavid/21856-g ... JSDoc fixes	2018-05-03 14:06:23 -07:00
Anthony J. Thibault	fc9bd7f905	Fix for crash deep in QML after useFullAvatarURL ... Here we avoid calling FSTReader::downloadMapping() from within MyAvatar::useFullAvatarURL(). This prevents the error case where a QEventLoop is entered during QML execution.	2018-05-03 14:06:06 -07:00
Gabriel Calero	a767540b76	Fix connection issue syncing two AccountManagers	2018-05-03 17:53:18 -03:00
Zach Fox	c3d3cdca3d	Add cubemap output format	2018-05-03 12:57:00 -07:00
NissimHadar	46f461dcdb	Don't display crash message if running from command line with a test script.	2018-05-03 11:20:37 -07:00
Howard Stearns	d4a562ee47	Merge pull request #13081 from zfox23/MS14741_fixAppUninstallation ... Fix MS14741, allowing uninstall of apps whose scripts are no longer running	2018-05-03 10:02:20 -07:00
NissimHadar	8b3c451f91	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-03 08:25:19 -07:00
Ken Cooke	2a7e8c6f89	Default audio meter overlay to "on"	2018-05-03 07:15:18 -07:00
David Rowe	e95c38d939	Merge branch 'master' into 21856-g ... # Conflicts: # libraries/model-networking/src/model-networking/TextureCache.h	2018-05-03 21:03:14 +12:00
MiladNazeri	8e214d8ee8	Merge pull request #13049 from ctrlaltdavid/21856-d ... List which contexts each namespace and class is available in	2018-05-03 01:29:14 -07:00
Seth Alves	b68d9ecd68	Merge pull request #12985 from druiz17/attachments-disappearing ... fixing avatr attachments not being visible when coming out of first person	2018-05-02 18:50:41 -07:00
samcake	1dc6988f41	Merge branch 'workload' of https://github.com/highfidelity/hifi into workload	2018-05-02 17:36:26 -07:00
Andrew Meadows	99a75c5a87	Merge 'master' into 'workload'	2018-05-02 17:28:36 -07:00
Zach Fox	56ba59681a	Fix MS14741, allowing uninstall of apps whose scripts are no longer running	2018-05-02 16:12:55 -07:00
Zach Fox	900486ed01	Don't use entity scripting interface	2018-05-02 16:03:50 -07:00
Gabriel Calero	ec838b1417	Trying to fix non-android builds	2018-05-02 18:51:44 -03:00
NissimHadar	5cbb8674ec	Use default parameter for saveSnapshot().	2018-05-02 14:45:28 -07:00
Gabriel Calero	88f0c2d700	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-02 18:42:10 -03:00
John Conklin II	f43b9ee7e8	Merge pull request #12960 from hyperlogic/feature/bullet-debug-draw ... Added items to the developer menu for debugging physics	2018-05-02 14:25:09 -07:00
NissimHadar	83846aec04	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-02 14:17:22 -07:00
NissimHadar	e0b16dfe03	Allow use of --url command line argument in test mode.	2018-05-02 14:17:01 -07:00
Cristian Luis Duarte	843aa9e261	Merge remote-tracking branch 'hifi/master' into android_places_goto	2018-05-02 18:06:56 -03:00
Gabriel Calero	e4fdd81148	Merge remote-tracking branch 'origin/android_goto_splash' into android_new_login	2018-05-02 17:23:25 -03:00
Gabriel Calero	d0ab81d1f9	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-02 17:00:32 -03:00
Cristian Luis Duarte	c460f8bf1e	Merge remote-tracking branch 'hifi/master' into android_places_goto	2018-05-02 16:35:13 -03:00
Gabriel Calero	4dce62cc2e	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-05-02 16:27:41 -03:00
John Conklin II	7a5fce4315	Merge pull request #12991 from luiscuenca/avatarScript ... Avatar Scripts	2018-05-02 12:23:13 -07:00
Zach Fox	57993cfdd0	Cleanup	2018-05-02 11:22:42 -07:00
luiscuenca	689fbd2da0	added requested changes	2018-05-02 11:09:17 -07:00
Gabriel Calero	a653c7df0b	Fix build	2018-05-02 14:59:46 -03:00
Anthony J. Thibault	4fa9af5534	Added items to the developer menu for debugging physics ... Hooked up Bullet's internal debug draw functionality to our client. Under the Developer > Physics Menu there are five new items: * Show Bullet Collision - will draw all collision shapes in wireframe. WARNING: can be slow on large scenes. * Show Bullet Bounding Boxes - will draw axis aligned bounding boxes around all physics shapes. * Show Bullet Contact Points - will draw all contact points where two or more objects are colliding. * Show Bullet Constraints - will render wire frame axes for each constraint connecting bodies together. * Show Bullet Constraint Limits - will render the joint limits for each constraint.	2018-05-02 10:51:00 -07:00
vladest	14dfafa815	Brings logging back	2018-05-02 19:46:18 +02:00
Gabriel Calero	c15ef56d90	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-05-02 14:38:10 -03:00
Zach Fox	ecae3ceb9d	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-02 10:05:15 -07:00
vladest	53350b471b	Merge branch 'master' into menu-updates	2018-05-02 19:02:11 +02:00
vladest	ea66e04ab8	Removed unwanted code	2018-05-02 18:58:40 +02:00
NissimHadar	3edfdae6b2	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-02 08:35:59 -07:00
Gabriel Calero	e83f1a8ec7	Merge branch 'android_new_login' of https://github.com/gcalero/hifi into android_new_login	2018-05-02 12:20:23 -03:00
Gabriel Calero	0f08bd8fa1	Use a single AccountManager for android.	2018-05-02 12:11:11 -03:00
Gabriel Calero	3a1bfefc22	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-02 10:09:56 -03:00
David Rowe	3febdcb141	Miscellaneous JSDoc tidying	2018-05-02 16:15:35 +12:00
Clement	a283d28686	Send number of frustums in packet	2018-05-01 18:03:21 -07:00
Clement	ddde0228ba	Fix AC not sending Avatar Mixer a frustum	2018-05-01 18:03:21 -07:00
Clement	538f24162f	Define ViewFrustums type alias	2018-05-01 18:03:21 -07:00
Clement	1b2b70b769	Send both frustums to Avatar Mixer	2018-05-01 18:03:21 -07:00
Clement	21213e81f4	Multiview support for priority queue	2018-05-01 18:03:21 -07:00
Atlante45	0820ef3c95	Account for secondary view when deciding to query	2018-05-01 18:02:29 -07:00
Clement	4c90763236	Correctly update secondary camera frustum	2018-05-01 18:02:29 -07:00
Clement	fea49744ed	Add comment for future work	2018-05-01 18:02:29 -07:00
Clement	98cf48694e	Expose secondary camera to game logic	2018-05-01 18:02:29 -07:00
Clement	49fad3d868	EntityServer traversal aware of all ViewFrustums	2018-05-01 18:02:29 -07:00
John Conklin II	256154202e	Merge pull request #13071 from zfox23/RC67_preventImageProviderCrash ... RC67: Fix a crash in Image Provider when logging in or reloading all scripts	2018-05-01 17:39:43 -07:00
Zach Fox	d5f809c3c0	Actually fix	2018-05-01 14:49:44 -07:00
Zach Fox	d1bb37874d	Prevent crash in ImageProvider when tablet isn't yet initialized	2018-05-01 14:49:37 -07:00
Stephen Birarda	f5441c05b3	Merge branch 'master' of github.com:highfidelity/hifi into 67-to-master	2018-05-01 14:18:24 -07:00
Stephen Birarda	cad63ad107	Revert "Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently"" ... This reverts commit acb21cc96a.	2018-05-01 14:15:12 -07:00
Ryan Huffman	24ac342c6b	Add support for client texture selection	2018-05-01 14:11:31 -07:00
NissimHadar	e9d28cf275	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-01 13:26:58 -07:00
Zach Fox	249e2a2bac	Tons of stability and clarity improvements	2018-05-01 13:00:04 -07:00
David Rowe	1aa28b7f54	Merge remote-tracking branch 'upstream/master' into 21856-d ... # Conflicts: # interface/src/LODManager.h	2018-05-02 07:50:55 +12:00
vladest	aef62d09c7	Merge branch 'master' into menu-updates	2018-05-01 21:47:46 +02:00
John Conklin II	250aa3ab43	Merge pull request #13027 from jherico/fix/web_crash2 ... Some fixes for QML surfaces	2018-05-01 12:39:46 -07:00
MiladNazeri	3bb09024ec	Merge pull request #13058 from ctrlaltdavid/21856-e ... Fix LODManager JSDoc	2018-05-01 12:25:37 -07:00
vladest	617b49fe14	Added mouse sensivity UI. Reworked advanced movements. TODO: properties interface complitely broken in Tablet mode	2018-05-01 21:22:48 +02:00
Zach Fox	c42b13134f	Merge pull request #13063 from zfox23/preventImageProviderCrash ... Fix a crash in Image Provider when logging in or reloading all scripts	2018-05-01 11:55:15 -07:00
samcake	b3408ae4c0	Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload	2018-05-01 11:39:54 -07:00
Stephen Birarda	24dc1c930e	Merge branch 'RC66.2' of github.com:highfidelity/hifi into 66-2-to-67	2018-05-01 10:54:35 -07:00
Zach Fox	cd76336e6a	Actually fix	2018-05-01 09:54:23 -07:00
luiscuenca	2ac7fcadd2	load scripts once on rigReady	2018-05-01 09:37:01 -07:00
NissimHadar	97152ef9c1	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-01 09:33:07 -07:00
milad nazeri	aeb78e69f6	Merge commit 'refs/pull/13061/head' of https://github.com/highfidelity/hifi into gravprep-redo	2018-05-01 06:12:00 -07:00
David Rowe	65f5915372	Add JSDoc for startFarTrigger etc. calls on entity scripts	2018-05-01 21:55:27 +12:00
NissimHadar	d5610a2f37	WTF...	2018-04-30 17:52:44 -07:00
NissimHadar	c01fd02de2	Corrected parameter type.	2018-04-30 17:23:49 -07:00
NissimHadar	6d8eee6b32	Merge branch 'commandLineParametersForAutotester' of github.com:NissimHadar/hifi into commandLineParametersForAutotester	2018-04-30 17:19:29 -07:00
Zach Fox	f69ee41074	Prevent crash in ImageProvider when tablet isn't yet initialized	2018-04-30 17:13:44 -07:00
milad nazeri	8845094afb	Added Lod fix	2018-04-30 16:55:42 -07:00
David Rowe	f9bda6df15	Fix LODManager JSDoc	2018-05-01 11:36:37 +12:00
luiscuenca	50ca09b3b4	minor fixes	2018-04-30 16:26:04 -07:00
Zach Fox	eab2feb543	Lots of little improvements and stability fixes	2018-04-30 13:54:10 -07:00
Atlante45	250806252e	Don't use unique_ptr to store CrashpadClient	2018-04-30 12:37:18 -07:00
Atlante45	5ab16302ca	Keep CrashpadClient around	2018-04-30 12:36:17 -07:00
Zach Fox	aafcf056c4	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-04-30 12:36:00 -07:00
Zach Fox	a2b84c0fbb	It's working!!	2018-04-30 12:11:46 -07:00
luiscuenca	2de982a5a2	Added script types and better script reload	2018-04-30 12:04:35 -07:00
Liv Erickson	b994776ebd	do not open help on first run	2018-04-30 12:01:37 -07:00
vladest	4adfe94ed5	Removed check for updates menu item. POC: settings for advanced movements mappings	2018-04-30 20:43:36 +02:00
Zach Fox	9b80c500e3	Merge pull request #13039 from zfox23/sideloadAppJson ... Enable sideloading .app.json Apps from local disk	2018-04-30 11:14:24 -07:00
John Conklin II	bc7b0ca0a9	Merge pull request #13029 from birarda/bug/revert-12969-in-67 ... Fix missed revert of PR 12969 for RC67	2018-04-30 11:11:38 -07:00
Cristian Luis Duarte	401bf2f2a4	Merge remote-tracking branch 'hifi/master' into android_places_goto	2018-04-30 14:38:32 -03:00
John Conklin II	b6afaccdf3	Merge pull request #13041 from RebeccaStankus/newModelDialog-Fix ... New model dialog fix	2018-04-30 10:08:54 -07:00
John Conklin II	acf5ffc5ba	Merge pull request #12970 from sethalves/backtrace-annotations-1 ... Backtrace Attributes	2018-04-30 10:07:11 -07:00
Thijs Wenker	9e086dda3c	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-30 17:32:49 +02:00
vladest	a16b2c0d20	Restore preferences dialogs buttons spacing	2018-04-29 12:38:37 +02:00
vladest	deaecc7050	Added notifications settings	2018-04-29 11:19:01 +02:00
vladest	be22f49c32	Merge branch 'master' into menu-updates	2018-04-28 20:22:28 +02:00
David Rowe	2cc3ed6287	List which contexts each namespace and object is available in	2018-04-28 20:00:28 +12:00
Brad Davis	8e42bb8c87	Restore the stop functionality for a browser view when it's being destroyed	2018-04-27 17:35:38 -07:00
Zach Fox	1b29946a48	I feel so close; why isn't this variable capturing?	2018-04-27 17:26:05 -07:00
NissimHadar	cf9b089a3c	Added option to set snapshot location (for this execution only) from the command line.	2018-04-27 17:18:16 -07:00
samcake	023941a133	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-27 15:19:23 -07:00
John Conklin II	dd32ca33a5	Merge pull request #12957 from sethalves/quiet-logging ... Quiet logging	2018-04-27 14:59:38 -07:00
Gabriel Calero	ce8bd13685	Cleanup android code	2018-04-27 18:58:09 -03:00
Stephen Birarda	5324ea6d5d	Merge pull request #13038 from highfidelity/stable ... Merge stable to RC66.2	2018-04-27 14:42:28 -07:00
RebeccaStankus	269a7f0e15	Changed maximum line count for warning message	2018-04-27 14:34:08 -07:00
Zach Fox	dbd7d7e2b4	Small cleanup	2018-04-27 14:19:58 -07:00
Zach Fox	ea716f2a1e	Enable sideloading .app.json Apps from local disk	2018-04-27 14:08:53 -07:00
Zach Fox	c0fe504713	Merge pull request #13030 from zfox23/finalize_14295_14559 ... Finalize work on MS14295 and MS14559	2018-04-27 13:49:02 -07:00
samcake	3812b8da60	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-27 13:16:35 -07:00
Zach Fox	684d2b08ba	Finalize work on MS14295 and MS14559	2018-04-27 12:03:54 -07:00
Howard Stearns	f8ad36afd0	Merge pull request #13028 from zfox23/updateCommerceFor67 ... Allow gifting of Pending items; remove PoP verification rescheduling on Pending items	2018-04-27 11:55:40 -07:00
Dante Ruiz	290c31d916	don't spam resetSensors	2018-04-27 11:33:45 -07:00
Zach Fox	bbc15cdc63	Finalize work on MS14295 and MS14559	2018-04-27 11:04:46 -07:00
Bradley Austin Davis	acb21cc96a	Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently"	2018-04-27 10:50:47 -07:00
Zach Fox	c163ae63b8	Allow gifting of Pending items; remove PoP verification rescheduling on Pending items	2018-04-27 10:28:59 -07:00
Zach Fox	0f36fb113d	Allow gifting of Pending items; remove PoP verification rescheduling on Pending items	2018-04-27 10:20:55 -07:00
samcake	593c452671	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-27 09:33:06 -07:00
Brad Hefta-Gaub	e4f5eb9cca	Merge pull request #13020 from zfox23/MS14295_GiftsUIFixes ... MS14295: Fix lingering Gifts UI Bugs	2018-04-27 07:30:14 -07:00
Brad Hefta-Gaub	ac513cdd29	Merge pull request #13019 from zfox23/MS14559_fixNearbyClick1 ... MS14559: Fix sometimes being unable to click on 'Nearby' orb when sending Gift/HFC	2018-04-27 07:29:57 -07:00
Stephen Birarda	d87adcec92	make home go to DEFAULT_HIFI_ADDRESS by default	2018-04-26 17:47:12 -07:00
samcake	3ab0458d3a	Trying to expose an array to js	2018-04-26 17:45:48 -07:00
Zach Fox	e3b14bf478	MS14295: Fix lingering Gifts UI Bugs	2018-04-26 15:57:37 -07:00
Zach Fox	fc324f67bd	MS14559: Fix sometimes being unable to click on 'Nearby' orb when sending Gift/HFC	2018-04-26 15:09:53 -07:00
Anthony J. Thibault	c6b12307aa	Added custom jsdoc tags to High Fidelity ... There are 4 new jsdoc tags: * @hifi-interface - indicates that this namespace or class is available in Interface Scripts. * @hifi-assignment-client - indicates that this namespace or class is available in Assignment Client Scripts. * @hifi-client-entity - indicates that this namespace or class is available in Client Entity Scripts. * @hifi-server-entity - indicates that this namespace or class is avaialbe in Server Entity Scripts. These tags should appear just after the @class or @namespace tag. For example: /**jsdoc * Your avatar is your in-world representation of you. The <code>MyAvatar</code> API is used to manipulate the avatar. * For example, you can customize the avatar's appearance, run custom avatar animations, * change the avatar's position within the domain, or manage the avatar's collisions with other objects. * * @namespace MyAvatar * * @hifi-interface * @hifi-client-entity *	2018-04-26 14:13:42 -07:00
Thijs Wenker	20b9e44844	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-26 22:37:15 +02:00
MiladNazeri	098b432fd9	Merge pull request #13011 from ctrlaltdavid/21856-a ... Docs to JSDoc review updates	2018-04-26 13:29:48 -07:00
vladest	3296ae0db8	Merge branch 'master' into menu-updates	2018-04-26 22:21:40 +02:00
samcake	ba29ebaeb0	Moving the view controller up into workload and exposing timings	2018-04-26 13:08:26 -07:00
Stephen Birarda	bc4ce12e64	Merge pull request #13008 from huffman/fix/download-correct-installer ... Fix update installer URLs and add installer info to user activity data	2018-04-26 11:32:22 -07:00
Seth Alves	5e790d4898	include machine_fingerprint	2018-04-26 09:49:20 -07:00
Seth Alves	64be0a547c	hook up several annotations for crash reporter	2018-04-26 08:49:45 -07:00
Ryan Huffman	4c8b8d8442	Improve installer campaign+type for updates and user activity data	2018-04-26 08:32:18 -07:00
David Rowe	b8063840e7	Miscellaneous fixes	2018-04-26 21:17:05 +12:00
David Rowe	08dc9b133f	Docs to JSDoc review	2018-04-26 21:10:28 +12:00
luiscuenca	12f578c93c	More fixes	2018-04-25 19:46:31 -07:00
luiscuenca	e0770f06b1	Add scripts to Model Packager	2018-04-25 19:35:26 -07:00
Thijs Wenker	bbd31d590b	defaults	2018-04-26 03:12:44 +02:00
Thijs Wenker	8b7a07577c	Merge branch 'master' of git@github.com:highfidelity/hifi.git into feat/hasScriptedBlendshapes	2018-04-26 03:09:44 +02:00
samcake	6d755a2127	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-25 17:36:02 -07:00
samcake	5db3eee4ad	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-25 15:21:43 -07:00
Stephen Birarda	956cc411d5	Merge branch 'RC66.1' of github.com:highfidelity/hifi into sixty-six-one-mergeback	2018-04-25 14:33:23 -07:00
MiladNazeri	0f87e53902	Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate ... Docs/docs to js docs update	2018-04-25 12:26:19 -07:00
samcake	32e83c256a	Adjusting the task::Engine run signature to appease gcc gods and other warnings	2018-04-25 12:23:30 -07:00
John Conklin II	f04200a620	Merge pull request #12976 from ctrlaltdavid/21856 ... Docs to JSDoc	2018-04-25 11:36:34 -07:00
samcake	5b5cad38e8	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-25 10:03:42 -07:00
Thijs Wenker	484e20ea55	JSDOC - change bool type to boolean, to match JS type	2018-04-25 19:01:18 +02:00
Thijs Wenker	98148aa396	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-25 18:53:31 +02:00
Bradley Austin Davis	ea0ef20416	Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently"	2018-04-25 09:43:20 -07:00
Triplelexx	bd6b6c9423	fix content within 128 columns	2018-04-25 12:57:46 +01:00
Triplelexx	bd72350287	describe magic number	2018-04-25 12:47:55 +01:00
Thijs Wenker	192e48a376	style fix + JSDocs	2018-04-25 13:47:00 +02:00
Olivier Prat	f332849d9a	Merge branch 'master' of http://github.com/highfidelity/hifi into taapre	2018-04-25 09:19:21 +02:00
milad nazeri	4c736b2d62	Fixed defaults	2018-04-24 21:38:48 -07:00
David Rowe	cae9447ac5	Doc review	2018-04-25 15:09:47 +12:00
luiscuenca	165c3214a7	Avatar Scripts	2018-04-24 18:43:53 -07:00
Triplelexx	99ad51189c	fix browse asset filtering ... added support for list of filters using formatting consistent with other implementations, e.g: (*.png *.wav)	2018-04-24 23:03:56 +01:00
samcake	f2c76abafa	Apply the noAA /popJittering on the WebOverlay	2018-04-24 14:18:44 -07:00
Brad Hefta-Gaub	497c3fac4d	Merge pull request #12971 from Atlante45/fix/crashes-hotfix ... Add memory corruption crash handler	2018-04-24 14:01:09 -07:00
Dante Ruiz	29fce488e4	make some changes	2018-04-24 14:00:52 -07:00
Dante Ruiz	b2925c5843	fixing attachments not being visible when coming out of first person	2018-04-24 13:32:30 -07:00
John Conklin II	236e75b6c6	Merge pull request #12903 from druiz17/add-more-hmd-data ... Get the correct device name connect to OpenVr	2018-04-24 13:29:41 -07:00
milad nazeri	23d07fa292	fixed spacing issue	2018-04-24 13:14:55 -07:00
Clement	0804abcca6	Heap corruption crashes CR	2018-04-24 12:47:13 -07:00
samcake	33bbbcef83	Merging with master	2018-04-24 11:49:34 -07:00
Gabriel Calero	55a946c6c7	Fix non-android builds(performHapticFeedback)	2018-04-24 14:48:41 -03:00
Thijs Wenker	b0187ecfd3	add MyAvatar.hasAudioEnabledFaceMovement API property which is enabled by default	2018-04-24 19:24:23 +02:00
Sam Gateau	da154d3e00	Merge pull request #12969 from jherico/fix/web_crash ... Attempt to shutdown web surfaces more consistently	2018-04-24 10:15:25 -07:00
Brad Davis	a144de54e7	Attempt to shutdown web surfaces more consistently	2018-04-24 10:06:20 -07:00
Gabriel Calero	51f9b763ff	Merge remote-tracking branch 'origin/android_goto_splash' into android_new_login	2018-04-24 13:18:28 -03:00
Gabriel Calero	5284c4edae	Merge branch 'android_new_login' of https://github.com/gcalero/hifi into android_new_login	2018-04-24 12:00:00 -03:00
Gabriel Calero	103e9f92fa	Add haptic feedback to back, view and mic buttons	2018-04-24 11:56:01 -03:00
Sam Gateau	f50b2fab2b	Exposing timing and regulated radiuses	2018-04-23 22:38:50 -07:00
milad nazeri	1121fe8da0	fix tabs	2018-04-23 21:47:53 -07:00
samcake	f686ef1f25	Exposing more uniforms to ui for refining the controller	2018-04-23 18:02:09 -07:00
David Rowe	98f43b6a70	Interim JSDoc for MyAvatar - stubs for remainder	2018-04-24 10:47:33 +12:00
Thijs Wenker	3764ee4a06	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-24 00:36:28 +02:00
John Conklin II	5cf93ebd1f	Merge pull request #12966 from SamGondelman/audio ... Fix audio level meter	2018-04-23 14:56:57 -07:00
Brad Davis	861200db27	Attempt to shutdown web surfaces more consistently	2018-04-23 14:32:38 -07:00
David Rowe	719062dd9f	Interim JSDoc for MyAvatar - first pass	2018-04-24 09:10:59 +12:00
Atlante45	f2c471558c	CR	2018-04-23 13:14:21 -07:00
Atlante45	bc251115ed	Add special handler for heap corruption	2018-04-23 13:14:21 -07:00
Clement	fb496156ce	Fix threaded force crashes	2018-04-23 13:14:21 -07:00
Gabriel Calero	8923c16b08	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-04-23 17:04:06 -03:00
John Conklin II	b3dbf7a025	Merge pull request #12943 from vladest/fix_spinbox ... Fix SpinBox.	2018-04-23 13:02:01 -07:00
Gabriel Calero	74e38882f7	Refactor using Android fragments. Complete drawer menu. Add Privacy Policy.	2018-04-23 17:01:34 -03:00
SamGondelman	1deb38f06d	fix copy error	2018-04-23 12:05:30 -07:00
Gabriel Calero	ccb5e1e06c	Commenting out display plugin activation/desactivation	2018-04-23 15:29:51 -03:00
Cristian Luis Duarte	c33f1fbbb1	Merge remote-tracking branch 'hifi/master' into android_places_goto	2018-04-23 15:12:56 -03:00
Seth Alves	1dbcbbcced	cleanups	2018-04-23 11:05:06 -07:00
Gabriel Calero	001cd5e937	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-23 14:25:26 -03:00
samcake	990ee83f04	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-23 10:07:58 -07:00
vladest	cf070e6e92	Cleanup	2018-04-23 18:56:16 +02:00
vladest	e1222ddbc5	1st notifications added	2018-04-23 18:54:41 +02:00
Sam Gateau	7842ee8eac	Merge pull request #12962 from SamGondelman/menu ... Android: Hide menu and fix shader compilation	2018-04-23 09:51:20 -07:00
Cristian Luis Duarte	20d91b13dd	Merge remote-tracking branch 'hifi/master' into android_places_goto	2018-04-23 13:17:53 -03:00
Sam Gateau	97934fe563	Adjusting the regulators and moving task to use chrono nad interesting tests	2018-04-23 00:07:00 -07:00
milad nazeri	4ac06fe99f	Updating previous jsdocs	2018-04-22 22:22:33 -07:00
David Rowe	941e9360dd	JSDoc fixes	2018-04-23 16:09:56 +12:00
Sam Gateau	99a0e42b5d	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-22 20:26:49 -07:00
David Rowe	497cb4dab6	Interim JSDoc for Selection	2018-04-23 13:53:35 +12:00
David Rowe	96ddeb4e99	Interim JSDoc for SpeechRecognizer	2018-04-23 11:37:27 +12:00
milad nazeri	e9b9c05b5d	removed cruft	2018-04-22 08:51:47 -07:00
Sam Gateau	ec569b0e51	adjusting the bounding box for debug rendering	2018-04-21 12:05:27 -07:00
vladest	4de9969f36	Merge branch 'master' into menu-updates	2018-04-21 20:22:48 +02:00
vladest	60115752ad	Fixed saving after editing	2018-04-21 20:18:24 +02:00
vladest	2e44220b80	Merge branch 'master' into fix_spinbox	2018-04-21 19:38:28 +02:00
David Rowe	34d0a892a0	Point to example using Hardware.Application item	2018-04-21 15:01:46 +12:00
samcake	b66ab6deaa	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-20 17:55:45 -07:00
samcake	d1b0e89fa3	merging with upstream correctly	2018-04-20 17:55:34 -07:00
samcake	b554aec317	Trying more drastic changes and learnign to use std::chrono the right way	2018-04-20 17:53:24 -07:00
David Rowe	748052614f	Doc review	2018-04-21 12:45:00 +12:00
SamGondelman	d59f368ad6	hide menu, fix shaders	2018-04-20 17:38:38 -07:00
Seth Alves	6fc02638d7	control verbose logging with a menu-item in developer menu	2018-04-20 16:08:57 -07:00
Seth Alves	bec39369f7	remove some uncatagorized logging, suppress some categories by default	2018-04-20 16:08:57 -07:00
David Rowe	7087abd201	Merge branch 'master' into 21815	2018-04-21 10:49:56 +12:00
John Conklin II	39ad8be1b8	Merge pull request #12743 from SimonWalton-HiFi/short-id ... Use 16-bit local IDs for Nodes in NL packets	2018-04-20 15:28:18 -07:00
Andrew Meadows	06af31594e	merge 'master' into 'workload'	2018-04-20 15:07:46 -07:00
Cristian Luis Duarte	8235f999d8	Merge remote-tracking branch 'origin/master' into android_places_goto	2018-04-20 17:53:50 -03:00
John Conklin II	4705472960	Merge pull request #12889 from Atlante45/fix/threaded-crashes ... Fix threaded force crashes	2018-04-20 13:20:40 -07:00
samcake	3d651de797	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-20 13:20:19 -07:00
Seth Alves	c20346ca53	Merge pull request #12937 from SamGondelman/startup ... Make Audio.cpp threadsafe	2018-04-20 11:36:08 -07:00
Simon Walton	9f9a68188d	Merge remote-tracking branch 'upstream/master' into short-id	2018-04-20 11:10:21 -07:00
vladest	2b716f051c	Merge branch 'master' into menu-updates	2018-04-20 19:34:15 +02:00
Seth Alves	512b1911eb	Merge pull request #12858 from ctrlaltdavid/21836 ... Update location.hostname JSDoc per serverless domains	2018-04-20 10:27:09 -07:00
SamGondelman	3b4b43cf66	try to fix audio crash on startup	2018-04-20 10:23:47 -07:00
vladest	0e28e41107	Fix various issues with SpinBox-es and Sliders	2018-04-20 19:15:29 +02:00
Cristian Luis Duarte	55e64ceb55	Merge branch 'mm_1e08633' into android_places_goto	2018-04-20 13:32:23 -03:00
samcake	0f4aa7e27e	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-20 09:31:36 -07:00
vladest	b8577bd791	Merge branch 'master' into fix_spinbox	2018-04-20 18:09:16 +02:00
vladest	d54739cfc2	Start adding notifications [DNP]	2018-04-20 18:08:11 +02:00
Cristian Luis Duarte	77caa4d402	Merge branch 'mm_c8bef86' into android_places_goto	2018-04-20 12:26:38 -03:00
Ken Cooke	a9c5edcb2f	Merge pull request #12942 from kencooke/audio-devices-crfix ... Minor changes to meet coding standard	2018-04-20 08:20:32 -07:00
Sam Gateau	cfaf75e196	Using the std::chrono to measure the physics time	2018-04-19 23:28:32 -07:00
samcake	9b1a887469	Starting to move dynamically yeah	2018-04-19 17:43:14 -07:00
Gabriel Calero	adfbaac18f	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-19 19:40:00 -03:00
Cristian Luis Duarte	dc321e4cd7	Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_places_goto	2018-04-19 18:46:44 -03:00
David Rowe	08defea755	Merge branch 'master' into 21836	2018-04-20 09:20:56 +12:00
milad	42471c539b	initial fixes from ctralt david's comments	2018-04-19 13:40:57 -07:00
Gabriel Calero	f2184bf456	Handle android back button. Remove unused resources. Fix compilation errors.	2018-04-19 17:31:25 -03:00
samcake	a6bd589f4f	Merging upstream	2018-04-19 12:20:10 -07:00
vladest	b191ad866f	Merge fixes	2018-04-19 21:04:11 +02:00
vladest	ab1a89a6f9	Merge branch 'master' into menu-updates	2018-04-19 21:02:30 +02:00
Howard Stearns	6d151f022d	Merge pull request #12910 from zfox23/MS12217_letterboxMessageFix ... Only dismiss letterbox when clicking on grey areas	2018-04-19 11:47:10 -07:00
vladest	663af09605	Fix SpinBox. attempt 1	2018-04-19 20:43:48 +02:00
Seth Alves	6f420ffae2	Merge pull request #12936 from druiz17/more-tablet-changes ... Change tablet model and spawn position	2018-04-19 10:25:34 -07:00
samcake	9b3d546dad	Exposing the on off to use the distance configs	2018-04-19 09:35:57 -07:00
Sam Gateau	1e086332cc	Merge pull request #12911 from jherico/feature/splash ... Pre-requisite changes for splash screen rendering	2018-04-19 09:19:05 -07:00
Cristian Luis Duarte	5be9959424	Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_places_goto	2018-04-19 12:11:29 -03:00
Gabriel Calero	c8fe45eb8f	Remove debug statements and unused code. Put JNI code in a separated file.	2018-04-19 11:41:59 -03:00
Ken Cooke	764aa00069	Coding standard fixes	2018-04-19 07:33:14 -07:00
vladest	3d8d0bfa07	Added hot keys enumeration for display menu	2018-04-19 12:31:14 +02:00
vladest	ba4ef74313	Remove View->Overlays menu	2018-04-19 12:01:58 +02:00
vladest	60d53359bb	Fix Toolbar vertical position	2018-04-19 11:39:58 +02:00
vladest	fffd4eec41	Avatar enable flying added	2018-04-19 08:46:20 +02:00
milad	364d193499	audio added	2018-04-18 21:04:57 -07:00
milad	3f129bda13	More done on audio	2018-04-18 20:04:41 -07:00
samcake	52a4224442	Arg get me the feedback working!!!!	2018-04-18 18:16:06 -07:00
Stephen Birarda	c4ad93bafb	Merge pull request #12782 from SimonWalton-HiFi/qregexp ... Replace LogHandler repeated regex scheme with assigned ID tracking scheme	2018-04-18 17:28:48 -07:00
Zach Fox	e01e7cc7bc	Be a bit more efficient	2018-04-18 16:34:02 -07:00
Gabriel	8f34c02ab2	Update AndroidHelper.h	2018-04-18 18:32:20 -03:00
Zach Fox	e0012ed5dc	Merge pull request #12924 from zfox23/MS12292_snapshotResourcesPath ... Fix paths to various Snapshot resource files	2018-04-18 13:44:53 -07:00
vladest	7b21b36d3c	Disable menu button in Toolbar mode	2018-04-18 22:19:54 +02:00
Dante Ruiz	9d6fc13a04	Merge branch 'master' of github.com:highfidelity/hifi into more-tablet-changes	2018-04-18 13:06:51 -07:00
Dante Ruiz	a65f5f7917	making tablet changes	2018-04-18 13:06:26 -07:00
Cristian Luis Duarte	9c44be3557	Merge remote-tracking branch 'gcgithub/android_new_login' into android_places_goto	2018-04-18 16:55:08 -03:00
Gabriel Calero	472cc1b29a	Fix code spacing	2018-04-18 16:44:49 -03:00
vladest	b5071d28e8	Merge branch 'master' into menu-updates	2018-04-18 21:10:57 +02:00
vladest	cacb9359c2	Toolbar at bottom	2018-04-18 20:57:28 +02:00
Gabriel Calero	120de92c9e	Add login activity	2018-04-18 15:52:02 -03:00
John Conklin II	710bfb894a	Merge pull request #12907 from AndrewMeadows/more-correct-stats-002 ... more correct stats names	2018-04-18 10:50:38 -07:00
John Conklin II	d19bb557ad	Merge pull request #12897 from ctrlaltdavid/21848 ... Include JSDoc Web pages in the install	2018-04-18 10:49:31 -07:00
John Conklin II	005b6a6b1f	Merge pull request #12893 from ctrlaltdavid/21843 ... Fix overlay toggling	2018-04-18 10:49:05 -07:00
samcake	d6b6645630	exposing feedback of timing	2018-04-17 18:03:45 -07:00
Atlante45	7e6d45ead7	CR	2018-04-17 16:25:07 -07:00
Stephen Birarda	95c172f418	Merge branch 'stable' of github.com:highfidelity/hifi into merge-back-stable-66	2018-04-17 15:34:46 -07:00
Zach Fox	3b8e52ea41	Merge pull request #12862 from zfox23/discovery_April2018 ... Discovery: April 2018 (Huge PR; see description)	2018-04-17 15:11:50 -07:00
Atlante45	a626e9f6f3	Add special handler for heap corruption	2018-04-17 15:09:10 -07:00
Brad Davis	d478204722	Working on splash rendering	2018-04-17 14:17:41 -07:00
Zach Fox	95ee3c82f5	Fix paths to various Snapshot resource files	2018-04-17 14:13:14 -07:00
vladest	ee1738adac	Add stubs for graphics settings. Add avatar collision setting	2018-04-17 21:58:53 +02:00
David Rowe	e3edc45081	Document NavigationFocused	2018-04-18 07:04:55 +12:00
vladest	bb7eb90f58	Merge branch 'master' into menu-updates	2018-04-17 19:55:11 +02:00
vladest	c402cb2c19	Fix Desktop double windows	2018-04-17 19:51:43 +02:00
vladest	8a5d80de31	Fix Desktop double windows	2018-04-17 19:51:24 +02:00
Cristian Luis Duarte	744fa808e3	Merge remote-tracking branch 'hifi/master' into android_places_goto	2018-04-17 13:11:02 -03:00
Sam Gateau	ab04a34ccf	Proposing a more flexible design for the engine	2018-04-17 02:06:33 -07:00
Sam Gateau	fd752a07c1	Proposing a more flexible design for the engine	2018-04-17 02:05:35 -07:00
samcake	2008c61368	more ui test features	2018-04-16 17:58:13 -07:00
David Rowe	c1ede6ef58	Merge branch 'master' into 21815 ... # Conflicts: # tools/jsdoc/plugins/hifi.js	2018-04-17 11:54:56 +12:00
David Rowe	9f83c606e9	Controller API JSDoc	2018-04-17 11:46:40 +12:00
Anthony J. Thibault	0a162e62b0	transmit sendAll packet in nodeActivated signal callback ... (cherry picked from commit 9f1a8290148da12849935c916b2e0a59864cb49b)	2018-04-16 16:16:56 -07:00
Zach Fox	93cf399fd6	Only dismiss letterbox when clicking on grey areas	2018-04-16 15:09:19 -07:00
Anthony J. Thibault	c29bf51226	Fix for avatar glitches, head and legs folding into chest. ... As a form of compression, when encoding avatar data we only send joints that have changed significantly from the previous packet. Also, if a joint has the same value as the avatar's default pose, we don't send the full value, instead we mark it with a single bit. This particular issue is caused by an interaction between the default value flag and the joint changed culling. When connecting to a domain for the first time, it's possible that a I-frame or 'full' packet will not be sent for several seconds. In this case, the AvatarMixer has no previous history for values that have not changed recently. This causes the AvatarMixer to broadcast incorrect values to other clients. Keep in mind that the AvatarMixer does not have access to the avatar FBX file, so it cannot make an educated guess for this value and uses zero values instead. (0, 0, 0) for translation and (0, 0, 0, 1) for rotation. When a translation value of zero is received for the lower legs it will cause the legs to fold into the avatar's chest. Also, we've uncovered a bug where sometimes values were not sent to the AvatarMixer even when the value was previously default. This would also exhibit the same issue where zero translation values would be sent. I've done three things to help mitigate this issue. 1) On first connect to a new AvatarMixer, the Avatar now sends a 'full' packet. 2) When a joint rotation or translation changes from the default value, we transmit it. No questions asked. 3) Once a SkeletonModel has finished loading we initialize the avatar's _jointData with the proper translations from the default pose. This will help the case where a client receives a non default value, but has no previous history. (cherry picked from commit 94efdf76a6454f316985f95d6a221adb24788d66)	2018-04-16 14:58:33 -07:00
Andrew Meadows	a80cf49eb3	split 'ETRupdate' out of 'postPhysics' stat context	2018-04-16 13:31:36 -07:00
Andrew Meadows	ace32193b4	more correct stat names	2018-04-16 13:31:36 -07:00
samcake	b32be91bb1	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-16 13:22:58 -07:00
Zach Fox	0504220171	Abide by new backend code	2018-04-16 13:01:31 -07:00
Zach Fox	02aa8ac566	Bugfixes per QA	2018-04-16 11:53:37 -07:00
John Conklin II	5705bac87f	Merge pull request #12723 from ctrlaltdavid/21801 ... HMD API JSDoc	2018-04-16 11:12:26 -07:00
Gabriel Calero	e3b94b163c	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-16 14:55:16 -03:00
samcake	c18cee9862	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-16 10:38:06 -07:00
Sam Gateau	3ac4a1db2d	Merge pull request #12850 from SimonWalton-HiFi/early-trace ... Enable Interface tracing from earliest execution point	2018-04-16 10:24:55 -07:00
Zach Fox	ee9519bf1b	Merge branch 'discovery_April2018' of github.com:zfox23/hifi into discovery_April2018	2018-04-16 10:12:34 -07:00
Zach Fox	071bf35683	Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018	2018-04-16 10:11:44 -07:00
Dante Ruiz	5af1ea54d3	Merge branch 'master' of github.com:highfidelity/hifi into add-more-hmd-data	2018-04-16 10:10:55 -07:00
David Rowe	06bb873e8d	Include JSDoc Web pages in the install	2018-04-16 16:08:26 +12:00
Thijs Wenker	567b698c59	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-16 01:34:20 +02:00
vladest	6d53512c6c	Merge	2018-04-15 15:24:16 +02:00
David Rowe	df31d20430	Fix overlay toggling	2018-04-14 17:06:34 +12:00
Sam Gateau	2d6bddf5d2	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-13 19:27:55 -07:00
Sam Gondelman	7c65c9c444	Merge pull request #12888 from SamGondelman/statsAssert ... Rollback some recent QML changes on Android	2018-04-13 16:35:28 -07:00
Clement	bd59ff1573	Fix threaded force crashes	2018-04-13 15:11:49 -07:00
John Conklin II	3982472cf2	Merge pull request #12851 from druiz17/rc66-spwan-fix ... serverless-domain named landing-points(RC66)	2018-04-13 14:58:36 -07:00
samcake	1cd662acdb	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-13 14:43:11 -07:00
Thijs Wenker	22e7f80356	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-13 23:33:02 +02:00
SamGondelman	8005547d03	rollback some qml changes on android	2018-04-13 14:28:00 -07:00
samcake	b88b668a06	Exposing more texture memory budget options	2018-04-13 12:19:53 -07:00
samcake	e6085a90d6	Exposing more texture memory budget options	2018-04-13 12:17:50 -07:00
John Conklin II	008c7be369	Merge pull request #12787 from druiz17/fix-offscreen-windows ... hide desktop windows when switching into HMD mode	2018-04-13 12:17:15 -07:00
Melissa Brown	fd7b3b75f9	Merge pull request #12884 from Atlante45/fix/build-instructions ... Update docs with correct qt version	2018-04-13 11:12:06 -07:00
Seth Alves	a56f3f4a10	code review	2018-04-12 19:06:12 -07:00
Sam Gateau	27e728ff67	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-12 18:11:18 -07:00
John Conklin II	fc487ea322	Merge pull request #12831 from ctrlaltdavid/21829 ... Model overlay fixes	2018-04-12 17:04:55 -07:00
Simon Walton	76468f7f26	Use existing DISABLE_WATCHDOG global to turn off thread entirely	2018-04-12 16:58:13 -07:00
Clement	157ca8cd68	Update docs with correct qt version	2018-04-12 16:21:26 -07:00
Andrew Meadows	6633304773	fix typo	2018-04-12 15:02:24 -07:00
Gabriel Calero	bd4a7ce4fa	Hide jump button while moving. Fix jump button right alignment in pixel	2018-04-12 19:02:03 -03:00
Thijs Wenker	2e396fd1b9	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-12 23:36:27 +02:00
Andrew Meadows	d553f85e83	adding pickManager and pointerManager to stat summary	2018-04-12 14:23:48 -07:00
Andrew Meadows	060c391d47	more correct stat names	2018-04-12 14:23:48 -07:00
Gabriel Calero	aaaa17be7b	Merge branch 'android_goto_splash' of https://github.com/gcalero/hifi into android_goto_splash	2018-04-12 18:00:05 -03:00
Gabriel Calero	476e1cf7ae	Adjust UI with pixel perfect precision. Support devices with on-screen bars.	2018-04-12 17:59:38 -03:00
samcake	e2f9eef5e2	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-12 12:27:27 -07:00
Sam Gateau	77a27b2be7	Merge pull request #12835 from NissimHadar/speedUp1 ... ktxInitialDataRequestFinished call to qcDebug(networking) - only in DEBUG	2018-04-12 11:48:09 -07:00
Seth Alves	46a741be7b	Merge pull request #12068 from vladest/move_to_qqc2 ... Move to qqc2	2018-04-12 11:26:55 -07:00
Simon Walton	a584d67acd	Tweaks for clang error and gcc warning	2018-04-12 10:44:41 -07:00
John Conklin II	67b1313fb6	Merge pull request #12669 from ElderOrb/FB13143 ... Fix several styling/alignment/overlapping issues in 'Add to world' and 'Rename' dialogs in Asset Browser	2018-04-12 10:34:58 -07:00
John Conklin II	213c35dab4	Merge pull request #12790 from WolfGangS/bugfix/12759-editoverlay-subimage ... Bugfix for #12759 Overlays.editOverlay not applying subImage property	2018-04-12 10:34:17 -07:00
John Conklin II	7bcaa12c50	Merge pull request #12679 from FlameSoulis/getAnimatationRoles-fix ... Typo corrected: getAnimatationRoles to getAnimationRoles	2018-04-12 10:32:09 -07:00
Cristian Luis Duarte	b031c1c070	Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_goto_splash	2018-04-12 14:32:07 -03:00
Simon Walton	5c141aa5e9	Add --disableWatchdog command-line option ... Watchdog still runs but doesn't abort on timeout. Also fixes for previous tracing improvements.	2018-04-12 09:28:28 -07:00
Thijs Wenker	7a5d3314a2	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-12 18:04:46 +02:00
Sam Gateau	6a7ae55d9c	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-11 19:08:57 -07:00
David Rowe	c2f0f7ef5f	Doc review	2018-04-12 10:54:35 +12:00
Sam Gateau	f355bd86c2	Merge pull request #12783 from samcake/blue ... Hack: Adding more budget options for memory texture	2018-04-11 15:46:08 -07:00
Gabriel Calero	865e3a05f1	Move jump button to the right. Adjust position of buttons	2018-04-11 19:33:43 -03:00
David Rowe	7a9e3388fa	Merge branch 'master' into 21801	2018-04-12 09:48:51 +12:00
Gabriel Calero	8010fd2420	New view selector behaviour. Update icons	2018-04-11 18:43:39 -03:00
David Rowe	c836014d21	Fix JSDoc typo noticed in passing	2018-04-12 09:24:10 +12:00
Cristian Luis Duarte	d993e4938e	Merge remote-tracking branch 'hifi/master' into android_goto_splash	2018-04-11 18:03:16 -03:00
John Conklin II	7a905ed420	Merge pull request #12777 from ctrlaltdavid/21813 ... Fix Window API position and size reporting	2018-04-11 13:48:21 -07:00
Gabriel Calero	578012b662	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-11 16:30:53 -03:00
John Conklin II	854d3d7804	Merge pull request #12765 from ctrlaltdavid/21822 ... Fix text sizing per text3d overlay lineHeight property	2018-04-11 12:16:51 -07:00
MiladNazeri	9f7a765ec3	Merge pull request #12729 from ctrlaltdavid/21814 ... Settings API JSDoc	2018-04-11 11:48:15 -07:00
Thijs Wenker	56fbb6e384	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-11 18:49:39 +02:00
Zach Fox	539fd42324	Reduce logging from some Commerce/Discovery features	2018-04-11 09:41:47 -07:00
Zach Fox	a411760f0c	Finally fix the grey security pic bug!	2018-04-11 09:41:47 -07:00
Zach Fox	feec52b4bb	Cleanup 'Private' HMD Preview State Machine Logic	2018-04-11 09:41:47 -07:00
Zach Fox	dc3e1751cb	Commerce: Gifts	2018-04-11 09:41:47 -07:00
Zach Fox	0c9d65bc15	Merge pull request #12758 from zfox23/commerce_fixCertificateInfoError ... Commerce: Fix Certificate Info error	2018-04-11 09:38:43 -07:00
Zach Fox	095b4ba5f2	Reduce logging from some Commerce/Discovery features	2018-04-10 16:02:58 -07:00
Zach Fox	b9d0360ea2	Finally fix the grey security pic bug!	2018-04-10 16:00:53 -07:00
Zach Fox	a2f5891a0b	Cleanup 'Private' HMD Preview State Machine Logic	2018-04-10 16:00:18 -07:00
Zach Fox	ffab27d442	Commerce: Fix Certificate Info error	2018-04-10 15:54:55 -07:00
Zach Fox	a9b9a1cb10	Commerce: Gifts	2018-04-10 15:54:19 -07:00
Seth Alves	f81836c830	support specification of named landing-points in serverless-domain json files	2018-04-10 14:25:59 -07:00
Simon Walton	ca5720c015	Take out superfluous DependencyManager::set<tracing::Tracer>()	2018-04-10 13:52:46 -07:00
Simon Walton	cf3648409d	Allow duration for tracing, other fixes	2018-04-10 13:14:52 -07:00
Simon Walton	513a4875f0	Move --traceFile option to start of main()	2018-04-10 13:13:47 -07:00
Simon Walton	9b6306601a	Merge Clement's PR12700 diffs for early trace start	2018-04-10 13:13:46 -07:00
Thijs Wenker	783a6711f5	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-10 16:15:55 +02:00
Sam Gateau	9cb918a4ad	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-09 20:03:26 -07:00
Sam Gondelman	d781cf43ee	Merge pull request #12775 from Cristo86/android_jump ... Android Control - jump and view sensitivity	2018-04-09 17:32:57 -07:00
samcake	72649f5c06	More featuers for the view of the workload and test scrtpts to stress the system)	2018-04-09 17:27:40 -07:00
Thijs Wenker	aa1c0654da	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-10 00:21:24 +02:00
Clément Brisset	c62a701a2d	Merge pull request #12838 from highfidelity/RC66 ... RC66 merge back to master	2018-04-09 13:17:12 -07:00
John Conklin II	890a63afb4	Merge pull request #12833 from ElderOrb/FB14015_RC66 ... Close 'goto' app on pressing 'forward' / 'backward' buttons	2018-04-09 11:42:17 -07:00
Triplelexx	883cd7b8d0	rename performance timer	2018-04-09 18:24:20 +01:00
Triplelexx	aef0c29a31	remove Limitless API	2018-04-09 18:23:33 +01:00
Triplelexx	704499a76d	remove Limitless API	2018-04-09 18:22:48 +01:00
John Conklin II	be3d5d03cc	Merge pull request #12808 from ElderOrb/FB13962_RC66 ... Fix for auto-reopening of closed query dialogs (aka hack-on-top-of-hack)	2018-04-09 09:42:00 -07:00
Gabriel Calero	b30cb25a3f	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-09 12:20:35 -03:00
Gabriel Calero	e85f5c97dc	Remove bottom bar. Apply new design for android	2018-04-09 11:41:00 -03:00
NissimHadar	7f70511d1a	Added a script command to clear caches.	2018-04-08 10:32:35 -07:00
Alexander Ivash	faddc556d7	FB14015 - Go To app does not close when selecting forward and back arrows on desktop	2018-04-07 17:57:22 +03:00
David Rowe	f3a745b6cb	Fix initialization order	2018-04-07 18:53:27 +12:00
David Rowe	8093e3e5ae	Fix some miscellaneous JSDoc typos	2018-04-07 16:48:05 +12:00
David Rowe	96178404c7	Document that jointTranslations and jointRotations are not cloned	2018-04-07 16:47:38 +12:00
David Rowe	ba020854b6	Add missing "animationSettings.currentFrame" property JSDoc	2018-04-07 16:46:44 +12:00
David Rowe	38d7b81a4f	Add missing "get" and JSDoc for "loadPriority" property	2018-04-07 16:46:02 +12:00
David Rowe	6d9b69cd2e	Fix cloning a model overlay not cloning animation settings	2018-04-07 16:44:58 +12:00
samcake	49977d7fc3	Merge branch 'workload' of https://github.com/highfidelity/hifi into workload	2018-04-06 17:42:45 -07:00
Sam Gateau	476b75488c	Merge pull request #12827 from AndrewMeadows/lhf-needsToCallUpdate ... Workload: low hanging fruit optimization: don't unneccessarily update() entities	2018-04-06 17:38:54 -07:00
samcake	694baa81e8	removing logging around physics	2018-04-06 16:12:02 -07:00
Thijs Wenker	fa138b953b	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-07 00:19:35 +02:00
Cristian Luis Duarte	f556c8d3a7	Merge remote-tracking branch 'hifi/master' into android_jump	2018-04-06 18:02:30 -03:00
Dante Ruiz	00713ab225	fix selection api	2018-04-06 14:00:50 -07:00
Cristian Luis Duarte	bd6f0fd59e	Make view/rotation control independent of touchUpdate events rate	2018-04-06 16:17:28 -03:00
Zach Fox	0c48ccefa4	Clean up failResponse to make it better	2018-04-06 11:41:17 -07:00
Andrew Meadows	a9f5b57681	merge 'master' into 'workload-010'	2018-04-06 11:11:06 -07:00
Andrew Meadows	da48a5af20	fix compile errors and add PhysicsBoundary.cpp file	2018-04-06 11:10:23 -07:00
Zach Fox	af5a68b282	Merge branch 'master' of github.com:highfidelity/hifi into commerce_fixCertificateInfoError	2018-04-06 10:58:32 -07:00
Stephen Birarda	1d76dea9f6	Merge pull request #12818 from highfidelity/RC66 ... Merge back RC66 to master	2018-04-06 10:43:01 -07:00
Thijs Wenker	c905437ed9	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-06 17:27:40 +02:00
Andrew Meadows	ed1761945c	add/remove entities to physics using workload output	2018-04-06 07:22:05 -07:00
Alexander Ivash	25a44edfce	fix conditional bindings ... note: unfortunately there is no way to understand whether the item was anchored as even not anchored item has some anchors	2018-04-06 13:22:27 +03:00
Alexander Ivash	3ce00acd16	rebased to the master	2018-04-06 13:22:27 +03:00
Alexander Ivash	c34a6fd000	Fix styling issues - make TabletQueryDialog more consistent with TabletCustomQueryDialog	2018-04-06 13:22:27 +03:00
Alexander Ivash	91488bbbeb	align combobox to accept/cancel buttons, otherwise stretch to buttons area	2018-04-06 13:22:22 +03:00
samcake	a5ee211dbf	Dirty attempt to capture the owner typefor a payload	2018-04-05 18:04:35 -07:00
Alexander Ivash	557b7ded66	fix for closed query dialogs auto-reopening (FB13962 Import Entity URL Dialogue Box Will not Disappear) ... Signed-off-by: Alexander Ivash <elderorb@gmail.com>	2018-04-06 03:00:44 +03:00
samcake	c5b88d55ab	Spliting the creation of the Workload engine from the setup and configuration, changing the output from region tracker	2018-04-05 16:05:40 -07:00
Alexander Ivash	9ec10bbb7e	Make keyboard's 'raisedHeight' to include 'mirror text' height ... note: this is necessary becasue all the dialogs rely on 'raisedHeight', so without 'mirror text' they will use wrong keyboard geometry during calculations	2018-04-06 00:18:19 +03:00
Howard Stearns	ad191defb8	Merge pull request #12799 from zfox23/snapshot_fixCrashOnUploadError ... Prevent Interface from crashing when a Snapshot upload fails	2018-04-05 13:51:33 -07:00
Seth Alves	8de545acdf	add new address accessor for 'public' addresses, use it for snapshot and stream	2018-04-05 13:39:51 -07:00
Zach Fox	ac2721fe6a	Logging improvements	2018-04-05 13:04:09 -07:00
Andrew Meadows	8035dde5dd	fix Windows warnings	2018-04-05 12:54:43 -07:00
Gabriel Calero	0da2c972e3	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-05 16:22:56 -03:00
Andrew Meadows	4f0980b94b	hook up prototype PhysicsBoundary job	2018-04-05 12:11:57 -07:00
Andrew Meadows	d9ab166aac	initial PhysicsBoundary job implementation	2018-04-05 12:10:46 -07:00
Andrew Meadows	299f2a92e0	merge 'master' into 'workload'	2018-04-05 12:01:19 -07:00
Zach Fox	8e46ebf83b	Prevent Interface from crashing when a Snapshot upload fails	2018-04-05 11:27:26 -07:00
John Conklin II	9e21bab67e	Merge pull request #12748 from AndrewMeadows/untangle-003 ... cleanup around simulation-ownership	2018-04-05 10:58:45 -07:00
Seth Alves	4b0d338e57	on first run, send user to serverless tutorial rather than checking for a local sandbox	2018-04-04 18:00:11 -07:00
Cristian Luis Duarte	1a967e45a6	Android View control - Remove limit, use a scale filter, remove deadZone to increase sensitivity	2018-04-04 21:54:12 -03:00
Dante Ruiz	31783726a8	fix toolbar disappearing	2018-04-04 16:30:06 -07:00
Thijs Wenker	b3231c3f7e	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-05 00:32:09 +02:00
Gabriel Calero	15163f5e87	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-04 19:25:20 -03:00
Gabriel Calero	99d8f822b2	Fix crash selecting domain for second time. Stop rendering while Goto activity is started	2018-04-04 19:24:26 -03:00
John Conklin II	2e37b4a312	Merge pull request #12747 from Zvork/fade ... Update to Transitions debugging / editing script	2018-04-04 14:31:59 -07:00
Cristian Luis Duarte	ffb8b0a60e	Android fly - Use new asset and screen position	2018-04-04 18:19:01 -03:00
WolfGang	787127b149	move subImage recalculation to it's own method	2018-04-04 22:10:54 +01:00
Dante Ruiz	475a3a29ac	remvoe debug statement	2018-04-04 11:14:53 -07:00
Dante Ruiz	09ced24710	hide desktop windows when switching into HMD mode	2018-04-04 11:05:25 -07:00
John Conklin II	cba307f28b	Merge pull request #12762 from samcake/one ... Remove notifications and print outs when degrading LOD	2018-04-04 10:35:05 -07:00
Howard Stearns	3a428bc44f	Merge pull request #12776 from zfox23/fixHmdPreviewAgain_1 ... Fix 'Private' HMD preview texture enable/disable...again	2018-04-04 10:03:18 -07:00
Simon Walton	692ccfc09b	Create HIFI_FCDEBUG(_ID) variants that require a category ... Original macros use default settings.	2018-04-04 09:49:15 -07:00
Zach Fox	752246d950	Merge pull request #12760 from zfox23/inspection_rightClickTweaking ... Inspection: Tweak mouse-right-click-to-inspect behavior	2018-04-04 09:32:29 -07:00
WolfGang	f9bcd23463	make subimage update the image anchors	2018-04-04 17:28:55 +01:00
Seth Alves	2df334c50e	Merge pull request #12663 from ElderOrb/FB12870 ... Fix for not updating checkbox state on 'baking' / 'unbaking'.	2018-04-04 09:03:03 -07:00
Gabriel Calero	ddbf4417ff	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-04 12:24:25 -03:00
Thijs Wenker	ceeff58fac	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-04 17:04:11 +02:00
samcake	1629756d53	Adding more budget options for memory texture	2018-04-03 18:08:43 -07:00
samcake	88a5105b81	Merge branch 'workload' of https://github.com/highfidelity/hifi into workload	2018-04-03 18:00:16 -07:00
samcake	fa35d659dc	Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload	2018-04-03 17:56:41 -07:00
Simon Walton	7d16ca9c1c	Remove uses of addRepeatedMessageRegex() and its implementation ... Change to new log-message ID scheme.	2018-04-03 17:54:01 -07:00
Cristian Luis Duarte	88c83f3bfe	Merge remote-tracking branch 'hifi/master' into android_jump	2018-04-03 19:59:21 -03:00
Clément Brisset	3d4490f3fd	Merge pull request #12737 from highfidelity/RC66 ... RC66 mergeback	2018-04-03 15:39:16 -07:00
David Rowe	095c1b837c	Update JSDoc	2018-04-04 09:48:33 +12:00
Thijs Wenker	63aaf27847	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-03 23:46:30 +02:00
David Rowe	6868ca971f	Make Window.x and Window.y report top left of drawable area of window	2018-04-04 09:43:39 +12:00
David Rowe	a3c8b2792d	Fix Window.geometryChanged() values for moving and resizing window	2018-04-04 09:42:05 +12:00
howard-stearns	01d90ea1a5	Introduce safeLoading.	2018-04-03 13:49:09 -07:00
Zach Fox	f20eddefc8	Fix 'Private' HMD preview texture enable/disable...again	2018-04-03 13:46:02 -07:00
samcake	2dc4630e68	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-04-03 12:55:21 -07:00
samcake	efd2b2720b	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-03 12:46:10 -07:00
Seth Alves	a1ce9481bb	Merge pull request #12739 from druiz17/fix-mapping-mistake ... map flying down back to C key	2018-04-03 12:39:46 -07:00
Seth Alves	5f13df4102	Merge pull request #12722 from druiz17/fix-entities-outline ... fix ContextOverlayInferface highlighing unspecified entities.	2018-04-03 12:29:19 -07:00
Cristian Luis Duarte	cbf13c9f8c	Merge remote-tracking branch 'hifi/master' into android_jump	2018-04-03 16:12:17 -03:00
Cristian Luis Duarte	1ea056a8a9	Android - Initial Jump button implementation	2018-04-03 16:07:40 -03:00
Alexander Ivash	ccea3efe1e	FB13789 - Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password?" links	2018-04-03 21:43:40 +03:00
Gabriel Calero	78c50410b3	Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash	2018-04-03 14:37:19 -03:00
samcake	5bfaa84258	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-03 09:16:07 -07:00
John Conklin II	53a5261905	Merge pull request #12712 from zfox23/newUpdateCertLocation ... Fix cert location for content sets; handle .content.zip content sets	2018-04-03 09:10:11 -07:00
Thijs Wenker	a0f6afb53d	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-03 16:45:11 +02:00
David Rowe	ab55f20976	Fix text sizing per text3d overlay lineHeight property ... Makes text size correct for multiple lines of text.	2018-04-03 16:54:07 +12:00
David Rowe	63603ff97c	Fix window height reported by Window.geometryChanged() signal	2018-04-03 14:21:15 +12:00
Sam Gateau	2afd5f9813	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-02 19:11:02 -07:00
samcake	5a1eac563b	Code review fixes	2018-04-02 15:50:18 -07:00
John Conklin II	9dcef996c5	Merge pull request #12684 from vladest/assetserver_wrong_dialog ... Fix invalid message if cancel adding asset to AssetServer	2018-04-02 15:28:46 -07:00
John Conklin II	74ca98dc81	Merge pull request #12727 from amantley/triggerRecenterBehaviour ... Trigger Avatar Recenter Behaviour	2018-04-02 14:42:21 -07:00
Zach Fox	1f3063193a	Tweak right-click to inspect	2018-04-02 14:24:51 -07:00
samcake	d4bc61fb3d	Remove notifications and print outs for LOD changes because it was too much noise	2018-04-02 13:53:30 -07:00
John Conklin II	796bd069b2	Merge pull request #12659 from alexiamandeville/script_charcontroller ... Updating char controller	2018-04-02 13:24:15 -07:00
Zach Fox	5441767442	Better cert display	2018-04-02 12:22:41 -07:00
Zach Fox	7f3e9547cc	Handle the case when metaverse returns error for certificateInfo	2018-04-02 11:55:10 -07:00
Dante Ruiz	a9a53c7d64	make resquested changes	2018-04-02 10:51:39 -07:00
Gabriel Calero	176038aa53	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-02 12:23:04 -03:00
Gabriel Calero	2ff13270ed	Go back to GoTo screen	2018-04-02 12:22:21 -03:00
Thijs Wenker	665e053f3d	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-04-02 17:02:16 +02:00
Sam Gateau	dada0b9024	Exploring better task job config api that work	2018-04-02 01:09:35 -07:00
Sam Gateau	9e2295525d	merging with upstream workload after it s been updated with master	2018-03-31 13:31:20 -07:00
samcake	59a081bcdb	merge with upstream	2018-03-30 18:08:38 -07:00
Seth Alves	e8a62d2943	Merge pull request #12740 from druiz17/fix-scope ... Fix name conflict with c++ class and qml file(master)	2018-03-30 15:41:42 -07:00
Dante Ruiz	4b7e2cb331	made requested changes	2018-03-30 15:15:17 -07:00
Dante Ruiz	c99676b510	atlernate fix for selected entities	2018-03-30 13:44:54 -07:00
Andrew Meadows	73fa6d3d2f	slightly simpler EntityMotionState delete logic	2018-03-30 13:18:32 -07:00
Andrew Meadows	6837d042ad	move entityCollisionWithEntity to PhysicalEntitySimulation	2018-03-30 13:18:32 -07:00
Olivier Prat	5c26b4030b	Merge branch 'master' of http://github.com/highfidelity/hifi into fade	2018-03-30 14:38:42 -04:00
Gabriel Calero	b123b67134	Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash	2018-03-30 15:38:36 -03:00
Ken Cooke	ff6c9f3127	Merge pull request #12704 from ElderOrb/FB13057 ... Improve audio devices selection logic	2018-03-30 11:18:05 -07:00
Zach Fox	32e5e9986f	Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation	2018-03-30 10:10:43 -07:00
Thijs Wenker	45730a6c7a	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-03-30 18:54:48 +02:00
Ken Cooke	a2be291363	Merge pull request #12715 from ctrlaltdavid/21677 ... Add Window.raise() as replacement for Window.raiseMainWindow()	2018-03-30 09:41:54 -07:00
John Conklin II	5013760aa1	Merge pull request #12742 from jherico/fix/rc66_crashes ... Fix/rc66 crashes	2018-03-29 18:04:52 -07:00
Alexander Ivash	814cfa4587	fix TabletAssetServer	2018-03-30 00:09:28 +03:00
John Conklin II	90dec1d3ef	Merge pull request #12733 from birarda/bug/scripts-copy-in-dev-rc66 ... RC66: fix cmake changes for script copy for dev builds	2018-03-29 13:57:45 -07:00
Alexander Ivash	e5da59a62f	FB12870 - Tablet UI ->Asset Browser unresponsive when enabling/disabling "use baked version"	2018-03-29 23:01:59 +03:00
Olivier Prat	5f8693aae2	Merge branch 'master' of http://github.com/highfidelity/hifi into fade	2018-03-29 15:52:38 -04:00
John Conklin II	c7f7e2487c	Merge pull request #12738 from sethalves/fix-json-drag-and-drop-rc66 ... fix -- make drag-and-drop of json mean import again	2018-03-29 12:46:09 -07:00
John Conklin II	d6b652bdf3	Merge pull request #12735 from druiz17/RC66 ... Fix name conflict with c++ class and qml file(RC66)	2018-03-29 12:06:15 -07:00
samcake	028959f240	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-03-29 12:00:10 -07:00
John Conklin II	379df87d0c	Merge pull request #12697 from misslivirose/feat/disable-add-without-url ... Disable Add Button in Model Modal until user has entered text in the model URL	2018-03-29 11:39:48 -07:00
Dante Ruiz	f7a081c9ec	minimize diff	2018-03-29 11:24:31 -07:00
Dante Ruiz	420672a769	fix-qml-confict	2018-03-29 11:24:08 -07:00
Alexia Mandeville	31ab398344	Moving user height and clarifying verbiage	2018-03-29 11:20:01 -07:00
Dante Ruiz	e738274e90	map flying down back to C key	2018-03-29 11:10:39 -07:00
Seth Alves	dcfebde54a	put back the pre serverless-domain behavior for when a json file is dragged-and-dropped into the interface window -- import the json rather than load as a serverless-domain	2018-03-29 10:50:43 -07:00
amantley	3f44b88d2d	added js documentation for the three trigger recenter functionsthat have been added to MyAvatar class	2018-03-29 10:09:51 -07:00
Thijs Wenker	f86eb9d776	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-03-29 19:06:24 +02:00
John Conklin II	97d9c1b735	Merge pull request #12726 from jherico/fix/rc66_crashes ... Attempt to resolve potential overlay crashes at shutdown	2018-03-29 09:37:23 -07:00
Dante Ruiz	0bdf26faaf	minimize diff	2018-03-29 09:29:01 -07:00
Dante Ruiz	8cdb59413d	fix-qml-confict	2018-03-29 09:26:05 -07:00
Olivier Prat	3c8cd48dfb	Merge branch 'master' of http://github.com/highfidelity/hifi into fade	2018-03-29 07:21:01 -04:00
Liv Erickson	387ff680d5	support deleted scenario	2018-03-28 18:12:30 -07:00
Liv Erickson	b78f00342e	Merge branch 'master' of github.com:highfidelity/hifi into feat/disable-add-without-url	2018-03-28 17:53:42 -07:00
Sam Gondelman	d2a74e5713	Merge pull request #12686 from gcalero/android_ui_not_move_camera ... Android - Prevent Camera movement with UI (especially Windows and Radar mode)	2018-03-28 17:14:42 -07:00
Stephen Birarda	35ee1bec09	fix cmake changes for script copy for dev builds	2018-03-28 14:56:53 -07:00
Stephen Birarda	0172c24cf2	fix cmake changes for script copy for dev builds	2018-03-28 14:47:09 -07:00
amantley	90d87c5b5d	changed get functions to const in MyAvatar.cpp changed bool variables to atomic for thread safety	2018-03-28 14:00:36 -07:00
John Conklin II	790162c88b	Merge pull request #12689 from ctrlaltdavid/21808 ... Reinstate Overlays.getOverlayObject API function	2018-03-28 14:00:28 -07:00
vladest	70ce1b2bf7	Fix invalid scrolling detection	2018-03-28 21:48:44 +02:00
Cristian Luis Duarte	f0bcaa47c8	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-28 16:47:21 -03:00
amantley	4b1f974561	fixed merge conflict for declaring _hmdLeanRecenterEnabled in MyAvatar.h	2018-03-28 11:57:48 -07:00
Zach Fox	0175028a88	Ensure location is correctly updated when replacing set from Checkout page	2018-03-28 11:31:51 -07:00
vladest	001b6d23ff	Merge branch 'master' into move_to_qqc2	2018-03-28 20:16:26 +02:00
amantley	95f1d0e4fa	added get and set functions for the activate recenter variables	2018-03-28 10:33:00 -07:00
Zach Fox	ca2fba675d	Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation	2018-03-28 10:28:32 -07:00
Thijs Wenker	3184aa51b1	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-03-28 19:15:13 +02:00
Brad Hefta-Gaub	16df773de4	Merge pull request #12721 from highfidelity/RC66 ... RC66 - Mergeback	2018-03-28 09:55:46 -07:00
John Conklin II	586fb4829c	Merge pull request #12637 from druiz17/fix-asset-server-qml ... Fix asset server qml sorting	2018-03-28 09:35:53 -07:00
Brad Davis	aacfe92751	Don't trigger crashes from timers while waiting for some operation on exit	2018-03-28 09:09:56 -07:00
Olivier Prat	7fa5e384b9	Merge branch 'master' of http://github.com/highfidelity/hifi into fade	2018-03-28 11:21:07 -04:00
David Rowe	c3df741c62	Settings API JSDoc	2018-03-28 17:14:06 +13:00
Seth Alves	46fb2033f2	Merge pull request #12574 from druiz17/remap-keybaord ... changing keyboard mapping	2018-03-27 19:00:05 -07:00
Seth Alves	bb101956a6	fix entity importing	2018-03-27 18:25:43 -07:00
amantley	9f3b82a417	added the functions triggerVerticalRecenter,triggerHorizontalRecenter,and triggerRotationRecenter to MyAvatar.h, these allow java script calls to recenter the avatar on the fly	2018-03-27 18:21:14 -07:00
Simon Walton	bed4033554	Local node IDs now working correctly ... Move typedef to single location; fixes for replicated packets (probably still not correct); reserve zero as local ID; pass domain server's local ID in domain server list; other tweaks.	2018-03-27 18:18:14 -07:00
David Rowe	1bcb9738f0	Miscellaneous fixes noticed in passing	2018-03-28 12:26:08 +13:00
David Rowe	f27e8868eb	Add HMD JSDoc	2018-03-28 12:25:12 +13:00
Dante Ruiz	ad9ca0da20	fix tablet version	2018-03-27 16:03:06 -07:00
John Conklin II	a258a330d3	Merge pull request #12676 from druiz17/fix-keyboard ... fixing AddressManager keyboard when switching domains	2018-03-27 15:34:23 -07:00
Thijs Wenker	ab6db72965	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-03-28 00:23:34 +02:00
Dante Ruiz	197662fd5e	fix contextOverlay highlighing all entities	2018-03-27 15:22:22 -07:00
Brad Davis	29106fbbbe	Prevent potential double delete of QML overlays	2018-03-27 14:18:19 -07:00
Brad Davis	eb20181b60	Shut down the overlay interface on exit	2018-03-27 14:18:01 -07:00
John Conklin II	0862f345fe	Merge pull request #12717 from sethalves/workaround-dialog-crash ... fix -- work around asset-upload dialog crash	2018-03-27 13:35:50 -07:00
John Conklin II	7c505a0b85	Merge pull request #12711 from sethalves/serverless-tutorial-rc66 ... Serverless tutorial rc66	2018-03-27 11:17:07 -07:00
Seth Alves	4f7d856a1c	don't free dialogs to avoid crash in setKeyboardRaised	2018-03-27 09:28:55 -07:00
vladest	096b56395e	Fix crash on startup	2018-03-27 18:22:56 +02:00
samcake	025730a329	Just merging with master and trying to see the ui working again...	2018-03-26 18:24:01 -07:00
David Rowe	d1d58eceab	Add Window.raise() as replacement for Window.raiseMainWindow()	2018-03-27 13:04:50 +13:00
Zach Fox	db2f3451bd	Support .content.zip content sets	2018-03-26 16:20:29 -07:00
Zach Fox	bf48ecda6d	Fix cert location for content sets	2018-03-26 14:48:05 -07:00
Alexander Ivash	06410ec342	temporarily select 'similar-by-title' device if previously selected one was unlplugged; re-select originally selected device if it was re-plugged	2018-03-27 00:44:17 +03:00
Ryan Huffman	d01a58517f	Fix serverless content not using correct directories	2018-03-26 14:32:52 -07:00
Stephen Birarda	787947b6a8	add a default tutorial json for dev interface	2018-03-26 14:32:26 -07:00
Stephen Birarda	b52a877d8d	optionally grab serverless tutorial, on for installers	2018-03-26 14:32:11 -07:00
Zach Fox	a588776b47	Fix infinite loading when authing wallet during Checkout	2018-03-26 13:19:40 -07:00
Dante Ruiz	1f23e7ab8b	fixing more edge cases	2018-03-26 10:15:15 -07:00
Dante Ruiz	b8796db1e5	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-26 09:13:58 -07:00
Cristian Luis Duarte	6cb5cd7f92	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-26 11:19:42 -03:00
Alexander Ivash	8e551f4dc0	re-select re-plugged device	2018-03-25 13:49:59 +03:00
Alexander Ivash	3c45f17d70	remove unused code	2018-03-25 13:44:16 +03:00
Alexander Ivash	f6bbdec902	remove 'isHMD' from input parameters of AudioDeviceList::onDevicesChanged ... note: having 'isHMD' as a parameter doesn't make sense because function rebuilds model which is used by both HMD and Desktop	2018-03-25 13:43:51 +03:00
vladest	56150f8962	Merge branch 'master' into move_to_qqc2	2018-03-24 15:34:49 +01:00
vladest	e0593b7799	Use Flickable instead of ScrollView	2018-03-24 15:32:46 +01:00
vladest	aefda9ef71	Merge branch 'master' into move_to_qqc2	2018-03-24 15:32:04 +01:00
Dante Ruiz	96707a2568	fix mappoing conflicts	2018-03-23 16:43:36 -07:00
Cristian Luis Duarte	686af4ff77	Clean code that manually checked for windows coordinates to disable radar touch	2018-03-23 20:02:51 -03:00
Cristian Luis Duarte	242b009562	Android - Use mouse events for interacting with UI. Now LoginDialog UI interation does not move radar camera. Remove repeated tooggle call in audio.js. Adapt button to simulated mouse events.	2018-03-23 18:59:55 -03:00
Gabriel Calero	8558759d41	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-03-23 16:56:53 -03:00
Dante Ruiz	28e61bcbb1	fix typo	2018-03-23 11:57:01 -07:00
Dante Ruiz	a14d5c6546	make alternate keys work	2018-03-23 11:55:16 -07:00
John Conklin II	563ff61325	Merge pull request #12661 from SamGondelman/android ... Android: Stats, disable IK, reduce impact of InputRecorder	2018-03-23 11:08:50 -07:00
Thijs Wenker	7309f9d82c	Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes	2018-03-23 17:51:43 +01:00
John Conklin II	c61ed697df	Merge pull request #12552 from vladest/assetbrowser_cosmetics ... Wrap text in query dialogs. Add right margins for input field and but…	2018-03-22 17:56:47 -07:00
Dante Ruiz	f36a916fb6	revert comment change	2018-03-22 17:44:17 -07:00
Dante Ruiz	4d52caccde	making some more requested changes	2018-03-22 17:39:22 -07:00
Dante Ruiz	1d17658c80	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-22 16:29:16 -07:00
Howard Stearns	113670e33b	Merge pull request #12638 from zfox23/commerce_upgrades_1 ... Commerce: Item Updates!	2018-03-22 15:40:22 -07:00
Liv Erickson	1244559618	remove spaces for clean-ness	2018-03-22 15:37:12 -07:00
Liv Erickson	0647155c30	re-add experimental image removal	2018-03-22 15:33:23 -07:00
Liv Erickson	f62e1ed54e	disable add button on model until text is entered	2018-03-22 15:29:41 -07:00
John Conklin II	6d9892856d	Merge pull request #12510 from sethalves/serverless-domains ... Serverless domains	2018-03-22 14:06:49 -07:00
Gabriel Calero	f444766551	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-03-22 15:15:50 -03:00
Sam Gondelman	bbded2215d	Merge pull request #12665 from gcalero/android_bottombar_resize ... Android - Resize bottombar after window size changes (to always fill …	2018-03-22 11:15:02 -07:00
John Conklin II	b6920a503c	Merge pull request #12618 from vladest/hificonstants_as_object ... Hificonstants as object	2018-03-22 11:03:05 -07:00
Seth Alves	6c1d713968	review	2018-03-21 19:21:57 -07:00
Seth Alves	ed0778a68a	remove unused json file	2018-03-21 17:07:31 -07:00
Seth Alves	916ed3a0d4	review	2018-03-21 16:18:31 -07:00
Seth Alves	196f621a60	remove unneeded setSessionUUID	2018-03-21 15:21:49 -07:00
Seth Alves	bea7ee42e2	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-21 14:30:07 -07:00
Seth Alves	ef52ae13ee	rearrange domain-url-changed signals	2018-03-21 14:30:00 -07:00
Gabriel Calero	35935ed41a	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-03-21 17:41:02 -03:00
Gabriel Calero	11bfc1ca74	Add Goto as splash screen in android	2018-03-21 17:40:14 -03:00
Dante Ruiz	9d8770b134	changing speed	2018-03-21 13:25:50 -07:00
John Conklin II	5bd3d0fab9	Merge pull request #12647 from birarda/feat/client-only-installer ... add a CLIENT_ONLY build option and handle for installer	2018-03-21 11:20:36 -07:00
Seth Alves	4033af9b11	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-21 11:11:43 -07:00
Dante Ruiz	cce77e3e68	made requested changes	2018-03-21 10:15:42 -07:00
Ken Cooke	f5f4e2a780	Merge pull request #12635 from ctrlaltdavid/21776 ... Fix Window hasFocus(), setFocus(), and raiseMainWindow()	2018-03-21 09:27:51 -07:00