19698 commits

Author	SHA1	Message	Date
Sam Gondelman	4e7818180b	Merge branch 'master' into tabletLayer2	2017-08-24 17:56:44 -07:00
Sam Gateau	c5fbd5a2a5	Merge pull request #11131 from jherico/threaded_render_entities ... Threaded rendering of Entities	2017-08-24 17:34:49 -07:00
beholder	cbbe03cee7	6788: You can deselect your current view mode	2017-08-25 02:33:11 +03:00
Chris Collins	43b1e67e4a	Merge pull request #11238 from misslivirose/set-home-with-sandbox-starter ... Create home bookmark for new content sets loaded in	2017-08-24 16:25:04 -07:00
SamGondelman	abaccf9edd	crash on shutdown	2017-08-24 16:00:36 -07:00
Zach Fox	3c7fadb1ce	Final touch	2017-08-24 14:30:42 -07:00
SamGondelman	4a49801217	web overlays and entities are always nonAA	2017-08-24 14:23:21 -07:00
Zach Fox	56950e4614	It's working!	2017-08-24 14:17:39 -07:00
Brad Davis	e817d3ced4	Threaded rendering & entity rendering refactor	2017-08-24 13:34:34 -07:00
humbletim	9348048387	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-08-24 16:23:47 -04:00
David Kelly	eb9436ba96	Merge pull request #11235 from davidkelly/dk/encryptFile ... Initial wallet app plus some encryption of security image	2017-08-24 13:17:14 -07:00
Zach Fox	baad5f195e	I'm locking something wrong	2017-08-24 12:53:48 -07:00
David Kelly	a299aa7e24	initialize ptr!	2017-08-24 11:37:44 -07:00
Zach Fox	d370eeea2f	Just gotta test	2017-08-24 11:07:58 -07:00
Zach Fox	e834e9d7a7	Progress	2017-08-24 10:46:18 -07:00
Zach Fox	92e8f84dc5	I understood last night at midnight	2017-08-24 09:43:35 -07:00
Sam Gateau	4a18c5c80e	Merge pull request #11214 from SamGondelman/image3DFix ... Fix Image3DOverlays with fractional alpha	2017-08-24 09:04:02 -07:00
David Kelly	d398adc195	warnings	2017-08-24 08:48:26 -07:00
Brad Hefta-Gaub	5c832eae9c	Merge pull request #11226 from SamGondelman/miceWithLasers ... EntityTreeRender uses RayPick API with precision picking	2017-08-24 08:10:21 -07:00
David Kelly	c77dafdf12	fix warnings, prepare a bit for hooking up the passphrase	2017-08-23 17:43:37 -07:00
Zach Fox	657beef70f	I understand again...getting started again	2017-08-23 17:42:02 -07:00
Liv	1050141b11	Create home path for new content sets loaded in	2017-08-23 17:38:24 -07:00
Zach Fox	52ef0f2037	More progress	2017-08-23 16:37:13 -07:00
Zach Fox	88c24c16d7	I finally understand - initial progress	2017-08-23 15:02:07 -07:00
David Kelly	138534c3ff	encrypt security image	2017-08-23 15:01:09 -07:00
SamGondelman	206862a90f	fix flag bits	2017-08-23 12:20:30 -07:00
Zach Fox	f01d9ddbe7	Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface	2017-08-23 11:22:28 -07:00
SamGondelman	d7b3686364	include noncollidable entities	2017-08-22 17:37:51 -07:00
Brad Davis	0a5bef22fc	Allow asynchronous editing of non-QML overlays	2017-08-22 17:12:18 -07:00
Zach Fox	69364f2ecd	Initial progress	2017-08-22 17:10:57 -07:00
David Kelly	8bb7ea900a	Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile	2017-08-22 16:23:23 -07:00
Zach Fox	edb64b047f	It compiles!	2017-08-22 16:00:44 -07:00
Zach Fox	ec2a27e68c	Progress	2017-08-22 15:02:06 -07:00
David Kelly	0bd3f1728d	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/encryptFile	2017-08-22 14:40:10 -07:00
Zach Fox	2a75d97006	First steps	2017-08-22 12:56:16 -07:00
SamGondelman	b8a7fce201	boop	2017-08-22 11:54:55 -07:00
Zach Fox	f1da7a6381	Checkpoint	2017-08-22 11:53:37 -07:00
vladest	e403f7266a	Merge branch 'master' into audio_devices_split	2017-08-22 20:46:03 +02:00
Anthony J. Thibault	d62a0ea8ff	Correct controller offsets with sensor scaling	2017-08-22 11:43:39 -07:00
SamGondelman	a904ae1a8a	can set precision picking on lasers/raypicks, EntityTreeRender uses ray pick API	2017-08-22 11:41:20 -07:00
Anthony J. Thibault	ffdb10681e	Fix for laser rendering and positioning with sensor scale	2017-08-22 11:07:04 -07:00
Anthony J. Thibault	de2262968e	Fix for CAMERA_RELATIVE controllers with sensor scale	2017-08-22 09:44:32 -07:00
SamGondelman	3a80c6cbe2	fix alpha issues, pipeline issue, clamping issue	2017-08-21 18:09:25 -07:00
Anthony J. Thibault	8e56404c40	Fixes for flying and rotation re-centering in wikiplanet	2017-08-21 17:42:25 -07:00
Anthony J. Thibault	963ddce7bc	Use eye-height to match user and avatar scales, follow fixes ... Fix postPhysicsUpdate to properly transform follow displacement into sensor frame.	2017-08-21 17:42:24 -07:00
Anthony J. Thibault	80b660b258	Added userHeight accessors and preference ... Also made Avatar::getHeight thread-safe	2017-08-21 17:42:23 -07:00
Anthony J. Thibault	d196743986	Added Avatar::getHeight() method	2017-08-21 17:42:22 -07:00
Anthony J. Thibault	a0d72f08ac	Fix for incorrectly scaled avatar collision on startup	2017-08-21 17:42:21 -07:00
Zach Fox	ed5445ec51	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp	2017-08-21 13:09:41 -07:00
SamGondelman	8ebaeddbc4	Merge remote-tracking branch 'upstream/master' into image3DFix	2017-08-21 11:05:44 -07:00
Ken Cooke	099723fe4d	Use RAII to avoid deletion of extended argv while in use	2017-08-20 13:49:26 -07:00
vladest	3783b8a57c	Merge branch 'master' into tablet_login_button	2017-08-19 17:27:46 +02:00
Zach Fox	512a08f67f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp	2017-08-18 17:05:56 -07:00
David Kelly	1904bd3f2b	encrypting image, rough first pass, lots left	2017-08-18 16:14:10 -07:00
Howard Stearns	188cbee781	Merge pull request #11212 from howard-stearns/asynchronous-commerce-2 ... Asynchronous Ledger Interactions with Server	2017-08-18 15:40:24 -07:00
Elisa Lupin-Jimenez	44f1f340e1	Merge pull request #11147 from elisa-lj11/blocks ... Adding Blocks Tablet App to Marketplace	2017-08-18 15:06:18 -07:00
Chris Collins	2456126bcc	Merge pull request #11157 from SamGondelman/tabletLayer ... Render non-AA overlays correctly	2017-08-18 14:59:20 -07:00
SamGondelman	f56e952253	properly update image3d render item	2017-08-18 14:21:46 -07:00
howard-stearns	29b717e22d	remove dead code	2017-08-18 14:08:04 -07:00
Sam Gondelman	cbf2bb3a61	Merge pull request #10980 from SamGondelman/sharks ... Reduce laser pointer lag	2017-08-18 13:14:38 -07:00
Elisa Lupin-Jimenez	65f876acf3	enabled version check	2017-08-18 10:49:40 -07:00
howard-stearns	6e34ab45d6	Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce-2	2017-08-18 10:03:33 -07:00
howard-stearns	3d401129fb	checkpoint	2017-08-18 10:03:00 -07:00
vladest	2e5e0c94f1	Added login button to Tablet	2017-08-18 15:34:15 +02:00
Elisa Lupin-Jimenez	4c28b9f09a	attempt to check version of interface	2017-08-17 18:16:41 -07:00
Zach Fox	ccf81f801d	All the pieces!	2017-08-17 17:06:48 -07:00
Zach Fox	9135e37078	Go go go go gog o	2017-08-17 15:20:17 -07:00
Zach Fox	eab16fc28c	Initial progress	2017-08-17 15:01:25 -07:00
Elisa Lupin-Jimenez	2b44608ece	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-17 10:18:40 -07:00
vladest	1a32a6fac3	Merge branch 'master' into audio_devices_split	2017-08-17 17:20:11 +02:00
Zach Fox	a4123e3024	Merge pull request #11201 from zfox23/sam_is_cool ... Allow users to take a snapshot from the Secondary Camera!	2017-08-16 17:03:15 -07:00
Zach Fox	ecd1f13197	Allow users to take a snapshot from the secondary camera	2017-08-16 15:34:06 -07:00
vladest	2cca584e58	Merge branch 'master' into audio_devices_split	2017-08-16 22:47:06 +02:00
vladest	15f8bc0141	Keep old function names for compatibility	2017-08-16 22:17:34 +02:00
vladest	4e5c650621	Modified some usecases for async dialogs	2017-08-16 21:41:18 +02:00
David Kelly	73e943daaf	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys	2017-08-16 10:13:08 -07:00
Zach Fox	c024bd2d83	Merge pull request #11195 from zfox23/commerce_securityImage1 ... Commerce: First pass at security images (NOT FINAL)	2017-08-16 09:57:55 -07:00
SamGondelman	86cc938a47	Merge remote-tracking branch 'upstream/master' into sharks	2017-08-16 09:54:12 -07:00
vladest	8326600274	Merge branch 'master' into modal_dialogs_async	2017-08-16 13:48:47 +02:00
SamGondelman	a641fb7a7f	rename qvector findRayIntersection to avoid script conflicts	2017-08-15 18:03:52 -07:00
Zach Fox	d376630bde	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_securityImage1	2017-08-15 15:03:02 -07:00
vladest	273261ee57	Reworked WindowScriptingInterface browse method for async methods	2017-08-15 23:12:35 +02:00
Liv	aea5f170f2	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup	2017-08-15 13:58:22 -07:00
Liv	49eab847fd	Refactor handleOctreeFileReplacement, style changes, align with handler for other file types	2017-08-15 13:58:02 -07:00
vladest	8afdb27c1b	Reworked WindowScriptingInterface save method for async methods	2017-08-15 22:55:44 +02:00
Liv	c0fa446b75	Remove domain management scripting interface	2017-08-15 13:49:13 -07:00
Zach Fox	b7282cc776	Lots of fixes	2017-08-15 13:46:20 -07:00
Anthony Thibault	342f8acff5	Merge pull request #11176 from hyperlogic/feature/improve-hand-body-collision ... Improve avatar hand vs body collision	2017-08-15 13:43:21 -07:00
SamGondelman	9bb7e66859	separate raypickscriptinginterface, cleanup	2017-08-15 13:36:41 -07:00
Zach Fox	528d2072f9	Bugfixes and improvements	2017-08-15 12:14:32 -07:00
Anthony J. Thibault	6e0ddadb29	Fix for array size.	2017-08-15 11:45:22 -07:00
David Kelly	0f7db74ef1	missed a couple warnings	2017-08-15 11:44:15 -07:00
Anthony J. Thibault	04006a9f76	code review feedback	2017-08-15 11:19:41 -07:00
Zach Fox	bddce9328b	V1	2017-08-15 11:08:03 -07:00
David Kelly	a6390edf46	ugh	2017-08-15 10:10:48 -07:00
Elisa Lupin-Jimenez	3d7995da34	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-15 10:01:24 -07:00
Sam Gateau	2a75cde48a	Merge pull request #11185 from samcake/blue ... Fixing the graphics setting for Ambient Occlusion	2017-08-15 09:26:45 -07:00
Sam Gateau	d624413c14	Merge pull request #11189 from SamGondelman/line3DFix ... Fix drawInFront overlays only rendering in left eye	2017-08-15 09:26:18 -07:00
David Kelly	c08fce967f	forgot a warning	2017-08-15 08:58:16 -07:00
vladest	51a5c30353	Reimplement asset browsing for async	2017-08-15 17:05:55 +02:00
vladest	e9ed05c3ba	Reimplement snapshot dir browser for async	2017-08-15 15:55:36 +02:00
vladest	9aace9e67d	Merge branch 'master' into modal_dialogs_async	2017-08-15 14:57:13 +02:00
vladest	757af1e2e5	Added Save, Directory and Assets async methods	2017-08-15 14:44:01 +02:00
David Kelly	ef5863d169	warnings squashed	2017-08-14 16:24:50 -07:00
SamGondelman	8163430282	fix depth buffer issue that was messing with drawInFront, plus some small fixes to line3ds	2017-08-14 15:03:14 -07:00
David Kelly	170d2b186b	url encode the base64 signature/key	2017-08-14 13:48:09 -07:00
Zach Fox	c1d771842d	Remove context overlay (if present) when removing entity	2017-08-14 13:37:50 -07:00
David Kelly	803a5c6690	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys	2017-08-14 13:15:04 -07:00
David Kelly	b4b592cc00	one key file with (for now) both public and private keys in there	2017-08-14 12:53:10 -07:00
Zach Fox	199ba3bff0	Use new JSON inventory format	2017-08-14 11:55:21 -07:00
samcake	db1536c521	Reactivate watch dog exit	2017-08-14 10:47:58 -07:00
samcake	05b78b0df0	Just fixing the ao combo box field	2017-08-14 10:46:33 -07:00
vladest	ac7aa609f2	Open file async implemented	2017-08-14 16:23:53 +02:00
vladest	63e907e7b6	Merge branch 'master' into modal_dialogs_async	2017-08-12 13:04:52 +02:00
samcake	ff98dedbb2	Debugging the graphics fields activation	2017-08-11 18:10:44 -07:00
Anthony J. Thibault	cd57c0706a	more warning fixes	2017-08-11 17:46:50 -07:00
David Kelly	f784bc42de	Initial cut using RSA keys for now	2017-08-11 16:54:04 -07:00
Anthony J. Thibault	9e1218b4a4	Use k-dop collision to prevent hands from entering body.	2017-08-11 14:50:00 -07:00
howard-stearns	8ee54c7b36	Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce	2017-08-11 11:46:20 -07:00
howard-stearns	551ea921cd	Make API asynchronous, for communicating with server	2017-08-11 11:45:40 -07:00
vladest	af39b5660b	Merge branch 'master' into audio_devices_split	2017-08-11 20:42:49 +02:00
vladest	560696e41c	Split logic and interface for HMD and desktop devices. Added CheckBox control based on QQC2	2017-08-11 20:39:17 +02:00
SamGondelman	f058781f49	just kidding shared_mutexes are c++17	2017-08-11 10:07:20 -07:00
Anthony J. Thibault	49adf04913	Added Developer > Avatar > Show Detailed Collision menu option	2017-08-10 16:36:09 -07:00
SamGondelman	e4c954e862	merge from master	2017-08-10 16:30:33 -07:00
SamGondelman	353a3e8c68	properly fix AA stenciling	2017-08-10 16:07:40 -07:00
SamGondelman	96b179386f	working on fixing non-AA overlays	2017-08-10 16:07:40 -07:00
Seth Alves	972a24fea9	Merge pull request #11169 from anshuman64/new-branch ... High Fidelity Interface Application Rename	2017-08-10 15:57:10 -07:00
Anthony J. Thibault	ae98974d79	improve 14-dop generation for avatar joint collision ... Also added debug rendering functionality.	2017-08-10 15:52:51 -07:00
SamGondelman	4c55849290	merge from master	2017-08-10 15:43:23 -07:00
SamGondelman	d0d5ac8dd1	switch to stl wherever possible, use bitset instead of unsigned ints	2017-08-10 15:33:55 -07:00
Brad Davis	eb143c42d0	Merge pull request #11168 from sethalves/avatar-url-command-line-flag ... cancel effects of --replaceAvatarURL when avatar is changed with preference dialog	2017-08-10 15:18:21 -07:00
Seth Alves	1d07bc3b4e	try, try again	2017-08-10 14:32:52 -07:00
Elisa Lupin-Jimenez	b0c91547b4	Fixed WebGL rendering	2017-08-10 14:14:09 -07:00
Seth Alves	ff83a8158b	cancel effects of --replaceAvatarURL when avatar is changed with preference dialog	2017-08-10 13:49:48 -07:00
Sam Gateau	79f3be1efe	Merge pull request #11021 from Zvork/fade2 ... Fade dissolve effect JUST AVATARS	2017-08-10 13:48:30 -07:00
Anshuman Dewangan	f79bf4e009	High Fidelity Interface rename	2017-08-10 13:40:00 -07:00
Zach Fox	334f71e4fb	Merge pull request #11166 from howard-stearns/commerce-blance-inventory ... balance and inventory stubs	2017-08-10 13:33:56 -07:00
howard-stearns	8f0fd10e2b	fix	2017-08-10 12:51:05 -07:00
howard-stearns	ca13d58b0b	blance and inventory stubs	2017-08-10 12:44:50 -07:00
Seth Alves	d812c293e8	Merge pull request #11120 from mukulHF/bug-lock-default-scripts ... Disable the ability for a user to edit default scripts if developer settings is not enabled - adjusting values	2017-08-10 12:29:23 -07:00
Elisa Lupin-Jimenez	af95d7f892	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-10 10:13:27 -07:00
vladest	b780d4bce3	Merge branch 'master' into modal_dialogs_async	2017-08-10 10:52:35 +02:00
vladest	68e9d335cd	Added async information and critical dialogs	2017-08-10 10:46:06 +02:00
Liv	6bde4db0d7	wrap in marketplace check and change landing point	2017-08-09 16:35:25 -07:00
Elisa Lupin-Jimenez	a2e407f786	fixed merge conflicts in marketplacesInject.js	2017-08-09 15:59:20 -07:00
Elisa Lupin-Jimenez	1ac9536f95	Downloading blocks from marketplace in own asset folder	2017-08-09 15:56:07 -07:00
Anthony J. Thibault	4d845bd208	Bug fix for HMD roll causing avatar yaw when standing still ... HMD roll should only cause the avatar to yaw when actively driving.	2017-08-09 15:52:27 -07:00
Sam Gondelman	85c3f94976	Merge branch 'master' into sharks	2017-08-09 13:36:18 -07:00
howard-stearns	f1ab91edd1	PR feedback	2017-08-09 12:41:16 -07:00
howard-stearns	7414bf0d9a	oops. didn't test what I thought I did	2017-08-09 12:09:03 -07:00
howard-stearns	1cf81495ab	basic commerce infrastructure	2017-08-09 11:50:52 -07:00
Elisa Lupin-Jimenez	17acf0520d	Download from blocks in marketplace working	2017-08-09 11:08:14 -07:00
Liv	0784686450	small typo fix	2017-08-09 10:17:31 -07:00
howard-stearns	9349e72eeb	Merge branch 'master' of https://github.com/highfidelity/hifi into buy	2017-08-09 10:00:36 -07:00
Liv	bd1619b1b2	update error message wording	2017-08-09 09:14:46 -07:00
vladest	616f15864a	Ported an some currently not used code	2017-08-09 14:49:15 +02:00
vladest	556569819d	1st stage of moving to async dialogs	2017-08-09 14:00:19 +02:00
Elisa Lupin-Jimenez	d599753771	Started blocks download catch, fixed a debug typo	2017-08-08 18:43:35 -07:00
SamGondelman	3645bf04b6	possibly fix most annoying crash	2017-08-08 18:10:53 -07:00
Zach Fox	03729bf165	Actually fix context menu	2017-08-08 16:38:12 -07:00
Zach Fox	871a5ff1ab	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_CheckoutQMLInvestigation	2017-08-08 15:53:22 -07:00
Zach Fox	69fc69cffb	Comment fix and overlay click fix	2017-08-08 15:52:59 -07:00
Zach Fox	7d26d2d88b	Switch and fix overlay clicks	2017-08-08 14:29:44 -07:00
Liv	ab8f5c1288	add user logging detail message	2017-08-08 13:55:07 -07:00
SamGondelman	684001a756	workaround deadlock in editRenderState	2017-08-08 11:11:19 -07:00
Liv	3f30162215	Make spawning point not 0,0,0 and change error message	2017-08-08 09:44:36 -07:00
SamGondelman	6d253fcc5f	cleaning up	2017-08-07 18:37:55 -07:00
SamGondelman	42147640e2	remove LaserPointerManager as a dependency	2017-08-07 14:18:56 -07:00
SamGondelman	489e08aef0	Merge branch 'master' of https://github.com/highfidelity/hifi into sharks	2017-08-07 13:29:00 -07:00
Seth Alves	af1e27dc36	Merge pull request #11053 from hyperlogic/feature/secondary-pose-support ... Improved support for Vive Trackers on biceps	2017-08-07 13:11:48 -07:00
howard-stearns	9bad26c2db	stub files	2017-08-07 12:51:30 -07:00
Zach Fox	07a4beac73	Fix the crash	2017-08-07 10:28:36 -07:00
Liv Erickson	da70071b5a	Merge branch 'master' into feat/domain-setup	2017-08-07 10:04:54 -07:00
Ken Cooke	1fc050fdef	Fix _devices access via shared_ptr	2017-08-07 08:11:43 -07:00
Seth Alves	c570d483d8	Merge pull request #11113 from elisa-lj11/zip_drag ... Zip drag (needs review)	2017-08-07 03:17:31 -07:00
Seth Alves	8798e47f99	Merge pull request #11117 from hyperlogic/bug-fix/misc-crash-fixes ... Crash fixes for avatars without Hips, and web overlays	2017-08-06 18:48:07 -07:00
Brad Davis	1ecca9fd29	Merge branch 'master' into zzmp-audio/peak-values	2017-08-06 17:21:00 -07:00
vladest	134bad9534	fixed typo leads to lost touch or mouse release events	2017-08-06 19:09:40 +02:00
SamGondelman	8b1c24e636	added setLockEndUUID, update handControllerGrab and grab	2017-08-04 18:26:11 -07:00
Elisa Lupin-Jimenez	a246c59277	changed debug print for unsupported entity files	2017-08-04 16:59:21 -07:00
Elisa Lupin-Jimenez	8c9ce82986	Fixed Mac and Ubuntu platform build issue (hopefully)	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	ebc28a6557	Renamed isBlocks to isZip, added debug print for non-entity files	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	06ff766952	Drag zip cleaned up, marketplaces stylized, back button fixed	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	692aa4c4b9	Clara download working again, still can drag in Blocks zip	2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez	c6d5b1a5e6	Removed extraneous print statements	2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez	c3d943ff72	Drag zip folder works	2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez	ed1ed4f3e0	Blocks drag does not work yet	2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez	ca6a323d54	Can drag blocks zip folder into hifi and upload the .obj	2017-08-04 16:57:48 -07:00
Anthony J. Thibault	98bbe887b9	Merge branch 'master' into feature/secondary-pose-support	2017-08-04 16:11:13 -07:00
Brad Davis	86e3489167	Updates from Threaded Rendering project	2017-08-04 15:22:14 -07:00
Brad Hefta-Gaub	57f62f59fb	Merge pull request #11110 from Armads/WL21423 ... Camera mode on startup is determined by user settings and HMD status	2017-08-04 13:16:34 -07:00
SamGondelman	bd942ec406	merge from master	2017-08-04 12:17:54 -07:00
Brad Hefta-Gaub	0d0a1af166	Merge pull request #11085 from jherico/script_console_crash ... Fix for potential crash in JS console	2017-08-04 11:44:20 -07:00
Anthony J. Thibault	9fdc044ae1	Crash fix for web3d overlays that are not the tablet.	2017-08-04 11:19:59 -07:00
Anthony J. Thibault	85500841fb	Crash fix for avatars that are missing "Hips", "Head" and other required joints.	2017-08-04 11:19:09 -07:00
Dante Ruiz	b72ac63662	Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts	2017-08-04 17:19:06 +01:00
Howard Stearns	71ce5a6494	Merge pull request #11016 from highfidelity/context-overlays ... Context Overlays	2017-08-03 16:28:14 -07:00
Armads	dff4e6e32c	WL21423 Changing order of camera setup steps	2017-08-03 15:40:38 -04:00
David Kelly	4b7779f0f5	add flag to outline render flags, fix pal.js/edit.js interaction	2017-08-03 07:57:21 -07:00
Armads	24718e2424	WL21423 Camera mode on startup is determined by user settings and HMD status	2017-08-03 09:03:23 -04:00
Dante Ruiz	90db4aa9c0	Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts	2017-08-02 18:18:17 +01:00
David Kelly	588afaaa85	unused variable...	2017-08-01 16:59:42 -07:00
Anthony Thibault	8a87ebd2a8	Merge pull request #11036 from AndrewMeadows/walkabout ... fix bugs preventing avatar from walking on spherical planet	2017-08-01 16:36:35 -07:00
David Kelly	762b409814	unused variable	2017-08-01 16:20:33 -07:00
David Kelly	479d6abc58	Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde	2017-08-01 16:18:20 -07:00
David Kelly	6ae516c46a	Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde	2017-08-01 15:45:34 -07:00
anshuman64	9bf4977e09	Merge pull request #11096 from humbletim/21487 ... WL 21487: Fix Camera behavior in Mirror mode	2017-08-01 14:59:06 -07:00
Dante Ruiz	51652482a4	Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts	2017-08-01 20:51:56 +01:00
anshuman64	97b4fd4032	Merge pull request #11071 from vladest/fix_menu_landscape ... Fix Landscape mode, when menu pushed in Create mode	2017-08-01 11:29:15 -07:00
humbletim	3a9b8c02a6	* disable Avatar "follow" / recentering behavior when using HMD + "View > Mirror" ... * restore access to "View > Mirror" from HMD mode	2017-08-01 13:41:28 -04:00
Brad Davis	bea91be521	Fix for potential crash in JS console	2017-07-31 17:50:30 -07:00
David Kelly	43c8079f03	temporary inspectionMode setting to turn ContextOverlays completely off/on	2017-07-31 13:55:43 -07:00
David Kelly	bd7c4b3b26	Merge remote-tracking branch 'upstream/master' into context-overlays	2017-07-31 13:14:53 -07:00
Anthony J. Thibault	2383933252	Merge branch 'master' into feature/secondary-pose-support	2017-07-31 10:55:40 -07:00
Olivier Prat	490aad2a06	Merged from master	2017-07-31 12:00:35 +02:00
humbletim	3bcbec87e0	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-07-30 16:15:34 -04:00
Brad Davis	7d18d2e017	Restore corrected touch event simulation	2017-07-29 08:51:51 -07:00
vladest	3c9ab36416	Remove already already implemented fix	2017-07-29 12:00:41 +02:00
vladest	0333849aa8	Merge branch 'master' into fix_menu_landscape	2017-07-29 11:44:58 +02:00
Brad Davis	5946a965da	Disable touch event emulation for tablet until we fix crash	2017-07-28 18:54:16 -07:00
Chris Collins	cfd9f8b64e	Merge pull request #11077 from jherico/overlay_event_crashes ... Fix overlay event handling thread issues	2017-07-28 15:56:09 -07:00
anshuman64	e11388f7f7	Merge pull request #11068 from ctrlaltdavid/dominant-hand-signal ... Add a "dominant hand changed" signal	2017-07-28 15:17:50 -07:00
Brad Davis	d42052a299	Fix overlay event handling thread issues	2017-07-28 14:56:21 -07:00
Stephen Birarda	17dd028ec7	make Paths available to desktop and tablet QML context	2017-07-28 14:23:18 -07:00
Andrew Meadows	d4e72df928	Merge pull request #10711 from burtsloane/midi ... Midi support for Entities	2017-07-28 10:51:43 -07:00
Andrew Meadows	3ec9640ea1	fix calculation of walk motor for HMD	2017-07-28 09:22:47 -07:00
vladest	45934cb53e	Fix Landscape mode, when menu pushed in Create mode. Fix pages gets white in Create mode	2017-07-28 18:04:29 +02:00
Brad Davis	bb57504498	Prevent deadlocks from Overlays update logic recursing into other Overlays calls	2017-07-27 19:39:22 -07:00
David Rowe	c1d179eba1	Add "dominant hand changed" signal	2017-07-28 14:20:49 +12:00
Brad Hefta-Gaub	d572510770	Merge pull request #11009 from AndrewMeadows/fix-QueryAACube ... update EntityItem bounding cube when on changed dimensions	2017-07-27 18:21:06 -07:00
Brad Hefta-Gaub	9b3be6d164	Merge pull request #10808 from humbletim/21400 ... WL 21400 -- Setting that lets you switch from cursor to reticle	2017-07-27 13:16:58 -07:00
SamGondelman	e3288a9004	fix flicker, scissor warning, and handControllerGrab sphere size	2017-07-27 11:17:30 -07:00
Anthony J. Thibault	bcb4cc32d2	another clang error fix	2017-07-27 10:26:10 -07:00
Anthony J. Thibault	778c8bf9a7	clang build error fix	2017-07-27 10:08:35 -07:00
Anthony J. Thibault	8f5c41af2d	changed _controllerPoseMap from unordered_map to map	2017-07-27 09:44:37 -07:00
Anthony J. Thibault	78c6564174	Merge branch 'master' into feature/secondary-pose-support	2017-07-27 09:09:32 -07:00
Sam Gondelman	fcaa39b245	Merge branch 'master' into sharks	2017-07-26 18:18:09 -07:00
SamGondelman	5e4a83dad9	defaultRenderStates, handControllerGrab.js, fix teleport.js a little	2017-07-26 17:58:39 -07:00
Zach Fox	8a7561d61b	IT'S WORKING SOB SOB SOB	2017-07-26 16:35:55 -07:00
Zach Fox	39cb0bc357	WHYYYY DOESN'T THIS WORK	2017-07-26 16:14:35 -07:00
Seth Alves	9c9cfad4c4	use ctrl rather than alt to activate camera-mode shortcuts	2017-07-26 15:56:08 -07:00
Seth Alves	71023bcb1b	Merge branch 'master' of github.com:highfidelity/hifi into bug-camera-mode-mods	2017-07-26 15:54:57 -07:00
Zach Fox	3a05219c59	Closer still	2017-07-26 14:10:41 -07:00
burtsloane	d4ae298a8d	Merge branch 'master' into midi	2017-07-26 13:59:07 -07:00
Burt Sloane	4f7243e444	Merge branch 'master' of https://github.com/burtsloane/hifi into midi	2017-07-26 13:30:57 -07:00
Zach Fox	65c28ca821	Bugfixes	2017-07-26 13:17:51 -07:00
Zach Fox	62f6c10b2b	Renaming things; bugfixes; improvements	2017-07-26 12:45:10 -07:00
Zach Fox	24ddbb4b22	Silly bug preventing the whole thing from working	2017-07-26 12:08:55 -07:00
Zach Fox	9147bc21d0	Getting there.	2017-07-26 11:41:27 -07:00
Liv	be860d6c87	small string fix	2017-07-26 10:20:29 -07:00
Liv	63d637c4db	Add line to move user back to origin to be near new content	2017-07-26 10:02:21 -07:00
Liv	57b27a7bb7	change packet type to be sourced, change from packet list to single packet	2017-07-25 20:17:20 -07:00
Zach Fox	9020607ccf	First pass	2017-07-25 17:54:46 -07:00
Zach Fox	7702bfceaa	Big cleanup and preparation; Actually fix desktop tablet	2017-07-25 16:12:32 -07:00
SamGondelman	3a8ad8b631	switch to QUuids	2017-07-25 15:11:44 -07:00
SamGondelman	658acd91f2	experimenting with drawHUDLayer depth testing	2017-07-25 14:17:39 -07:00
SamGondelman	0117950546	can edit drawHUDLayer property	2017-07-25 12:57:52 -07:00
Liv	9458e4a1eb	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup	2017-07-25 11:32:13 -07:00
Liv	2377e4a5db	fix message formatting	2017-07-25 11:32:02 -07:00
Liv	89a1c7a697	code cleanup	2017-07-25 11:24:57 -07:00
Zach Fox	c71dca5b4b	Missed a magic number	2017-07-25 11:15:44 -07:00
Zach Fox	256b7efdd2	Handle the case when the camera is inside the bounding box of an entity	2017-07-25 11:06:54 -07:00
SamGondelman	3149c3e16c	warnings	2017-07-25 10:16:50 -07:00
Zach Fox	40038ce54b	Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays	2017-07-25 09:33:07 -07:00
Andrew Meadows	9d1fba3a3b	Merge pull request #10821 from ctrlaltdavid/21418 ... Don't execute body of controllers' plugin update methods if not enabled	2017-07-25 08:51:17 -07:00
Ryan Huffman	9421e6ebb6	Merge pull request #11029 from cain-kilgore/dominant-hands ... WL 21453 - Add a "Dominant Hand" setting	2017-07-25 08:01:31 -07:00
SamGondelman	3c8b964cc9	replace setHandLasers with drawHUDLayer overlay property	2017-07-24 18:16:40 -07:00
Liv	32ddffd9c8	Move logic for confirmation into Application.cpp for handling files directly	2017-07-24 18:09:32 -07:00
Cain Kilgore	280a7a7e42	Fixing Styling, added Preference to Tablet, Moved Location to Avatar Tuning	2017-07-25 01:48:55 +01:00
Seth Alves	766c6f48c3	third person camera is alt+G rather than alt+O	2017-07-24 17:43:01 -07:00
Anthony J. Thibault	33a1d6e225	Merge branch 'master' into feature/secondary-pose-support	2017-07-24 17:27:33 -07:00
Anthony J. Thibault	9f6641ed10	Shoulder puck calibration work in progress ... * AnimInverseKinematics: debug draw for secondary targets * AnimInverseKienmatics: better clean up of ik target debug draw * GeometryUtil: added findPlaneFromPoints() * ViveControllerManager: external dependency on eigen * ViveControllerManager: record history of left/right hand controllers * ViveControllerManager: use history to determine user shoulder location for better calibration * ViveControllerManager: pass defaultToReferenceMat by const ref to calibrate functions. * CMake: added external depenency to eigen linear algebra library.	2017-07-24 17:22:48 -07:00
Zach Fox	c22798a8e6	Offset tablet position to left of screen per feedback	2017-07-24 17:16:07 -07:00
Seth Alves	97756e6140	accidently deleted a break	2017-07-24 16:12:03 -07:00
Seth Alves	82a787a753	use alt+h for mirror-mode	2017-07-24 16:04:11 -07:00
Andrew Meadows	8c55476c65	fix motor direction when walking upside down ... also maintain worldUp and remove unnecessary cruft	2017-07-24 16:00:13 -07:00
Andrew Meadows	f598b1f1f5	fix spelling typo in comment	2017-07-24 16:00:13 -07:00
Andrew Meadows	29be9aee65	move nextAttitude() from AvatarData to MyAvatar	2017-07-24 16:00:13 -07:00
Andrew Meadows	f0871c6878	avoid unnecessary and expensive gets	2017-07-24 16:00:13 -07:00
Seth Alves	e53badf88b	use alt+f for 1st person camera and alt+o for 3rd	2017-07-24 15:56:37 -07:00
Seth Alves	afc7eaff8d	Merge branch 'bug-camera-mode-mods' of github.com:druiz17/hifi into bug-camera-mode-mods	2017-07-24 15:21:37 -07:00
Zach Fox	223ed5b59a	Hack to mod tablet orientation when clicking context overlay	2017-07-24 14:29:06 -07:00
Andrew Meadows	a44b33ab11	Merge pull request #11023 from jherico/audio_deadlock ... Fix for audio deadlock & audio device selection	2017-07-24 14:03:29 -07:00
SamGondelman	ee02a0bff4	fix build error	2017-07-24 12:44:54 -07:00
Cain Kilgore	9ff7891c88	Fixed reference error, Gustavo should build now.	2017-07-24 19:56:02 +01:00
Cain Kilgore	64ba159adf	Updating Small Reference	2017-07-24 19:12:14 +01:00
Cain Kilgore	fd2264f7c9	removed duplicate	2017-07-24 19:05:49 +01:00
Cain Kilgore	e6fd85f45a	Some code cleanup	2017-07-24 19:02:40 +01:00
Cain Kilgore	42742ba1f9	Changed the Return to a String "left/right" instead.	2017-07-24 18:31:16 +01:00
Brad Hefta-Gaub	0ba8d43522	Merge pull request #10994 from vladest/avatar_default_speeds ... Change default mouse speeds for avatar	2017-07-24 10:13:27 -07:00
Chris Collins	ceb218f4cc	Merge pull request #10798 from humbletim/add-persistent-console-history ... Save JS "Console..." history across sessions	2017-07-24 09:24:04 -07:00
Cain Kilgore	a4cf27402d	Tabs and Cleanup of Code	2017-07-24 06:27:14 +01:00
Cain Kilgore	630922dd95	Dominant Hands Branch Initial Commit ... Adds a new option in the Avatar Basics section of the Avatar Settings. API Accessible Functions: MyAvatar.getUseAlternativeHand() MyAvatar.setUseAlternativeHand() Defaults to false (Right Hand). Will return True if set to Left Hand.	2017-07-24 06:18:24 +01:00
humbletim	300b926464	only call QList::constFirst when history list isn't empty	2017-07-23 14:12:52 -04:00
Liv	76cc833747	move domain management into a separate API	2017-07-21 17:44:53 -07:00
Dante Ruiz	06b4c53d28	only desktop mode	2017-07-22 00:15:26 +01:00
Dante Ruiz	7bf3f45e39	finished the locked default scripts	2017-07-21 23:32:25 +01:00
David Kelly	e7c6ba9ae2	unused var	2017-07-21 14:44:45 -07:00
Zach Fox	811be15bbc	Another attmept to fix the tablet	2017-07-21 14:02:19 -07:00
David Kelly	8de09affad	Merge pull request #11025 from davidkelly/dk/contextOverlayPositioning ... reposition context overlay when far away	2017-07-21 13:35:57 -07:00
Zach Fox	796292dd4c	Fix the tablet	2017-07-21 13:21:13 -07:00
David Kelly	9e31024a0e	merged with new stuff too	2017-07-21 13:16:41 -07:00
Zach Fox	a346e5ccf6	New inspect icon	2017-07-21 11:56:06 -07:00
Zach Fox	a800f6c05a	No magic numbers; Move (i) based on laser hand; Tablet to Tab key	2017-07-21 11:48:19 -07:00
Brad Davis	5b5e94700e	Additional audio fixes	2017-07-21 09:52:44 -07:00
Brad Davis	d1c2218a31	Temporary patch for deadlock	2017-07-21 09:52:36 -07:00
Zach Fox	7d125f44e4	Set parentID even when overlay already exists	2017-07-21 09:35:49 -07:00
vladest	33a8ab2d58	Adjusted according discussion in PR	2017-07-21 18:18:23 +02:00
Dante Ruiz	e2359f6bb9	changes api call	2017-07-21 17:15:31 +01:00
vladest	b13cbd5bde	Merge branch 'master' into avatar_default_speeds	2017-07-21 17:45:11 +02:00
Olivier Prat	7bc7b1eabc	Merge branch 'master' of git://github.com/highfidelity/hifi into fade2	2017-07-21 09:27:30 +02:00
anshuman64	5f3b68d544	Use ctrl+H instead of alt+H	2017-07-20 17:36:02 -07:00
Dante Ruiz	649b974927	mods for changes camera views	2017-07-21 01:01:23 +01:00
Zach Fox	e68f9499fa	Add hover/unhover handlers to context overlays	2017-07-20 16:51:00 -07:00
Andrew Meadows	a8dac0cb79	don't send constant updates for grabbed objects	2017-07-20 15:45:50 -07:00
Zach Fox	3698fe9b6b	Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays	2017-07-20 15:10:06 -07:00
David Kelly	c8015e4eb6	cleanup, fixed build issue	2017-07-20 14:52:58 -07:00
David Kelly	c1de09c7f6	whitespace issue	2017-07-20 14:24:16 -07:00
David Kelly	10503c3a16	registration point	2017-07-20 14:18:07 -07:00
SamGondelman	c7f0f03fce	expanded RayPick JS API	2017-07-20 13:53:39 -07:00
Dante Ruiz	3c862c34b2	disable reload default scripts by default	2017-07-20 21:15:00 +01:00
Zach Fox	e18fec140a	Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into contextOverlays_improvements2	2017-07-20 13:03:34 -07:00
Zach Fox	a1a7ab945a	Make dimensions better	2017-07-20 12:58:15 -07:00
SamGondelman	d156680bc8	ignore/include by ID, simplified caching logic	2017-07-20 12:15:06 -07:00
Zach Fox	f515a24568	UX improvements	2017-07-20 12:00:13 -07:00
David Kelly	b7be727b4c	turn off ContextOverlay for pal, edit. Improve clicks too	2017-07-20 11:30:55 -07:00
David Kelly	0544c1e561	build issue	2017-07-20 08:18:37 -07:00
David Kelly	110efd63c8	enabled property so we can turn it off during edit, etc...	2017-07-20 08:08:49 -07:00
David Kelly	b236a21adc	no clicks on 'highlight' overlay	2017-07-20 07:28:45 -07:00
SamGondelman	bf243d6025	lockEnd, editRenderState, and updated grab.js	2017-07-19 17:45:21 -07:00
David Kelly	0023832938	simple fixes	2017-07-19 17:38:19 -07:00
David Kelly	ebce1ce9de	Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into dk/placeholderHighlighting	2017-07-19 17:13:11 -07:00
Zach Fox	2dce254928	Actually increase target size	2017-07-19 17:11:45 -07:00
David Rowe	091b666d7e	Fix noise reduction checkbox not always working	2017-07-20 12:06:19 +12:00
David Kelly	40ec770bc1	Highlight using simple yellow bounding box	2017-07-19 17:06:17 -07:00
David Kelly	920ac17caf	minor renaming	2017-07-19 15:46:28 -07:00
David Kelly	5f82a76cc9	Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into dk/marketplaceItemsOnly	2017-07-19 15:41:36 -07:00
David Kelly	ecd419e0d3	cr feedback	2017-07-19 15:32:03 -07:00
Zach Fox	4374d4d1e5	Small improvements to overlay	2017-07-19 15:27:48 -07:00
David Kelly	44c9f0e65e	Overlay appears only on marketplace items	2017-07-19 15:13:26 -07:00
David Kelly	f0091f16a1	cr feedback	2017-07-19 14:46:10 -07:00
David Kelly	a8ab115b12	Open marketplace when we know the marketplaceID of an entity	2017-07-19 14:11:14 -07:00
SamGondelman	912b417dd4	mouse ray pick	2017-07-19 13:56:18 -07:00
Zach Fox	c866bd814d	Make clicks work right	2017-07-19 12:24:20 -07:00
SamGondelman	c6b3f69db0	teleport third eye laser on invalid hand pose	2017-07-19 11:51:31 -07:00
Zach Fox	f06ec715f2	Quick bugfix	2017-07-19 09:59:44 -07:00
Zach Fox	1d26a268c1	Merge branch 'master' of https://github.com/highfidelity/hifi into HoverOverlay_CubeOverlay	2017-07-19 09:53:51 -07:00
Zach Fox	761d35d633	Getting there!	2017-07-18 17:10:23 -07:00
Zach Fox	8f6af3a1ab	ContextOverlay	2017-07-18 16:28:24 -07:00
Zach Fox	265f978a06	It's working!	2017-07-18 15:57:26 -07:00
vladest	4b94d24c29	Change default mouse speeds for avatar	2017-07-18 23:51:19 +02:00
Zach Fox	084f4d2ab0	Why were Web3DOverlays done this way?	2017-07-18 14:42:59 -07:00
humbletim	f9e0e616f7	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-07-18 17:34:39 -04:00
humbletim	190e1ac7d9	move/scope viewOrientation into the related code block	2017-07-18 17:22:16 -04:00
Zach Fox	2b1a0921da	Initial work on clickable overlays	2017-07-18 14:01:16 -07:00
Brad Davis	1aee8f1f4d	Ensure we continue calling idle when minimized	2017-07-18 13:44:58 -07:00
SamGondelman	55a025b827	initial code review	2017-07-18 12:43:34 -07:00
Chris Collins	e99683fdcf	Merge pull request #10985 from jherico/audio_deadlock ... Trying to resolve QML / Audio deadlocks	2017-07-18 12:40:03 -07:00
SamGondelman	298faa9f0f	threading pass	2017-07-18 12:13:16 -07:00
Dante Ruiz	976fec66f8	fixed loading script whitespace	2017-07-18 17:59:42 +01:00
Brad Hefta-Gaub	2dfaf7b02a	Merge pull request #10862 from NeetBhagat/5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big ... Case 5783: Restarting Interface allows you to have Avatar Scale Too Big	2017-07-18 08:51:13 -07:00
Brad Hefta-Gaub	d94365cc44	Merge pull request #10979 from zfox23/hoverOverlay_lasers ... Create/Destroy Hover Overlays using hand controller lasers	2017-07-18 08:44:48 -07:00
Olivier Prat	d055b1aa8e	Merge branch 'fade' into fadeshape	2017-07-18 14:48:28 +02:00
Olivier Prat	9130c51319	Fixed incorrect removal of ALL avatar fade events. Fade out should now work again when avatar leaves domain	2017-07-18 14:46:49 +02:00
Olivier Prat	2bba6aa816	Revert "Removed all bubble fade event code on avatar side" ... This reverts commit 4b8545e8b5.	2017-07-18 14:07:07 +02:00
Olivier Prat	236270d798	Merge branch 'master' of git://github.com/highfidelity/hifi into fadeshape	2017-07-18 10:47:21 +02:00
Olivier Prat	4b8545e8b5	Removed all bubble fade event code on avatar side	2017-07-18 10:04:08 +02:00
NeetBhagat	ff51fa7199	Resolved review comments.	2017-07-18 10:42:01 +05:30
Brad Davis	d43432bd71	Cleanup dead code, fix startup behavior	2017-07-17 18:54:52 -07:00
Zach Fox	67c8ddfd57	Merge in changes from laser PR	2017-07-17 17:09:40 -07:00
Zach Fox	96f52a9812	First pass at getting overlays to show up on hover	2017-07-17 17:05:16 -07:00
Brad Davis	aab56cf2a9	Trying to resolve QML / Audio deadlocks	2017-07-17 16:21:28 -07:00
SamGondelman	0c8c6ff5d6	silly me	2017-07-17 15:05:31 -07:00
SamGondelman	7084a0607a	fix warnings	2017-07-17 14:26:22 -07:00
utkarshgautamnyu	758ae9825d	Merge pull request #10939 from highfidelity/bug/6118 ... Record total number of ATP/HTTP/File bytes downloaded during session	2017-07-17 13:53:21 -07:00
Zach Fox	974dff36b0	Make hover overlays work for hand controller lasers	2017-07-17 13:16:53 -07:00
Zach Fox	aadf407842	Merge pull request #10978 from zfox23/hoverOverlayInterface ... New HoverOverlayInterface skeleton	2017-07-17 13:16:32 -07:00
SamGondelman	ae99be0350	added faceAvatar and centerEndY, working on updating teleport.js, style fixes	2017-07-17 13:07:42 -07:00
humbletim	9c610f52ec	switch history file format to JSON	2017-07-17 15:34:41 -04:00
Olivier Prat	0123e2936b	Merge branch 'master' of git://github.com/highfidelity/hifi into fade	2017-07-17 11:44:10 +02:00
SamGondelman	af12b5a4bf	can create static laser pointers, fixed a bug with multiple render states	2017-07-14 18:35:27 -07:00
Zach Fox	e602d3610e	Initial commit for HoverOverlayInterface	2017-07-14 17:26:53 -07:00
SamGondelman	8f533636f5	c++ side laserpointer rendering with renderstates	2017-07-14 11:13:40 -07:00
Zach Fox	a9197509d8	Merge pull request #10965 from CainFoool/avatar-scaler ... WL 21422 - Add a scale slider for avatar size	2017-07-14 10:30:33 -07:00
Andrew Meadows	9584035aa4	Merge pull request #10886 from 1P-Cusack/21420 ... [Worklist #21420] Implement Create button disabled state (details below).	2017-07-14 10:06:45 -07:00
Seth Alves	741feb7e54	Merge pull request #10951 from druiz17/tablet-modal-fixes ... Allow the tablet to be closed when a modal dialog is open.	2017-07-14 09:40:58 -07:00
SamGondelman	6f970fd7a0	Merge remote-tracking branch 'upstream/master' into sharks	2017-07-14 09:37:11 -07:00
Cain Kilgore	b7ed3ce659	Prettified the Comment	2017-07-14 17:33:17 +01:00
Cain Kilgore	ee1f371902	Fixed step counted not resetting to 1 properly	2017-07-14 16:29:19 +01:00
Olivier Prat	82da9fb537	Merge branch 'master' of git://github.com/highfidelity/hifi into fade	2017-07-14 17:28:35 +02:00
Anthony J. Thibault	c85e187c61	first stab at secondary target pose support	2017-07-13 18:12:33 -07:00
SamGondelman	3c719b26b1	working on renderstates	2017-07-13 17:43:44 -07:00
Cain Kilgore	4f8d958831	Some code cleaning, added comment for reasoning of specifying min and max in the qml	2017-07-14 00:56:42 +01:00
SamGondelman	3a35cd128f	fix dirOffset, expose intersection type to JS	2017-07-13 16:09:21 -07:00
Cain Kilgore	72c3e789e9	More Spaces!	2017-07-13 23:42:20 +01:00
Anthony J. Thibault	fe711ccbe9	Refactored how controller poses are stored in MyAvatar.	2017-07-13 15:01:14 -07:00
SamGondelman	783750a0bc	update jointraypicks from joints, dirOffset needs work	2017-07-13 14:47:24 -07:00
Olivier Prat	b125fba2e1	Removed untested avatar bubble fade code. Made changes as requested by Andrew	2017-07-13 23:04:55 +02:00
Howard Stearns	17fcfad957	Merge pull request #10875 from highfidelity/spectator-camera ... Spectator Camera	2017-07-13 13:57:18 -07:00
Olivier Prat	b68ec4f933	Merge branch 'master' of git://github.com/highfidelity/hifi into fade	2017-07-13 22:36:52 +02:00
Cain Kilgore	f91a8c0f53	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler	2017-07-13 21:25:39 +01:00
Cain Kilgore	677b177dce	Build error fix	2017-07-13 20:29:52 +01:00
Cain Kilgore	5329c1ce42	Fixed Indentation, removed old debug code	2017-07-13 19:23:28 +01:00
Cain Kilgore	521babb6bd	Avatar Scaler - should be PR Ready.	2017-07-13 19:18:51 +01:00
Dante Ruiz	03fbd2a1e6	fixed another warning	2017-07-13 19:12:34 +01:00
Seth Alves	59d88cb564	Merge pull request #10941 from sethalves/audio-injector-smart-pointers ... Audio injector smart pointers	2017-07-13 11:00:02 -07:00
Dante Ruiz	b46dc7d389	removed space	2017-07-13 18:42:26 +01:00
Dante Ruiz	3cbfd4c917	Merge branch 'master' of github.com:highfidelity/hifi into tablet-modal-fixes	2017-07-13 18:40:54 +01:00
Dante Ruiz	070db2922d	fixed warning compile error	2017-07-13 18:40:38 +01:00
Brad Hefta-Gaub	b063c2f45d	Merge pull request #10942 from AndrewMeadows/cleanup-entity-transmission ... Cleanup OctreeSendThread::packetDistributor()	2017-07-13 09:58:28 -07:00
NeetBhagat	11f8f5cffc	Solve : implicit conversion from ‘float’ to ‘double’ issue	2017-07-13 18:26:52 +05:30
Olivier Prat	edcfecd5d4	Merge branch 'master' of git://github.com/highfidelity/hifi into fade	2017-07-13 11:05:14 +02:00
Olivier Prat	2d2722bfc5	Added async transition query on scene	2017-07-13 11:05:04 +02:00
SamGondelman	916a99c670	added JS/C++ RayPickResult, working on RayPickManager::update	2017-07-12 17:12:25 -07:00
David Kelly	4b3cf5ee2e	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreviewFix	2017-07-12 16:50:51 -07:00
David Kelly	88a449c1af	Fixes hmd preview when resizing	2017-07-12 16:49:26 -07:00
SamGondelman	ea65a04f28	expose RayPickMask to JS, move everything to interface/src/raypick to prevent dependency issues, start working on RayPickManager::update (needs testing)	2017-07-12 14:20:39 -07:00
SamGondelman	3ac369d782	framework for LaserPointers and abstracted RayPicking on C++ side, including JS API	2017-07-12 14:20:39 -07:00
Zach Fox	8553277c56	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-12 14:18:50 -07:00
Cain Kilgore	43782a29c7	Avatar Scaler - WIP	2017-07-12 22:04:58 +01:00
Seth Alves	59ad3d50ec	Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers	2017-07-12 12:45:58 -07:00
Seth Alves	ddf2312dc6	code review	2017-07-12 12:45:52 -07:00
Ken Cooke	50deee1d38	Replace tabs with spaces	2017-07-12 12:29:25 -07:00
Zach Fox	bd4fe416b4	Cleanup; no magic numbers for default cam params	2017-07-12 12:08:36 -07:00
Zach Fox	9fe6fbd811	View frustums are strange.	2017-07-12 11:37:18 -07:00
utkarshgautamnyu	6b969bc39d	added code to record total number of ATP/HTTP/File bytes downloaded during session ... Update FileResourceRequest.cpp Update AssetResourceRequest.cpp Update FileResourceRequest.cpp Update HTTPResourceRequest.cpp Update AssetResourceRequest.cpp Update AssetResourceRequest.cpp Update FileResourceRequest.cpp Update AssetResourceRequest.cpp Update AssetResourceRequest.cpp Update FileResourceRequest.cpp Update FileResourceRequest.cpp Update HTTPResourceRequest.cpp Update FileResourceRequest.cpp Update FileResourceRequest.cpp Update Application.cpp Update Application.cpp	2017-07-12 11:13:13 -07:00
Andrew Meadows	364600c447	fix rendering of simulation ownership debug icons	2017-07-12 11:12:47 -07:00
Zach Fox	79cf242fc9	Make far clip plane distance equal to main camera's	2017-07-12 10:51:14 -07:00
Stephen Birarda	f6d9a79fb5	Revert "Revert "fix for invisible avatars after radius ignore""	2017-07-12 10:36:53 -07:00
Olivier Prat	0f60cca617	Merged cleaned up fader branch from Sam	2017-07-12 18:09:17 +02:00
Dante Ruiz	12206cf711	Merge branch 'master' of github.com:highfidelity/hifi into tablet-modal-fixes	2017-07-12 16:56:25 +01:00
Sam Gateau	5394ac8672	Cleaning up changes, removing comments and dead code etc...	2017-07-12 17:33:05 +02:00
Olivier Prat	2f9885870b	First merge with Sam's fader branch with custom pipeline support in shape plumber	2017-07-12 17:29:21 +02:00
Sam Gateau	258f1654f2	Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes	2017-07-12 14:14:27 +02:00
Tingjin	80916b62bb	Remove unnecessary code ... Remove two lines of unnecessary code.	2017-07-11 20:52:28 -07:00
Seth Alves	c52e7e180a	use const AudioInjectorPointer& in some places	2017-07-11 19:42:03 -07:00
Seth Alves	dbd46fc4b8	Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers	2017-07-11 17:48:29 -07:00
Dante Ruiz	bedd0628b9	allowed tablet to toggle when a dialog is open	2017-07-12 00:51:07 +01:00
Zach Fox	d786820670	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-11 16:16:37 -07:00
Andrew Meadows	782155e9ea	Merge pull request #10876 from Atlante45/fix/ac-crash ... Fix AC crash (buffer overflow)	2017-07-11 14:26:08 -07:00
Seth Alves	ead461dca7	Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers	2017-07-11 14:25:12 -07:00
Seth Alves	3670a04d8e	switch bare pointers to AudioInjector objects to be QSharedPointers	2017-07-11 14:24:58 -07:00
Dante Ruiz	2f192fd48a	added scroll fix for qt 5.6	2017-07-11 21:19:06 +01:00
Dante Ruiz	01ca192613	fixed tablet scrolling	2017-07-11 21:16:13 +01:00
Olivier Prat	7552cca316	First alpha version of bubble collision fade events. Missing a lot of information.	2017-07-11 19:26:15 +02:00
NeetBhagat	e08e9d6821	The current scale of avatar should not be more than domain's max_avatar_scale and not less than domain's min_avatar_scale.	2017-07-11 20:42:00 +05:30
Olivier Prat	381e0c64a8	Working avatar fade in / fade out except that it is also triggered on bubble collisions	2017-07-11 16:43:27 +02:00
NeetBhagat	1a47383d4f	Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big	2017-07-11 19:23:46 +05:30
Sam Gateau	1f2f539507	Merge branch 'orange' of https://github.com/samcake/hifi into hobbes	2017-07-11 10:26:26 +02:00
Ken Cooke	d6eb731f3a	Merge branch 'master' into audio/peak-values	2017-07-10 21:55:11 -07:00
David Kelly	fcf4bfd59a	spacing issue	2017-07-10 13:25:33 -07:00
David Kelly	b87d69b15d	Insure spectator camera preview is up when reopening tablet	2017-07-10 13:16:08 -07:00
Seth Alves	d957b970dd	Merge pull request #10918 from misslivirose/feat-add-skeleton-changed-signal ... Add signal for avatar skeleton changing	2017-07-10 11:35:24 -07:00
David Kelly	4843b91f47	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-10 09:50:17 -07:00
Andrew Meadows	96b88dccd7	Merge pull request #10913 from samcake/orange ... Introducing the Stages to the render::Scene, Better scene update phase and getting away from the singleton model	2017-07-10 09:46:09 -07:00
Sam Gateau	746812ff78	Merging with origin orange	2017-07-10 17:25:13 +02:00
NeetBhagat	378e85e9b2	Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big	2017-07-10 18:29:04 +05:30
NeetBhagat	dd2dbd9b39	Initial Commit to resolve problem :> When Max Avatar scale is set in Sandbox -> setting, take that value as default max value	2017-07-10 18:26:33 +05:30
Sam Gateau	4edea433ce	Rename the _pipeline into _shapePipeline in the render::Args	2017-07-10 12:16:53 +02:00
Brad Davis	8043caa9e9	Merge pull request #10925 from jherico/overlay_performance ... Fix terrible script performance when rendering load is too high	2017-07-08 14:19:14 -07:00
Brad Davis	cd11f5cfa6	More tweaks for improved script performance	2017-07-07 22:02:56 -07:00
Brad Davis	148eece065	Tweak frame timing to avoid overloading the main thread	2017-07-07 21:00:33 -07:00
Brad Davis	7e9ea596a0	Add more efficient overlay getters, don't use blocking calls	2017-07-07 21:00:31 -07:00
Zach Fox	d0c521d7b4	Add clarifying comment.	2017-07-07 19:19:48 -07:00
Stephen Birarda	420e9233b6	Revert "fix for invisible avatars after radius ignore"	2017-07-07 16:50:28 -07:00
Stephen Birarda	f07ce6d294	Merge pull request #10835 from birarda/bug/invisible-avatars ... fix for invisible avatars after radius ignore	2017-07-07 16:06:44 -07:00
Zach Fox	e537c494e5	Prevent Image3DOverlays from drifting	2017-07-07 16:04:08 -07:00
Zach Fox	dbb48cd1aa	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-07 16:03:04 -07:00
Zach Fox	3d14d3755e	Merge pull request #10898 from 1P-Cusack/21425 ... Add View->Enter First Person Mode in HMD checkbox.	2017-07-07 14:01:36 -07:00
Andrew Meadows	57842ce5a5	Merge pull request #10878 from mnafees/21355 ... CR for Job #21355 - Clean up and remove menu hotkeys	2017-07-07 14:01:21 -07:00
1P-Cusack	77001712ab	Default 'Enter First Person Mode in HMD' to true.	2017-07-07 15:35:32 -04:00
Liv	060e3a9c5a	Add signal for avatar skeleton changing	2017-07-07 11:48:12 -07:00
Olivier Prat	06d69d04c3	TransitionStage + FadeJob compiling but not linked to entity events	2017-07-07 18:22:11 +02:00
Seth Alves	81cc46beb4	Merge pull request #10909 from jherico/overlay_crashes ... Fixing overlay crashes, for real	2017-07-07 07:11:52 -07:00
Sam Gateau	d15c4ea2d3	Merging with the stage branch	2017-07-07 15:12:40 +02:00
Sam Gateau	156c20d01e	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-07-07 10:58:05 +02:00
NeetBhagat	685b1c2445	Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big	2017-07-07 11:30:54 +05:30
Brad Davis	f8b76d65ab	Fixing overlay crashes, for real	2017-07-06 18:01:26 -07:00
druiz17	b4182fe7ac	Merge pull request #10899 from druiz17/calibration-update-2.0 ... Updates to the Calibration UI	2017-07-06 14:24:45 -07:00
Clément Brisset	34e3f56002	Merge pull request #10843 from birarda/bug/user-activities-interface-only ... disable user activity logger in DS/AC/ac-client	2017-07-06 14:01:49 -07:00
LaShonda Hopper	85111131da	[Worklist #21420] Resolves issue where domain changes didn't refresh the icon (details below). ... * Adds a local message/event: "Toolbar-DomainChanged" ** This message is sent by the application via its registered domain handlers: *** hostnameChanged *** connectedToDomain *** disconnectedFromDomain * edit.js subscribes to the "Toolbar-DomainChanged" event and updates the Create button icon as long as there's a valid known valid create button. Item Ticket Link: https://worklist.net/21420 Changes to be committed: modified: interface/src/Application.cpp modified: scripts/system/edit.js	2017-07-06 15:27:15 -04:00
Dante Ruiz	9e4b5693c7	fixed merge conflicts	2017-07-06 18:49:46 +01:00
anshuman64	e384f6d1b7	Merge pull request #10866 from druiz17/vive-in-desktop ... Allowing Vive controllers and trackers to be used in desktop mode	2017-07-06 10:40:56 -07:00
Stephen Birarda	916f57772b	default the UAL off for all targets, enable manually for Interface	2017-07-06 10:21:07 -07:00
Zach Fox	ee86638c4e	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-06 09:58:00 -07:00
David Kelly	1ccf0da7d8	Merge pull request #10897 from davidkelly/dk/cacheSwitchFix ... redo cache switch	2017-07-06 09:53:01 -07:00
Andrew Meadows	4fad9d9b1a	Merge pull request #10858 from jherico/trace_cores ... Additional threaded tracing of CPU cores	2017-07-06 08:23:21 -07:00
Olivier Prat	018c0489f4	Merged with 21378	2017-07-06 16:53:47 +02:00
Sam Gateau	53ffca796f	Drafting a better SHape plumber to render the items	2017-07-06 16:35:40 +02:00
David Kelly	936c21e849	remove unnecessary cacheDir member	2017-07-06 07:24:58 -07:00
David Rowe	cfd155c198	Merge branch 'master' into 21418	2017-07-06 16:56:10 +12:00
Atlante45	95abbd0ad4	Prevent Interface from trying to send packets bigger than an MTU	2017-07-05 17:08:04 -07:00
David Kelly	4a22fbca1b	redo cache switch	2017-07-05 17:01:31 -07:00
Brad Davis	7f1bc07d04	Trying to fix overlay crashes again	2017-07-05 14:30:01 -07:00
David Kelly	89c05244bf	remove unnecessary extra update() calls	2017-07-05 13:24:31 -07:00
David Kelly	85813ac908	render issue fixes	2017-07-05 11:29:34 -07:00
Dante Ruiz	b86a8b8338	Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop	2017-07-05 18:27:33 +01:00
Zach Fox	44cb48b17d	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-05 09:59:57 -07:00
NeetBhagat	440b941730	Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big	2017-07-05 18:47:13 +05:30
Mohammed Nafees	eb354a4333	Cleanup menu shortcut keys	2017-07-05 14:50:48 +05:30
Olivier Prat	5cee2cff9f	Merge branch 'master' of git://github.com/highfidelity/hifi into 21378	2017-07-04 17:48:07 +02:00
Seth Alves	fad686571a	Merge pull request #10874 from jherico/overlay_mutex ... Restore mutex in overlay interface	2017-07-03 17:25:42 -07:00
Zach Fox	fcc131187d	Merge pull request #10856 from zfox23/spectatorCamera_positionSpeedup ... Spectator Camera position/orientation update speedup	2017-07-03 16:44:12 -07:00
David Kelly	36467983d8	cr stuff	2017-07-03 16:29:26 -07:00
David Kelly	2a3b4b3bfb	minor cleanup, and adjusted includes per austin's suggestion	2017-07-03 15:54:54 -07:00
David Kelly	99bf100ff8	fix for jitter and not rendering in tablet	2017-07-03 15:19:04 -07:00
Brad Davis	97edbb7f37	Restore mutex in overlay interface	2017-07-03 14:49:57 -07:00
David Kelly	5f015ec77f	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-07-03 13:57:25 -07:00
David Kelly	045b009b00	Merge branch 'dk/spectatorCameraPreview' of https://github.com/davidkelly/hifi into dk/spectatorCameraPreview	2017-07-03 13:57:05 -07:00
Brad Davis	6c86c297cb	Don't use a blocking connection for a high-frequency function like editOvleray	2017-07-03 12:40:52 -07:00
1P-Cusack	38baeabbe5	Add View->Enter First Person Mode in HMD checkbox. ... When checked, changing to an HMD display will switch the user to first person mode. WL 21425.	2017-07-03 15:21:40 -04:00
Zach Fox	9c96cf811e	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectatorCamera_positionSpeedup	2017-07-03 10:33:55 -07:00
Zach Fox	9411c2e732	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-03 10:24:02 -07:00
Seth Alves	70a7b302fc	Merge pull request #10860 from jherico/deadlock_guards ... Don't use blocking connections on the main thread	2017-07-03 09:05:56 -07:00
humbletim	9053531bda	fix missing viewPosition + offset	2017-07-03 12:03:46 -04:00
humbletim	026e05f80c	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-07-03 11:55:59 -04:00
Olivier Prat	d9a83539b2	Merged with master	2017-07-03 15:32:30 +02:00
David Kelly	073eae39b2	timer now resumes when visible again	2017-06-30 18:44:32 -07:00
Dante Ruiz	6f30cb1825	Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop	2017-07-01 00:48:49 +01:00
David Rowe	07697c5083	Merge branch 'master' into 21418 ... # Conflicts: # interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml # interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml Removed stray "Vive Controller Picks" configuration item which no longer exists.	2017-07-01 11:19:00 +12:00
David Kelly	455233dc16	black background when camera is off	2017-06-30 16:08:40 -07:00
Dante Ruiz	577969481d	head puck working	2017-06-30 23:43:12 +01:00
Zach Fox	7851c8002f	Remove unnecessary guard	2017-06-30 15:25:33 -07:00
Zach Fox	36dfff78e2	Emit qDebug() error when trying to change position or orientation while attachedEntityId is defined	2017-06-30 15:13:31 -07:00
Ryan Downe Karpf	ddce264dd9	Merge pull request #10819 from Menithal/21387 ... WL21387 - Avatar Bookmarks now save Attachment Data and scale PR#2	2017-06-30 14:57:04 -07:00
Brad Davis	31d2c9980e	Merge pull request #10797 from ctrlaltdavid/21396 ... Make Leap Motion a plugin	2017-06-30 14:37:23 -07:00
David Kelly	09d959bdeb	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-06-30 14:16:01 -07:00
Zach Fox	9bd80ec2bf	Improve naming and API	2017-06-30 14:07:00 -07:00
David Kelly	133af0b522	jittery, still not working in tablet	2017-06-30 12:55:11 -07:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Zach Fox	f765b4136d	Cleanup	2017-06-30 10:12:47 -07:00
Zach Fox	5ceb80b3e7	It's working!	2017-06-30 10:12:46 -07:00
Zach Fox	8d89ea75f5	Initial commit	2017-06-30 10:12:46 -07:00
Brad Davis	8372d73fec	Additional thread safety	2017-06-30 09:15:06 -07:00
NeetBhagat	5ff0bc409b	solve the bug : Avatar scale value should be 3.0 ,if user has set scale value > 3.0 previously .	2017-06-30 15:40:38 +05:30
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
Zach Pomerantz	631e5a7b04	add override to AudioInputDeviceList::newDevice	2017-06-29 17:34:01 -04:00
Menithal	bf0a8e0f91	Updated Comment	2017-06-29 23:18:52 +03:00
Brad Davis	8ec20ef042	Additional tracing of CPU cores	2017-06-29 13:16:15 -07:00
David Kelly	02b712716b	testing some rendering issues...	2017-06-29 11:12:10 -07:00
Zach Fox	00966966df	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-29 10:13:11 -07:00
Zach Fox	3170bdd08c	Merge pull request #10837 from samcake/flash ... Fix projection & lighting issues identified with 2nd rendering pipeline	2017-06-29 10:12:03 -07:00
Sam Gateau	ca7e782566	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-29 10:54:27 +02:00
Sam Gateau	b766c256db	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-06-29 10:29:05 +02:00
Thijs Wenker	e781f97ddc	Merge pull request #10846 from sethalves/fix-server-scripts-more ... make ResourceManager be owned by DependencyManager	2017-06-28 17:05:30 -07:00
Howard Stearns	3606418a22	Merge pull request #10836 from davidkelly/dk/scriptsSwitchBug ... minor fix for --scripts switch	2017-06-28 16:11:18 -07:00
Seth Alves	794495c197	make ResourceManager be owned by DependencyManager	2017-06-28 14:18:14 -07:00
David Kelly	48de8011b2	cr feedback	2017-06-28 14:15:29 -07:00
howard-stearns	3293b4c898	Merge branch 'master' of https://github.com/highfidelity/hifi into merge-from-master-6-28-2pm	2017-06-28 13:53:32 -07:00
Patrick Manalich	cb52122726	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectator-camera_clean-up	2017-06-28 12:40:36 -07:00
David Kelly	b73102d063	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-06-28 08:57:04 -07:00
Sam Gateau	93963b3257	Apply the projection and deferred transform fixes found while working on spectator camera	2017-06-28 15:44:17 +02:00
Sam Gateau	37e5454421	Fix lighting issues identified with 2nd rendering pipeline	2017-06-28 15:12:20 +02:00
Olivier Prat	b76a8a6f9b	Merge branch 'master' of git://github.com/highfidelity/hifi into 21378	2017-06-28 14:37:03 +02:00
Sam Gateau	1e2b0ca91c	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-28 10:21:05 +02:00
Menithal	ffd9ee2908	More appeasement of GNU C Compiler warnings	2017-06-28 07:09:15 +03:00
Brad Davis	8130a91b8c	Cleanup entity dependencies	2017-06-27 19:15:49 -07:00
David Kelly	9417a176a1	make scripts tree show scripts in directory passed in with --scripts	2017-06-27 18:10:54 -07:00
Stephen Birarda	9e822de196	remove local collection of radius ignored nodes	2017-06-27 17:41:07 -07:00
Zach Pomerantz	5353437f59	add peakValues to scripting API	2017-06-27 17:51:45 -04:00
Menithal	24616f150f	Appeasing the Linux gods	2017-06-28 00:37:18 +03:00
Patrick Manalich	6d0b853668	Comment structure changes for compacting	2017-06-27 14:34:01 -07:00
David Kelly	01155ba4e3	this handles redirecting ktx_cache, data8, prepared	2017-06-27 08:47:54 -07:00
Sam Gateau	63835d0863	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-27 14:24:55 +02:00
David Kelly	564d935065	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/cacheSwitch	2017-06-26 13:32:02 -07:00
Menithal	0a0e40e182	Removed Redudant qualification from heade:>r	2017-06-26 23:04:48 +03:00
Menithal	232382e6d0	21387: Fixed issue with av scaling via script	2017-06-26 19:52:11 +03:00
Seth Alves	2f2a13ec27	Merge pull request #10799 from jherico/object_parent_warnings ... Fix warnings about creating QObjects with parents in different thread	2017-06-26 09:39:29 -07:00
Olivier Prat	1bb0d51849	Merged with master	2017-06-26 11:55:46 +02:00
Sam Gateau	75e457ce7c	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-26 10:05:04 +02:00
David Rowe	31714675c3	Remove unused Sixense preference and associated methods	2017-06-26 16:14:57 +12:00
David Rowe	bed0e8ef87	Merge branch 'master' into 21396 ... # Conflicts: # interface/src/avatar/MySkeletonModel.cpp	2017-06-26 12:07:25 +12:00
Menithal	359642eb0e	Refining and allowing for Avatar Scale to be saved as well	2017-06-25 23:55:47 +03:00
Menithal	d43d8ae846	Removed Old Comments	2017-06-25 22:01:14 +03:00
Menithal	f811971a42	Avatar Bookmarking	2017-06-25 21:57:07 +03:00
Seth Alves	9ae390853c	Merge pull request #10814 from jherico/linux_fix_static_plugins ... Fix static plugin initialization on Linux	2017-06-25 08:17:16 -07:00
anshuman64	8d5bdd2d84	Merge pull request #10730 from hyperlogic/feature/pole-vector ... Pole vector support for elbow and knee joints	2017-06-24 23:08:22 -07:00
Bradley Austin Davis	960017ddd7	Fix static plugin initialization on Linux	2017-06-24 22:22:47 -07:00
samcake	77650ac1b3	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-23 20:10:35 -07:00
humbletim	c10475186c	add support for switching cursor from arrow to reticle	2017-06-23 18:48:29 -04:00
Seth Alves	43ba5f3772	Merge pull request #10800 from hyperlogic/bug-fix/eyes-forward ... Fix for eye direction when no look at targets are present.	2017-06-23 14:32:21 -07:00
David Rowe	6e266dfbac	Merge branch 'master' into 21396	2017-06-24 09:19:12 +12:00
humbletim	f6262ad54d	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-06-23 16:37:10 -04:00
samcake	17e2140826	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-23 13:28:58 -07:00
Brad Davis	f1fe4ed7cc	Merge pull request #10804 from jherico/fix_deps_3 ... Remove dependency between codec plugins and UI	2017-06-23 12:51:35 -07:00
Brad Hefta-Gaub	dc649e84df	Merge pull request #10792 from jherico/qml_crashes ... Trying to fix QtQml/QtScript crashes	2017-06-23 12:41:43 -07:00
Brad Davis	fe7d4b1d23	Remove dependency between codec plugins and UI	2017-06-23 12:25:18 -07:00
David Kelly	bda50af780	this uses qt's test location for AppData/Local, but leaves Roaming alone	2017-06-23 11:06:48 -07:00
Anthony J. Thibault	8f89ef0931	Fix for eye direction when no look at targets are present.	2017-06-23 10:52:23 -07:00
Brad Davis	416852c0cd	Fix warnings about creating QObjects with parents in different thread	2017-06-23 10:19:16 -07:00
David Kelly	04160f2ca1	switch to change ktx_cache directory (only)	2017-06-23 09:19:41 -07:00
humbletim	35f27313ba	persist command history to data folder; fix warning message color	2017-06-23 12:05:44 -04:00
David Kelly	63279f4525	Merge pull request #10790 from davidkelly/dk/scriptsSwitch ... Command line switch to override default scripts location	2017-06-23 08:53:40 -07:00
druiz17	91ce9235ea	Merge pull request #10747 from zzmp/audio/select-log ... Log audio selections	2017-06-23 07:54:03 -07:00
Zach Pomerantz	a82cc0ec09	retab	2017-06-23 09:35:48 -04:00
David Rowe	9d0407cbdf	Merge branch 'master' into 21396	2017-06-23 16:52:04 +12:00
David Rowe	b26f5c5811	Clear finger joints when finger poses no longer being updated	2017-06-23 16:15:40 +12:00
samcake	20d8c11e28	ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore	2017-06-22 17:54:16 -07:00
Brad Davis	4439de240a	Trying to fix QtQml/QtScript crashes	2017-06-22 16:39:57 -07:00
David Rowe	8682cee17a	Refactoring	2017-06-23 11:33:29 +12:00
David Kelly	06d1ac8bf7	Merge remote-tracking branch 'upstream/master' into dk/scriptsSwitch	2017-06-22 14:14:54 -07:00
David Kelly	ff5b37c785	new --scripts switch overrides default scripts location	2017-06-22 14:09:05 -07:00
Andrew Meadows	62e862fef0	Merge pull request #10733 from Menithal/21384 ... 21384: Added Support to Disabling flight from client side	2017-06-22 13:38:01 -07:00
Anthony J. Thibault	79d9bbe6c5	Merge branch 'master' into feature/pole-vector	2017-06-22 13:37:55 -07:00
samcake	96a10d2e95	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-22 09:32:49 -07:00
David Kelly	34edd95926	Merge pull request #10776 from davidkelly/dk/avatarUrlSwitch ... new switches to override avatarURL	2017-06-22 07:11:29 -07:00
David Kelly	5da01f0074	updated comments	2017-06-22 07:09:24 -07:00
David Rowe	6ff8aed5e3	Merge branch 'master' into 21396	2017-06-22 23:54:15 +12:00
David Rowe	c54a5d8506	Tidying	2017-06-22 23:32:16 +12:00
David Rowe	3bdf267900	Implement fingers control	2017-06-22 23:32:06 +12:00
samcake	9ae2861ee6	Moving the stage objects under the scene umbrella and creating a cear task to update the scene elements	2017-06-21 18:29:38 -07:00
Seth Alves	c70365d04a	Merge pull request #10729 from druiz17/hand-pucks ... Hand pucks and Calibration UI	2017-06-21 18:10:15 -07:00
samcake	2919607f86	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-21 17:20:44 -07:00
Howard Stearns	ea5b074f6e	Merge pull request #10758 from howard-stearns/event-installer-interface-options ... Event installer interface options	2017-06-21 16:46:06 -07:00
David Kelly	92cbb86e8b	remove debugging	2017-06-21 16:09:08 -07:00
David Kelly	94a33fea94	new switches to override avatarURL	2017-06-21 16:03:05 -07:00
Anthony J. Thibault	2dcca2125b	Merge branch 'master' into feature/pole-vector	2017-06-21 15:50:03 -07:00
Chris Collins	f3ae1d8078	Merge pull request #10750 from Atlante45/master ... Stable -> Master	2017-06-21 13:34:28 -07:00
samcake	56d5f4ec5c	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-21 11:25:07 -07:00
Anthony Thibault	a12109ed26	Merge pull request #10761 from hyperlogic/bug-fix/avatar-no-eyes ... Bug Fixes for Eyeless Avatars	2017-06-21 10:59:55 -07:00
David Kelly	f30b12fca6	still doesn't work, pushing just to save it	2017-06-21 10:28:18 -07:00
Brad Hefta-Gaub	f7d42c782d	Merge pull request #10764 from thoys/feat/ac-location-jsapi ... Expose location scripting interface to Agent (AC script)	2017-06-21 10:22:48 -07:00
Thijs Wenker	47643e1efe	Expose location API to Agent scripts (side-effect, agents now can teleport)	2017-06-21 06:31:36 +02:00
Howard Stearns	fea8a95fc7	Don't leave running markers around if they weren't there before and we quit after reporting (protocol)version.	2017-06-20 18:09:27 -07:00
Howard Stearns	ac1d4d9636	Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options	2017-06-20 17:57:12 -07:00
Dante Ruiz	5e82b13d65	removed double include	2017-06-21 01:15:17 +01:00
Dante Ruiz	b7286db523	fixed merge conflict	2017-06-21 01:10:54 +01:00
Dante Ruiz	2c3db0fb91	finished calibration-ui	2017-06-21 01:07:12 +01:00
Atlante45	6bd1946e96	Merge branch 'stable' of https://github.com/highfidelity/hifi	2017-06-20 16:36:57 -07:00
Zach Pomerantz	8e1cf763e3	Merge pull request #10756 from zzmp/audio/input-level ... Update chrome for the audio input level meter	2017-06-20 15:33:17 -07:00
Zach Pomerantz	7e84f67391	Merge pull request #10744 from zzmp/audio/output-sample ... Add "Play sample sound" to audio setting	2017-06-20 15:32:57 -07:00
David Kelly	06b59fe13e	still broken, but added initial cut of GLsync stuff	2017-06-20 15:02:05 -07:00
howard-stearns	41003bd307	Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options	2017-06-20 13:25:38 -07:00
howard-stearns	480ff784b9	add a skipTutorial option, that does not change settings	2017-06-20 13:25:03 -07:00
Zach Pomerantz	f55d842fac	add SoundCache to tablet for PlaySampleSound	2017-06-20 12:16:08 -07:00
Matti Lahtinen	256484cd21	Removed Whitespace	2017-06-20 21:44:32 +03:00
Zach Pomerantz	8436d0cc6b	rm unused AvatarInputs props	2017-06-20 11:43:02 -07:00
Brad Hefta-Gaub	cbded766b1	Merge pull request #10676 from NeetBhagat/21369 ... WL 21369 - Implement parts of the JS "console" object	2017-06-20 11:06:34 -07:00
Anthony J. Thibault	29e3af820b	Fix for avatars with no eyes. ... The calculation of the centerEyeCalibration matrix (and several others) were incorrect.	2017-06-20 10:14:34 -07:00
howard-stearns	d71666f337	Remove useless command line arg for steam, but add one for version.	2017-06-20 09:59:15 -07:00
howard-stearns	974768390c	Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options	2017-06-20 09:47:52 -07:00
Anthony J. Thibault	21c0e45d87	recenter rotation while driving. ... This should reduce foot sliding in HMD mode.	2017-06-20 09:43:38 -07:00
Dante Ruiz	13dff29bd5	adding calibration screen	2017-06-20 01:19:10 +01:00
Zach Pomerantz	497ee3a522	add Audio.inputLevel	2017-06-19 17:07:43 -07:00
Zach Pomerantz	4bff925506	rm unused bools	2017-06-19 17:01:39 -07:00
Anthony J. Thibault	c236afe68c	Simplify passing data from MySkeletonModel to Rig	2017-06-19 16:54:39 -07:00
Zach Pomerantz	3d80774317	clean up select_audio_device	2017-06-19 15:57:24 -07:00
samcake	653ce89e08	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-19 15:48:46 -07:00
Zach Pomerantz	837f37220a	log selected_audio_device	2017-06-19 15:11:02 -07:00
Zach Pomerantz	5f236bd025	simplify device settings	2017-06-19 15:11:02 -07:00
Zach Pomerantz	5c0e9e7496	improve wording for MyAvatar.qmlPosition doc	2017-06-19 14:52:32 -07:00
David Kelly	b4c75c3f87	working, except tablet issue	2017-06-19 14:41:42 -07:00
Zach Pomerantz	a7e1b75909	stopgap with MyAvatar.qmlPosition	2017-06-19 14:41:01 -07:00
howard-stearns	91656a5fe5	Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options	2017-06-19 14:22:12 -07:00
Zach Fox	2e215e6544	Fix build problems	2017-06-19 14:04:51 -07:00
Zach Fox	cbdffce88e	Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619	2017-06-19 13:53:29 -07:00
Dante Ruiz	cfffb74a29	Merge branch 'master' of github.com:highfidelity/hifi into hand-pucks	2017-06-19 21:40:26 +01:00
Brad Davis	ed6620fc51	Merge pull request #10718 from jherico/frame_thread ... Cleanup and refactoring	2017-06-19 13:31:44 -07:00
howard-stearns	c6d66d439b	report and quit command line switches	2017-06-19 12:57:26 -07:00
Matti Lahtinen	82df64d5e7	flyingAllowed to zoneAllowsFlying	2017-06-19 21:44:43 +03:00
Olivier Prat	0211338657	Put back test if not physics enabled in entity items should fade function as it gives too many undesired refades	2017-06-19 20:38:47 +02:00
Seth Alves	39fb94d76d	fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at	2017-06-19 11:21:08 -07:00
Zach Fox	08eb07242d	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-19 10:31:31 -07:00
samcake	ebc4745df0	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-19 09:27:35 -07:00
Olivier Prat	21276a85ad	Merge branch 'master' of git://github.com/highfidelity/hifi into 21378	2017-06-19 18:20:03 +02:00
Olivier Prat	b6b1875dd3	Disabled check on enabled physics when deciding is fade is adequate	2017-06-19 18:19:54 +02:00
humbletim	26f651ae7c	Merge remote-tracking branch 'upstream/master' into HEAD	2017-06-19 10:01:37 -04:00
Vladyslav Stelmakhovskyi	59a77c16bd	Cleanup	2017-06-18 20:59:22 +02:00
Matti Lahtinen	600a39c9b2	Fixed Zone overriding Client.	2017-06-18 13:14:01 +03:00
Vladyslav Stelmakhovskyi	f34faa3ee7	Fix backward compatibility with Qt 5.6	2017-06-18 10:54:59 +02:00
Vladyslav Stelmakhovskyi	a1475bc65f	Forgot if statement	2017-06-17 23:02:52 +02:00
Vladyslav Stelmakhovskyi	b8bb8026ca	Merge branch 'master' into fix_tablet_buttons_qt59	2017-06-17 22:30:00 +02:00
Vladyslav Stelmakhovskyi	5a0783c38c	Send mouse events before touch event. It seems the order is important for Qt 5.9	2017-06-17 22:24:27 +02:00
David Kelly	c7e4649ec2	add override to avoid warnings in ubuntu/mac	2017-06-17 13:15:22 -07:00
Brad Davis	a69cf31f4b	PR feedback and cmake fixes	2017-06-16 16:59:58 -07:00
Dante Ruiz	da29157a3c	fixed merge conflict'	2017-06-17 00:40:50 +01:00
David Kelly	6dd1e6e069	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-06-16 16:24:30 -07:00
Zach Fox	7a76c9cf7f	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-16 14:59:23 -07:00
humbletim	fc33e95e2d	Merge branch 'master' into 21180-C++	2017-06-16 16:16:42 -04:00
Zach Fox	416ebaa2e8	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-16 10:08:10 -07:00
David Kelly	9b5b99c2b9	not as buggy. Still need ogl work, major cleanup, etc...	2017-06-16 08:59:57 -07:00
David Kelly	6d64261e94	working but often the spectator camera texture is not right.	2017-06-16 08:40:18 -07:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
Burt Sloane	4f7a1a6e2e	got rid of tabs	2017-06-15 16:35:53 -07:00
Burt Sloane	7d92ef9f25	more PR fixes	2017-06-15 16:12:16 -07:00
Burt Sloane	a73281b827	fix PR issues	2017-06-15 16:10:08 -07:00
David Kelly	f75cbfa087	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-06-15 15:45:03 -07:00
Burt Sloane	7022c4009f	midi in and out	2017-06-15 15:18:06 -07:00
David Kelly	3d922f5db6	works, sorta, but blinks like crazy, cursor gets f-ed up...	2017-06-15 14:17:43 -07:00
Zach Pomerantz	3093a73ce1	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-15 15:04:06 -04:00
Zach Fox	47e5fb56d3	Show MyAvatar's head in the SpectatorCamera view!	2017-06-15 11:31:20 -07:00
Zach Fox	60549075dd	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-15 10:09:07 -07:00
ZappoMan	d352163d77	fix no audio device from previously removed audio device	2017-06-15 09:24:14 -07:00
Brad Hefta-Gaub	035a9e898f	Merge pull request #10684 from howard-stearns/avatar-whitelist ... avatar whitelist	2017-06-15 08:45:16 -07:00
Dante Ruiz	d65c0dfbac	Merge branch 'master' of github.com:highfidelity/hifi into controller-ui	2017-06-15 16:24:59 +01:00
druiz17	347f020b04	Merge pull request #10692 from jherico/fix_tablet_crash ... Fix crash on exit when tablet is open	2017-06-15 08:15:02 -07:00
NeetBhagat	a6b1b17d45	Merge branch 'master' into 21369	2017-06-15 11:04:22 +05:30
David Rowe	a8501a7ac6	Remove old Leap Motion code	2017-06-15 14:45:40 +12:00
samcake	d8380923f0	Introducing the SCeneUpdtate job to the engine to take care of performing transactions and introducing the stages	2017-06-14 18:06:42 -07:00
David Kelly	54dfc33b38	initial skeleton of qml objects	2017-06-14 14:36:37 -07:00
David Rowe	16bebdd409	Rename identifiers	2017-06-15 09:20:55 +12:00
David Rowe	55e0082792	Code review	2017-06-15 09:10:08 +12:00
Brad Davis	7a6df850c5	Fix crash on exit when tablet is open	2017-06-14 13:22:53 -07:00
Menithal	112f186304	Added minor Comments	2017-06-14 22:24:18 +03:00
Zach Fox	8a217acd2b	Defaults for camera projection parameters	2017-06-14 12:19:38 -07:00
Zach Fox	03c61e2191	vFoV and clipping plane distances now come from config	2017-06-14 11:53:05 -07:00
Zach Fox	ec3b488897	Remove SECONDARY_CAMERA_RENDER_MODE for now	2017-06-14 10:27:08 -07:00
Menithal	a1c2f71f30	Added couple of state getters ... This allow scripts to check if avatar is flying or if the avatar is in air (but not flying). Both of these allows one to distinguish if the avatar is flying or falling or just jumping with Velocity	2017-06-14 20:19:04 +03:00
Menithal	66d43b80e2	Added getters for State if in Air or Flying	2017-06-14 19:53:08 +03:00
Menithal	c92e22fd20	21384: Added Menu Option	2017-06-14 19:05:00 +03:00
Menithal	53fe5736d8	21384: Initial Disable Flying	2017-06-14 18:24:45 +03:00
Zach Pomerantz	969582c23d	clean audio device names	2017-06-14 09:04:22 -04:00
Howard Stearns	87f3ce7699	reset avatar on domain change if the last domain imposed something on us	2017-06-13 19:30:01 -07:00
David Rowe	be2bcb1c13	Turn with head roll in HMD when walking or flying	2017-06-14 12:20:46 +12:00
David Rowe	05f19d54f4	Add HMD roll control JavaScript API	2017-06-14 11:55:04 +12:00
Zach Pomerantz	b24681125d	rm debugging	2017-06-13 18:16:16 -04:00
Zach Pomerantz	d4797dc9f8	update shift-x	2017-06-13 17:44:59 -04:00
Zach Pomerantz	a8f69bb2e0	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-13 17:41:52 -04:00
Zach Pomerantz	79563b7d83	fix header on AudioDevices.h	2017-06-13 14:55:20 -04:00
Zach Pomerantz	9b131ee4af	rm old AudioDevice interface	2017-06-13 14:55:10 -04:00
Zach Pomerantz	4a39798a97	sticky audio selection	2017-06-13 14:38:52 -04:00
Zach Fox	7b6033f7bc	Getting closer to a solution	2017-06-13 11:37:27 -07:00
NeetBhagat	9646eba873	Complete console.trace and added a testcases for all 13 functions.	2017-06-13 23:52:48 +05:30
Zach Fox	4acbb81413	Checkpoint	2017-06-13 10:22:48 -07:00
Zach Fox	ec162327a2	Merge branch 'spectator-camera' into flash	2017-06-13 10:22:02 -07:00
Zach Fox	7d1a7f4c0b	Merge branch 'master' of https://github.com/highfidelity/hifi into ... spectator-camera - INCLUDING MERGE CONFLICT FIXES	2017-06-13 09:42:14 -07:00
Zach Pomerantz	89bd895054	mv showAudioTools to just AvatarInputs	2017-06-13 12:31:05 -04:00
Olivier Prat	24d45e0f5b	Updated from upstream master because of change of protocol	2017-06-13 10:43:25 +02:00
NeetBhagat	b0e9c62c12	Merge branch 'master' of https://github.com/highfidelity/hifi into 21369	2017-06-13 10:10:44 +05:30
Sam Cake	f973f7b5e3	Fix the background not rendering on the second frame, this was imply due to a bug in the GLBackend	2017-06-12 21:25:27 -07:00
Brad Davis	db8bdbc0a6	Merge pull request #10659 from samcake/orange ... simple Render Engine refactors coming from the Spectator Cam project	2017-06-12 20:31:07 -07:00
Seth Alves	aeaddd23c7	Merge pull request #10658 from seefo/fb5087 ... Resolved FB5087	2017-06-12 17:25:05 -07:00
Zach Pomerantz	7d3bf75f0b	wip: sticky devices	2017-06-12 18:48:26 -04:00
Zach Pomerantz	b5dab39f83	sticky mic meter / noise reduction	2017-06-12 18:41:32 -04:00
Zach Pomerantz	8dac83d3fe	add reverb to qml Audio	2017-06-12 18:11:08 -04:00
Zach Pomerantz	b37a0239b0	up to reverb (needs cherry-picking)	2017-06-12 18:00:52 -04:00
Dante Ruiz	e4e261287a	Merge branch 'master' of github.com:highfidelity/hifi into controller-ui	2017-06-12 22:01:57 +01:00
Andrew Meadows	321e307c9f	Merge pull request #10609 from 1P-Cusack/21317 ... WL21317 helper functions for getting into avatar coordinate space	2017-06-12 11:18:29 -07:00
seefo	cb5a114145	Fixed Ubuntu warning	2017-06-12 10:47:55 -07:00
Dante Ruiz	1b13cd6d45	saving work	2017-06-12 17:31:02 +01:00
Dante Ruiz	067fc9bb98	fixed merge conflict	2017-06-12 16:45:34 +01:00
NeetBhagat	e6a5930365	Merge branch 'master' into 21369	2017-06-12 11:17:26 +05:30
Chris Collins	4b6c13bc1f	Merge pull request #10646 from ZappoMan/debugAudioProblems ... Fix for no-audio on clean install	2017-06-10 11:32:42 -10:00
samcake	bb38938534	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-09 14:34:25 -07:00
ZappoMan	6fe20f90a3	add better debugging for audio problems ... use OS default device if settings have no values	2017-06-09 13:36:12 -07:00
seefo	0343d4e443	Resolved FB5087	2017-06-09 13:33:46 -07:00
Seth Alves	3f425a5f02	Merge pull request #10649 from sethalves/fix-head-puck-broken-eyes ... Fix head puck broken eyes	2017-06-09 12:50:53 -07:00
Zach Fox	fd50434d86	New camera model; Cleanup; Bashing head :against desk	2017-06-09 11:42:16 -07:00
Zach Fox	5114fd8e1f	Rename correctly?	2017-06-09 11:39:28 -07:00
Zach Fox	7aef4dab4c	Variable renaming pass	2017-06-09 11:39:28 -07:00
Zach Fox	a4f5d327a2	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-09 11:38:35 -07:00
Zach Fox	12e5fc20f7	Merge pull request #10653 from samcake/flash ... Spectator-camera : Provide a way to render the side camera always mono	2017-06-09 11:34:37 -07:00
Seth Alves	5b62c9e83b	try again to get forward not-looking-at-anyone gaze to work right	2017-06-09 10:45:04 -07:00
seefo	dc02e34782	Resolved FB#5009	2017-06-09 10:23:53 -07:00
Seth Alves	197fb620d4	Merge branch 'master' of github.com:highfidelity/hifi into fix-head-puck-broken-eyes	2017-06-09 09:28:07 -07:00
Chris Howe	08d93173f0	Minor code feedback changes, moving test scripts to developer/tests.	2017-06-09 11:07:56 -04:00
NeetBhagat	c5d8268007	Merge branch 'master' of https://github.com/highfidelity/hifi into 21369	2017-06-09 18:04:34 +05:30
samcake	4c8eec4e16	Introducing a way to prevent a frame to render in stereo accross batches	2017-06-08 17:38:26 -07:00
Seth Alves	485df396ef	Merge pull request #10628 from jherico/qt59 ... Fixes for Qt 5.9 compatibility	2017-06-08 16:51:08 -07:00
Seth Alves	ce4c3e1601	fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at	2017-06-08 13:55:30 -07:00
Seth Alves	3b47142592	fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at	2017-06-08 10:28:38 -07:00
Olivier Prat	20d4fcbbc7	Fixed fading on skinned objects. Added initialiazeShapePipelines on GeometryCache to postpone simple pipeline creation after initializeGL	2017-06-08 09:24:12 +02:00
samcake	3664655512	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-07 17:43:50 -07:00
howard-stearns	9cf027a68c	pr feedback	2017-06-07 16:44:13 -07:00
howard-stearns	fa74daf875	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-06-07 16:43:25 -07:00
howard-stearns	51982b1294	display textures in plugins	2017-06-07 14:39:18 -07:00
Seth Alves	69520ff3db	pull from upstream, code review	2017-06-07 10:28:02 -07:00
Seth Alves	b1c7c251ac	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-07 10:09:46 -07:00
Zach Fox	d1719fade6	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-07 09:46:04 -07:00
NeetBhagat	ead0d42cf3	Merge branch 'master' into 21369 ... # Conflicts: # libraries/gl/src/gl/OffscreenQmlSurface.cpp # libraries/gl/src/gl/OffscreenQmlSurface.h	2017-06-07 15:47:19 +05:30
NeetBhagat	904e25c9e3	intial commit #21369 Working on clear method of console	2017-06-07 14:37:18 +05:30
Brad Hefta-Gaub	e5ac3eeea7	Merge pull request #10548 from NeetBhagat/21255 ... On Oculus Rift on/off, switch automatically to/from desktop mode	2017-06-06 18:05:56 -07:00
samcake	bac66ee4c7	Introducing the renderview task	2017-06-06 18:00:41 -07:00
David Kelly	06527ac0a2	Merge pull request #10611 from davidkelly/dk/4873 ... protect _text member of Text3DOverlay with mutex	2017-06-06 16:50:57 -07:00
Bradley Austin Davis	fc6a278217	Fixing dangling thread issues, consolidating thread management	2017-06-06 15:02:16 -07:00
Brad Davis	171d3212fe	Merge pull request #10623 from jherico/qml_engine_singleton ... Migrate to single QML engine	2017-06-06 15:00:43 -07:00
Zach Pomerantz	d416464b62	add Audio to tablet context	2017-06-06 17:55:19 -04:00
Zach Pomerantz	67288528da	add Audio.context	2017-06-06 17:55:06 -04:00
Zach Pomerantz	2b99f299c8	testing	2017-06-06 17:54:52 -04:00
Dante Ruiz	8d6e4bf28c	Merge branch 'master' of github.com:highfidelity/hifi into controller-ui	2017-06-06 21:09:19 +01:00
Stephen Birarda	0ccd0d3fd6	Merge pull request #10621 from highfidelity/stable ... Merge Stable back into Master	2017-06-06 10:39:03 -07:00
NeetBhagat	c3621d7c32	Resolved two issues: ... 1) While in HMD mode -> open Tablet -> Click Desktop. Desktop mode will be on. 2) Menu sync problem while switching modes.	2017-06-06 22:31:14 +05:30
Chris Howe	8166fec0e0	Minor changes based on code review feedback ... See https://worklist.net/21317, https://github.com/highfidelity/hifi/pull/10609 and https://github.com/highfidelity/hifi/pull/10609#pullrequestreview-42090197	2017-06-06 12:11:57 -04:00
Dante Ruiz	038ffe920a	fixing merge conflicts	2017-06-06 16:42:08 +01:00
NeetBhagat	ae9a928740	Merge branch 'master' into 21255 ... # Conflicts: # interface/src/Application.cpp	2017-06-06 19:06:50 +05:30
NeetBhagat	e79fd9c5cb	Merge branch 'master' into 21369	2017-06-06 15:26:40 +05:30
NeetBhagat	0f9cd5d0c7	intial commit hifi: #21369 Implement parts of the JS "console" object	2017-06-06 15:20:08 +05:30
Howard Stearns	3de243b093	Include the radius of the sphere at the avatar's feet.	2017-06-05 18:48:11 -07:00
Seth Alves	20c9228050	Merge branch 'head-controller' of github.com:sethalves/hifi into head-controller	2017-06-05 15:53:23 -07:00
Seth Alves	7a276f027f	fix orientation used for 3d audio	2017-06-05 15:53:01 -07:00
Bradley Austin Davis	995fe11c05	Migrate to single QML engine	2017-06-05 15:14:44 -07:00
Brad Hefta-Gaub	51e00b9de9	Merge pull request #10614 from samcake/brown ... Introduce a stencil mask pass in the rendering to optimize HMD	2017-06-05 14:14:11 -07:00
Zach Pomerantz	d8815d1dce	prep audio menu	2017-06-05 16:24:00 -04:00
humbletim	7cab0363a9	standalone 21180 branch with just the C++ changes	2017-06-05 15:57:54 -04:00
Zach Pomerantz	7cb38d22c3	fix AudioBuffers to work in tablet	2017-06-05 15:06:47 -04:00
Zach Pomerantz	9395de1873	add nop notify signals to Audio(Devices)	2017-06-05 14:57:44 -04:00
Seth Alves	3ab67cf27e	fix forward gaze in HMD while not looking at anyone	2017-06-05 11:44:27 -07:00
howard-stearns	4ccfef9702	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectator-camera-prototype	2017-06-05 11:18:40 -07:00
Zach Fox	87fca16e0d	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-05 10:48:12 -07:00
Chris Collins	6cc6cd3bf6	Merge pull request #10604 from highfidelity/RC-42 ... Beta Release 42 - Includes up to Developer Release 6626	2017-06-05 09:13:19 -07:00
Seth Alves	27669d44a7	in deriveBodyFromHMDSensor, avoid using invalid head pose	2017-06-05 08:58:40 -07:00
Howard Stearns	ca526e0776	git rid of a lambda	2017-06-05 07:11:25 -07:00
Howard Stearns	05f41fb4f8	cleanup	2017-06-04 08:13:12 -07:00
Howard Stearns	a0ea306aed	cleanup, and include missing allowBackface parameter	2017-06-04 07:55:23 -07:00
Howard Stearns	fd01258c76	cleanup	2017-06-03 16:02:58 -07:00
Howard Stearns	02c46080f7	we don't need to force, but we do need some extra room for confined spaces	2017-06-03 15:43:14 -07:00
Howard Stearns	c48b729527	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-06-02 18:05:20 -07:00
Ryan Huffman	52c60b35df	Add startup_sent_to user activity event	2017-06-02 17:57:40 -07:00
Seth Alves	1b719ee654	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-02 16:31:23 -07:00
Dante Ruiz	f0f10f74c6	inpput configutration stub	2017-06-03 00:30:00 +01:00
manapa01	8e1577d3d3	Merge pull request #10596 from manapa01/Snapshot-Sound ... Snapshot sound	2017-06-02 16:07:05 -07:00
David Kelly	12cbc206d2	cr feedback	2017-06-02 15:59:15 -07:00
Clément Brisset	c636922a5d	Merge pull request #10590 from huffman/fix/running-marker ... Update server-console to watch interface via pid rather than marker	2017-06-02 15:57:44 -07:00
David Kelly	9b34abeb40	oops initializer order...	2017-06-02 15:43:29 -07:00
Seth Alves	3359a0a794	work on fixing some head to eye offsets. MyHead::getHmdOrientation to MyHead::getHeadOrientation	2017-06-02 15:29:20 -07:00
David Kelly	f9e1f02888	protect _text member of Text3DOverlay with mutex	2017-06-02 14:59:27 -07:00
samcake	0a3c1712eb	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-06-02 14:35:05 -07:00
Patrick Manalich	76901f5bf9	Final Application.cpp change	2017-06-02 14:08:56 -07:00
Seth Alves	c40a76f320	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-02 13:58:00 -07:00
Seth Alves	9088e288e0	don't worry about head controller being enabled, just check to see if head pose is valid	2017-06-02 13:57:53 -07:00
Ryan Huffman	c0bca73ec7	Merge pull request #10606 from huffman/feat/startup-went-to-event ... Add startup_sent_to user activity event	2017-06-02 13:49:41 -07:00
Stephen Birarda	d89febac71	use a sleep instead of a yield waiting for close event	2017-06-02 13:22:02 -07:00
Stephen Birarda	e3d8229abe	rename ClosureEventSender to CloseEventSender	2017-06-02 13:21:55 -07:00
Stephen Birarda	ecc697dbe1	remove crash event definition for now	2017-06-02 13:21:45 -07:00
Stephen Birarda	40dfcb1e6e	send quit event during shutdown on thread, with timeout	2017-06-02 13:21:37 -07:00
Stephen Birarda	f5d732f332	initial version of the ClosureEventSender using std::thread	2017-06-02 13:21:28 -07:00
Chris Collins	34201ea1da	Merge pull request #10599 from jherico/ktx_cache_wipe ... Add versioning support to the KTX cache	2017-06-02 13:02:18 -07:00
Sam Gateau	8a2837e1f7	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-06-02 11:52:11 -07:00
Brad Davis	1f95daf5c1	Add dev menu option to wipe KTX cache on next launch	2017-06-02 11:19:43 -07:00
Ryan Huffman	0d96f82888	Merge pull request #10592 from birarda/close-report ... Send a close event to API on shutdown	2017-06-02 10:57:41 -07:00
Patrick Manalich	1f478bdf13	Repair Application.cpp	2017-06-02 10:44:58 -07:00
Patrick Manalich	a705e722f1	Ctrl-S sound feature added	2017-06-02 10:35:57 -07:00
Patrick Manalich	0c71cf4bda	Edit: Snapshot will make sound when initially clicked	2017-06-02 10:24:27 -07:00
Patrick Manalich	4e61db8263	Snapshot will make sound when initially clicked	2017-06-02 10:24:27 -07:00
Seth Alves	d91b3700a7	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-02 10:07:50 -07:00
Ryan Huffman	0fdbf4a342	Add startup_sent_to user activity event	2017-06-02 09:59:29 -07:00
Seth Alves	bc2311cb35	Merge pull request #10561 from AndrewMeadows/sanity-check-physics ... fix crash in EntityMotionState::handleDeactivation()	2017-06-02 09:55:20 -07:00
NeetBhagat	6228ff19bf	Resolve the reviewed comments of @ZappoMan	2017-06-02 15:23:21 +05:30
Sam Cake	f9aa400b95	Refining the stencil configuration and triggering only in hmd mode	2017-06-02 00:22:38 -07:00
NeetBhagat	e08c3453a4	Merge branch 'master' into 21255	2017-06-02 12:36:07 +05:30
Ryan Huffman	86da91ac8d	Remove the runningMarker timer	2017-06-01 18:19:13 -07:00
Stephen Birarda	6d1bbc389d	use a sleep instead of a yield waiting for close event	2017-06-01 17:57:23 -07:00
Stephen Birarda	9fad8d1821	rename ClosureEventSender to CloseEventSender	2017-06-01 17:52:01 -07:00
howard-stearns	6b2e4c5abc	zaru stuff	2017-06-01 17:08:22 -07:00
Seth Alves	7d21ab88b0	add some saftey checks. cleanups	2017-06-01 16:14:59 -07:00
Stephen Birarda	0f22b07026	move session ID logging later in app startup	2017-06-01 16:07:36 -07:00
Seth Alves	552b69bb1c	cleanups	2017-06-01 13:47:19 -07:00
Stephen Birarda	c513d04b52	remove crash event definition for now	2017-06-01 13:40:50 -07:00
Seth Alves	ac6135387c	display plugins are never head controllers	2017-06-01 13:37:16 -07:00
howard-stearns	1068a4a9bd	remove the optimization for upperId == lowerId. Doesn't work in zaru ... tunnels.	2017-06-01 13:21:24 -07:00
Stephen Birarda	792d938262	send quit event during shutdown on thread, with timeout	2017-06-01 13:01:24 -07:00
Ryan Huffman	aaf9b9ac7f	Update server-console to watch interface via pid rather than marker	2017-06-01 11:20:36 -07:00
Seth Alves	b83620f7c5	Merge branch 'head-controller' of github.com:sethalves/hifi into head-controller	2017-06-01 10:58:33 -07:00
Seth Alves	eca05d9c42	more use of head input	2017-06-01 10:57:53 -07:00
Seth Alves	eb94c48c5b	merge from upstream	2017-06-01 10:10:11 -07:00
Seth Alves	0b2eb43ee2	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-01 07:02:31 -07:00
NeetBhagat	d27ad061cb	Merge branch 'master' into 21255	2017-06-01 12:46:14 +05:30
NeetBhagat	c7c07b28e9	Resolve the reviewed comments of @ZappoMan	2017-06-01 12:17:13 +05:30
Sam Cake	3c9b14ee94	Oene more fix	2017-05-31 23:26:20 -07:00
Sam Cake	03fdc1396c	Fixing the warnings	2017-05-31 23:20:10 -07:00
Stephen Birarda	1d9d83b157	initial version of the ClosureEventSender using std::thread	2017-05-31 19:00:41 -07:00
Zach Pomerantz	954e4979f8	expose Audio.devices.input/output	2017-05-31 20:14:58 -04:00
howard-stearns	1e1dd3a633	checkpoint with working detector	2017-05-31 17:10:37 -07:00
Seth Alves	e37387f45c	sync	2017-05-31 14:01:09 -07:00
Chris Howe	6edc6b2756	WL21317 ... New MyAvatar functions to support converting from avatar joint space to world space and vice versa. Added some tests to support these functions.	2017-05-31 15:05:43 -04:00
Patrick Manalich	7b69a5dbd5	Changed the DEFAULT_DISCOVERABILITY_MODE to Connections	2017-05-31 10:46:04 -07:00
NeetBhagat	58142817a1	Resolve the review comments of @ZappoMan.	2017-05-31 19:18:14 +05:30
howard-stearns	07ea2e271b	hook into location changes	2017-05-30 14:59:19 -07:00
Seth Alves	ffe844a8e7	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-05-30 13:42:20 -07:00
Chris Collins	5db0975554	Merge pull request #10556 from highfidelity/RC-41 ... Beta Release 41 - Includes up to Developer Release 6603	2017-05-30 12:52:30 -07:00
howard-stearns	fe351f8ea2	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-05-30 12:04:15 -07:00
Seth Alves	250e381ea7	Merge pull request #10563 from Atlante45/fix/reset-settings ... Fix "retain avatar info"	2017-05-30 10:00:55 -07:00
volansystech	e90b1b5a67	Resolve the comments of @ZappoMan.	2017-05-29 18:21:59 +05:30
volansystech	212627bd5d	Merge branch 'master' into 21255	2017-05-29 17:51:45 +05:30
volansystech	0920dbc1a8	Resolve the comments of @ZappoMan.	2017-05-29 15:53:33 +05:30
Zach Pomerantz	4a3f2e1d09	use subclass for interface's Audio interface	2017-05-28 19:25:37 -04:00
Zach Pomerantz	b2eda7cf22	rm AudioDevice interface	2017-05-28 19:04:51 -04:00
Zach Pomerantz	2b40ad4275	mv Audio... to Settings as dialog	2017-05-28 17:42:24 -04:00
Zach Pomerantz	8ca8c3aa69	mv AudioPreferencesDialog to AudioBuffers	2017-05-28 17:40:57 -04:00
Zach Pomerantz	03d3666c0c	show menu after requesting it	2017-05-28 17:34:11 -04:00
Zach Pomerantz	156b3f9738	use showDialog instead of toggleMenu	2017-05-28 17:10:59 -04:00
Seth Alves	66415dadc6	Merge pull request #10496 from volansystech/Wl-21298 ... Solve Jitteriness when scrolling the content in HMD mode -> Marketplace using the scrollbar.	2017-05-27 08:28:19 -07:00
samcake	882df7391b	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-26 16:47:49 -07:00
howard-stearns	92aeadd70f	rotation of local capsule offset	2017-05-26 16:34:08 -07:00
howard-stearns	f694691efb	add fixme comments and make isUp/isDown ordinary methods.	2017-05-26 16:15:18 -07:00
howard-stearns	4be31f1b18	thread safety	2017-05-26 15:31:59 -07:00
Atlante45	ccc7cb638d	Fix "retain avatar info"	2017-05-26 14:18:29 -07:00
Zach Pomerantz	637a448c2c	abstract toggleMenu	2017-05-26 17:12:15 -04:00
Zach Pomerantz	380a16f9dd	use SYSTEM_TABLET static	2017-05-26 17:11:32 -04:00
Andrew Meadows	fa003b0c14	swap order of changes and deactvations	2017-05-26 12:29:37 -07:00
howard-stearns	7cee438298	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-05-26 11:36:04 -07:00
Anthony Thibault	84901ba94b	Merge pull request #10542 from druiz17/arm-pucks ... Added pucks calibration for upper arm/shoulders	2017-05-26 11:17:15 -07:00
volansystech	8d9cfbdf31	Resolve comments of @sethalves . Remove whitespaces.	2017-05-26 11:41:35 +05:30
Clément Brisset	efe72e1b85	Merge pull request #10530 from Atlante45/fix/default-scripts ... Ensure user never loses its running scripts	2017-05-25 18:33:11 -07:00
howard-stearns	905b5261d1	If collisions are enabled, turn them off in safeLanding, and ... restore.	2017-05-25 16:32:44 -07:00
Seth Alves	af5ba3a90a	ask display-plugins if they are head-controllers	2017-05-25 15:14:10 -07:00
howard-stearns	ac8cb63419	clean and DRY	2017-05-25 14:34:24 -07:00
Dante Ruiz	108c444cc7	clean up code	2017-05-25 21:59:06 +01:00
Andrew Meadows	3bd0c111d7	verify empty ShapeManager in Application dtor	2017-05-25 13:47:40 -07:00
howard-stearns	9d73d0c931	works with nested enclosing entities	2017-05-25 12:09:22 -07:00
Seth Alves	3823ece153	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-05-25 10:57:46 -07:00
Seth Alves	bdbc6ddcc1	change some code to look at head-controller position rather than hmd position	2017-05-25 10:50:41 -07:00
howard-stearns	74c163d047	snapshot of safeLanding. Works as long as entities don't intersect.	2017-05-25 10:25:29 -07:00
volansystech	a2851b5bcb	Put proper comments and indentation.	2017-05-25 18:47:59 +05:30
volansystech	8d51be644d	Merge branch 'master' into 21255	2017-05-25 17:48:48 +05:30
volansystech	cab6f3f7c3	Solve Jitteriness while scrolling.	2017-05-25 17:28:19 +05:30
volansystech	aab80629ea	Merge branch 'master' into Wl-21298	2017-05-25 15:44:17 +05:30
volansystech	1f24e38585	Initial Commit: Switching from Desktop mode to HMD [Oculus Rift] mode automatically when the user wear Oculus Rift.	2017-05-25 14:56:06 +05:30
Sam Cake	3eb95d2d19	cleaning the commented code	2017-05-25 01:16:45 -07:00
Stephen Birarda	f897f3f090	send machine fingerprint as uuid without curly braces	2017-05-24 19:08:25 -07:00
Stephen Birarda	50285005be	add machine fingerprint to the launch event	2017-05-24 18:35:57 -07:00
Stephen Birarda	c671817fa3	fix cache http request count in stats	2017-05-24 17:47:40 -07:00
Stephen Birarda	fefb34512d	change asset inbound key to atp	2017-05-24 17:44:09 -07:00
Stephen Birarda	c37fd335e1	track the number of local socket changes	2017-05-24 17:41:52 -07:00
Stephen Birarda	5e61f20df8	add more details about pending downloads	2017-05-24 17:37:42 -07:00
Stephen Birarda	48c4db1ca4	nest the download stats so they are cleaner	2017-05-24 17:36:21 -07:00
samcake	575d4abdf7	bad include fixed maybe	2017-05-24 17:25:21 -07:00
Stephen Birarda	3743cd23b4	add detailed download stats for file/http/atp	2017-05-24 17:22:38 -07:00
Stephen Birarda	ac55908e42	add additional information to stats/launch activities	2017-05-24 16:50:06 -07:00
samcake	044110e4f3	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-24 15:40:40 -07:00
Dante Ruiz	8cb9bfcc81	fixed merge conflict	2017-05-24 19:35:41 +01:00
Sam Gateau	f9c6cecb23	Merge pull request #10529 from samcake/ambient ... Fix compressed texture size evaluation and Cleaning up the texture counters (number and memory) for better reporting	2017-05-24 10:48:21 -07:00
anshuman64	2b63eb9d90	Merge pull request #10469 from druiz17/improve-rotation-jitter ... Added a LowVelocityFilter to the input system.	2017-05-24 08:35:13 -07:00
volansystech	0c4cd96bfd	Initial Commit : Switch from HMD [Oculus Rift] mode to Desktop mode automatically when user removing Oculus Rift.	2017-05-24 12:26:07 +05:30
Dante Ruiz	ac3c9655ec	added arms	2017-05-24 01:28:08 +01:00
samcake	e7b808cbc1	Merging with upstream	2017-05-23 12:12:31 -07:00
Clément Brisset	ed86ca3e55	Merge pull request #10522 from birarda/bug/version-number-jumps ... remove version difference from update dialog	2017-05-23 10:28:50 -07:00
Dante Ruiz	0cbdeaa1e8	Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks	2017-05-23 18:26:58 +01:00
Dante Ruiz	54d63f5155	Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter	2017-05-23 18:19:38 +01:00
Anthony J. Thibault	06c26f029a	Merge branch 'master' into feature/faster-ik-iterations	2017-05-23 09:10:17 -07:00
Sam Cake	7f9c98a922	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-22 22:54:43 -07:00
Chris Collins	978eb0dfa9	Merge pull request #10492 from ctrlaltdavid/21359 ... Fix eye behavior in recording playback	2017-05-22 21:53:13 -07:00
Atlante45	10eb353126	Ensure user never loses its running scripts	2017-05-22 18:55:58 -07:00
Sam Gateau	e4a516dcbf	Merge pull request #10497 from AndrewMeadows/crashfix-null-rig ... fix crash for Zone with 'compoundURL' property	2017-05-22 18:18:08 -07:00
Dante Ruiz	d98e7d5bc6	adding left and right arm	2017-05-23 00:26:12 +01:00
samcake	e4f9f2935e	Solving the size evaluation for compressed format	2017-05-22 15:42:18 -07:00
David Rowe	b0962865b2	Code review	2017-05-23 09:57:53 +12:00
Stephen Birarda	3e09c911f5	remove number of versions behind from the update dialog	2017-05-22 14:19:36 -07:00
David Rowe	9f83ca518f	Merge branch 'master' into 21359	2017-05-23 09:18:10 +12:00
volansystech	1cbf685133	Merge branch 'master' into Wl-21298	2017-05-22 10:58:05 +05:30
volansystech	6da46c2d4c	Resolve Mouse hover issue.	2017-05-22 10:53:58 +05:30
Atlante45	2928507e48	Fix "Reset Settings" window poping up every time	2017-05-21 08:37:17 -07:00
samcake	c5b5aa93b1	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-19 18:13:42 -07:00
David Rowe	768415695d	Tidying	2017-05-20 12:43:47 +12:00
David Rowe	eef707e4e9	Simplify code	2017-05-20 12:42:40 +12:00
Andrew Meadows	d3956b47d0	remove bad break	2017-05-19 15:35:29 -07:00
Andrew Meadows	bb4d366c40	use SmartPointer for Zone _model	2017-05-19 15:33:23 -07:00
Sam Gateau	36ac623e66	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-19 13:25:36 -07:00
Andrew Meadows	7b879a7964	Model has a Rig rather than a RigPointer	2017-05-19 13:24:16 -07:00
Atlante45	c2e2682eff	Fix "Reset Settings" window poping up every time	2017-05-19 10:50:23 -07:00
howard-stearns	af98b3bd4c	cleanup	2017-05-19 10:45:36 -07:00
volansystech	2691855e2b	Merge branch 'master' into Wl-21298	2017-05-19 10:43:31 +05:30
howard-stearns	469ffd41ab	bring back proper cached args	2017-05-18 17:07:41 -07:00
Anthony J. Thibault	e99001d86c	debug draw ik chains, bug fix for flex coef on tips ... And opened up hip constraints.	2017-05-18 16:29:55 -07:00
howard-stearns	3f5f47e7f3	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectator-camera-prototype	2017-05-18 16:13:15 -07:00
howard-stearns	242cbdf2df	Merge branch 'master' of https://github.com/highfidelity/hifi into update-from-master-1	2017-05-18 16:02:45 -07:00
howard-stearns	851911f55a	Merge branch 'master' of https://github.com/highfidelity/hifi into update-from-master-1	2017-05-18 15:28:40 -07:00
Zach Fox	8efac1e7f1	Prevent another GIF from being captured while one is processing	2017-05-18 14:30:08 -07:00
Dante Ruiz	984f9e1ba5	Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter	2017-05-18 21:23:06 +01:00
Sam Gateau	d9ad45bf4a	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-18 09:37:04 -07:00
samcake	2c6e10fbe1	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-18 09:21:02 -07:00
Dante Ruiz	90ddc16d09	add calibration data to filters	2017-05-18 17:07:28 +01:00
volansystech	b2ac4381eb	Solve Jitteriness when scrolling the content in HMD mode -> Marketplace using the scrollbar.	2017-05-18 19:13:59 +05:30
samcake	80b6fd65ae	Cleaning up counters and naming schemes...	2017-05-17 18:31:28 -07:00
Andrew Meadows	09433a93ba	Merge pull request #10477 from AndrewMeadows/correct-avatar-mass ... More correct avatar mass	2017-05-17 16:22:06 -07:00
Zach Fox	d4752926b8	First pass - checking performance	2017-05-17 13:51:27 -07:00
Seth Alves	8a88b30da7	Merge pull request #10468 from AndrewMeadows/cleanup-actions ... cleanup Actions and Constraints part-1	2017-05-17 11:33:53 -07:00
Sam Gateau	0f250e693d	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-17 09:49:20 -07:00
Dante Ruiz	a18940142e	Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter	2017-05-17 16:23:50 +01:00
Brad Hefta-Gaub	764bfe94f5	Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270 ... Feature/snap turn smoothing 21270	2017-05-16 21:05:38 -07:00
howard-stearns	fed5397b38	a camera	2017-05-16 16:46:52 -07:00
Andrew Meadows	d065b569d3	support for variable avatar mass by size	2017-05-16 16:03:51 -07:00
Andrew Meadows	805d23567d	fix simple typo	2017-05-16 16:03:50 -07:00
Atlante45	201f81f20a	Don't wait on the sandbox	2017-05-16 14:41:57 -07:00
Andrew Meadows	e9c703b147	add deprecation log for DYNAMIC_TYPE_SPRING	2017-05-16 10:34:39 -07:00
Andrew Meadows	9e08dadaf4	Remove ObjectActionSpring	2017-05-15 22:11:42 -07:00
Dante Ruiz	724f849d88	Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter	2017-05-16 00:15:18 +01:00
Dante Ruiz	975b1ab077	moved low velocity filter in the input system	2017-05-16 00:15:06 +01:00
samcake	2df6d0df48	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-15 13:40:56 -07:00
Seth Alves	66a1dbfcfe	Merge pull request #10445 from AndrewMeadows/cleanup-head-simulation ... cleanup Head::simulate() code	2017-05-15 11:21:43 -07:00
howard-stearns	fa9d866369	change camera pos/orientation through config	2017-05-15 07:10:12 -07:00
howard-stearns	3a0cc4e975	begin/end are Model, not ModelI/O, and begin has config	2017-05-14 15:48:40 -07:00
howard-stearns	9d1283e067	resetSize of texture	2017-05-14 15:24:35 -07:00
Vladyslav Stelmakhovskyi	cc10fc81b7	Fix crash in sit script	2017-05-13 20:57:04 +02:00
Howard Stearns	142b4f4203	kill warnings	2017-05-12 18:18:46 -07:00
anshuman64	49d4cf4e68	Merge pull request #10419 from hyperlogic/feature/ik-solver-init-config ... More stable IK when hips, feet and chest are controlled via external input	2017-05-12 17:22:29 -07:00
howard-stearns	29299976ee	render task should default off and be enabled by script	2017-05-12 17:03:23 -07:00
howard-stearns	bca2cf45c0	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-05-12 15:21:03 -07:00
Seth Alves	4af0a85aa0	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-12 13:03:58 -07:00
Clément Brisset	1658ced671	Merge pull request #10437 from Atlante45/feat/faster-startup ... Use baked default skybox	2017-05-12 11:35:51 -07:00
Seth Alves	bc6fb182eb	pull out motor action, fix import of slider and cone-twist constraints	2017-05-12 10:32:28 -07:00
samcake	3393456d91	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-12 10:15:13 -07:00
Seth Alves	c6131916e1	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-12 09:46:21 -07:00
Seth Alves	e1c805e76f	lock in Overlays::findRayIntersectionInternal	2017-05-11 17:02:00 -07:00
samcake	39241bec13	Prototyping a way to produce a selfie and use the rendering directly	2017-05-11 15:58:31 -07:00
Andrew Meadows	a43447310d	remove physics dependency from avatars-render lib	2017-05-11 15:22:22 -07:00
Andrew Meadows	f4df223d23	cleanup Head::simulation() code	2017-05-11 14:46:00 -07:00
Seth Alves	9d63113e62	Merge pull request #10337 from vladest/audio-source-sync ... Audio source sync	2017-05-11 12:50:38 -07:00
Vladyslav Stelmakhovskyi	bd6ac7a39e	Code style fixes	2017-05-11 20:38:09 +02:00
Andrew Meadows	0852852f39	Merge pull request #10443 from ctrlaltdavid/21326-2 ... Fix avatar recording playback mouth not moving	2017-05-11 10:41:41 -07:00
samcake	6b32219f5f	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-11 10:07:27 -07:00
Seth Alves	4042e2bceb	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-11 09:29:30 -07:00
Vladyslav Stelmakhovskyi	f963233a7b	Merge branch 'master' into audio-source-sync	2017-05-11 15:25:24 +02:00
Thijs Wenker	0a3a2705af	Merge pull request #10426 from huffman/fix/tablet-invisible-by-default ... Fix tablet showing up for a short period of time on launch	2017-05-11 15:03:52 +02:00
David Rowe	1b855f2c6b	Voice modulation and facetrackers write to transient blendshapes	2017-05-11 18:15:38 +12:00
Anthony J. Thibault	147d067c4e	Merge branch 'master' into feature/ik-solver-init-config	2017-05-10 18:12:39 -07:00
samcake	737fdf9dd8	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-10 17:28:07 -07:00
Atlante45	79d53d92a1	Use baked default skybox	2017-05-10 16:03:02 -07:00
Vladyslav Stelmakhovskyi	2328da3c48	Merge branch 'master' into audio-source-sync	2017-05-10 21:22:40 +02:00
Vladyslav Stelmakhovskyi	2d46f9d30e	Move most of the logic to C++ model, speed up initialization. Reduce number of AudioClient blocking calls to minimum	2017-05-10 21:21:39 +02:00
Brad Hefta-Gaub	f91f42b0c8	Merge pull request #10411 from zzmp/feat/tester-flag ... Add launch.tester to user_actions	2017-05-10 11:58:24 -07:00
samcake	39f6e22da3	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-10 09:48:26 -07:00
Seth Alves	9184936496	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-10 09:30:39 -07:00
Anthony J. Thibault	93b8dc550c	Merge branch 'master' into feature/ik-solver-init-config	2017-05-10 09:03:21 -07:00
Ryan Huffman	bddfdfa838	Adjust Web3DOverlay to load QML even if not visible	2017-05-09 16:01:20 -07:00
Zach Pomerantz	45feee38b2	Merge pull request #10269 from zzmp/fix/audio-bg-join ... Cleanup Audio background threads on shutdown	2017-05-09 17:23:36 -04:00
trent	a3545661dc	Merged hifi/master into this PR and resolved merge conflicts.	2017-05-09 15:09:53 -04:00
samcake	c36035d3eb	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-09 10:46:38 -07:00
trent	9c8b844e26	Merge branch 'feature/snap-turn-smoothing-21270' of https://github.com/mittens/hifi into feature/snap-turn-smoothing-21270	2017-05-09 12:51:28 -04:00
trent	7faed38bb5	Just use the smooth time constant instead of a variable.	2017-05-09 12:51:25 -04:00
Seth Alves	1e1968357a	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-09 09:24:50 -07:00
Andrew Meadows	e92e710cdc	Merge pull request #10413 from humbletim/fix_lookat_regression ... Fix lookAt eye snapping	2017-05-09 08:51:10 -07:00
Vladyslav Stelmakhovskyi	7ab6909c77	Merge branch 'master' into audio-source-sync	2017-05-09 11:08:08 +02:00
humbletim	29b1ac3572	optimizations per feedback	2017-05-08 21:50:24 -04:00
humbletim	42d1498d20	call Model::updateRig (not Parent::updateRig)	2017-05-08 21:19:18 -04:00
Andrew Meadows	2835a73c6b	Merge pull request #10071 from AndrewMeadows/walk-up-steps ... avatar can walk up steps	2017-05-08 18:17:16 -07:00
Zach Pomerantz	defc3c1c4f	Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join	2017-05-08 19:55:10 -04:00
Seth Alves	de589a32f3	clone spring action into one called tractor and use tractor is most places. this frees us to fix the math in spring so that it's actually a spring	2017-05-08 16:36:51 -07:00
Zach Pomerantz	929079df97	add launch.tester to user_actions	2017-05-08 19:33:09 -04:00
humbletim	ef0e32643d	update refactored logic to match previous application behavior	2017-05-08 18:53:47 -04:00
Anthony J. Thibault	712fcbe27a	Removed cruft/debug code & comments	2017-05-08 15:06:30 -07:00
Anthony J. Thibault	7af93f9fea	Hooked up IK constraint rendering	2017-05-08 15:06:29 -07:00
Anthony J. Thibault	e992d6703a	WIP: debug render joint constraints.	2017-05-08 15:06:28 -07:00
Anthony J. Thibault	a260163aee	WIP commit, first pass at generating limit center joints + debug draw	2017-05-08 15:06:27 -07:00
Andrew Meadows	afe0447322	remove unnecessary virtual keyword	2017-05-08 14:27:39 -07:00
Andrew Meadows	138a987a8f	_rotationChanged is a timestamp	2017-05-08 14:27:18 -07:00
Vladyslav Stelmakhovskyi	d0111ac0bb	Merge branch 'master' into audio-source-sync	2017-05-08 20:09:34 +02:00
Seth Alves	c8cdad5b4e	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-08 11:02:42 -07:00
Chris Collins	4bfb23b5d2	Merge pull request #10388 from humbletim/21308 ... CR #21308 Fix Script.print	2017-05-08 10:46:49 -07:00
Chris Collins	0351ac1575	Merge pull request #10401 from jherico/fix_benny_hill_animations ... Fix sped up animations	2017-05-08 09:11:23 -07:00
Sam Cake	d3724116d9	Using the items to pick the key light!	2017-05-08 00:20:20 -07:00
Brad Davis	b63015eaea	Fix sped up animations	2017-05-06 14:34:28 -07:00
Seth Alves	5d539bcc17	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-06 07:49:02 -07:00
Seth Alves	9e0845f17e	Merge pull request #10387 from vladest/tablet-performance ... Decrease CPU usage in tabletUI periodical updates	2017-05-06 07:07:29 -07:00
Chris Collins	820ed5049b	Merge pull request #10365 from sethalves/fix-dont-send-non-entity-edits-over-wire ... Fix -- dont send non-entity edits to entity-server	2017-05-05 16:37:27 -07:00
samcake	bc1e5101ac	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-05 16:13:51 -07:00
Seth Alves	b2ccc33a79	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-05 14:52:07 -07:00
Zach Pomerantz	ca7cd61c64	Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join	2017-05-05 13:04:01 -04:00
Chris Collins	fd836dcd68	Merge pull request #10366 from Atlante45/feat/normal-map-compression ... Feat/normal map compression	2017-05-05 10:03:01 -07:00
Chris Collins	8d49540f3a	Merge pull request #10380 from vladest/rightclick-fix ... Rightclick fix	2017-05-05 10:01:11 -07:00
Andrew Meadows	63042eea3a	fix flawed fix of bad rebase	2017-05-05 09:37:00 -07:00
Andrew Meadows	41ad25ade1	fix bad rebase of changed menu option	2017-05-05 09:37:00 -07:00
Andrew Meadows	fe401c7488	improved management of collisionless avatar state	2017-05-05 09:37:00 -07:00
Andrew Meadows	d34b667e82	remove kinematic character controller implemention	2017-05-05 09:35:49 -07:00
Andrew Meadows	0aa579225c	even more correct API: MyAvatar.collisionsEnabled	2017-05-05 09:35:49 -07:00
Andrew Meadows	559f5836c5	restore MyAvatar.setCharacterControllerEnabled()	2017-05-05 09:35:49 -07:00
Andrew Meadows	94ee6d6838	fix driving motion of collisionless avatars	2017-05-05 09:35:49 -07:00
Andrew Meadows	c47e26174c	support collisionless avatar when playing recording	2017-05-05 09:35:49 -07:00
Andrew Meadows	e21bd7a67a	help avatar walk up steps	2017-05-05 09:35:49 -07:00
humbletim	25807a5258	fix warning color	2017-05-05 09:48:24 -04:00
Vladyslav Stelmakhovskyi	e395a51c60	Merge with master	2017-05-05 07:05:16 +02:00
Seth Alves	92966377fb	Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 19:05:57 -07:00
Seth Alves	0406cc41e0	if model-overlay has no name, use its url	2017-05-04 18:37:04 -07:00
Seth Alves	c04c0c5b13	if model-overlay has no name, use its url	2017-05-04 18:36:51 -07:00
samcake	df2c5b8c23	adding the notification for keyLight changes modifying the KeyLIghtPayoad	2017-05-04 18:28:12 -07:00
Seth Alves	960bab6e4e	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 16:42:57 -07:00
Atlante45	ecda313223	Add runtime access to compression settings	2017-05-04 15:07:59 -07:00
humbletim	6cb95b2393	add and connect handlers for scriptWarningMessage and scriptInfoMessage signals	2017-05-04 17:43:00 -04:00
Brad Davis	9def788956	Merge pull request #10314 from jherico/avatars-renderer ... Migrate Avatar rendering code to library	2017-05-04 14:23:49 -07:00
Brad Davis	2d0bbf70ae	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
Anthony Thibault	7006fa6da4	Merge pull request #10257 from sethalves/grab-try-timer-instead-of-update ... grab is driven by timer rather than update, load tablet model with high priority	2017-05-04 14:07:21 -07:00
Vladyslav Stelmakhovskyi	ba5a371da1	Decrease CPU usage in tabletUI periodical updates	2017-05-04 22:54:41 +02:00
humbletim	fe36e6a793	fix JSConsole script message handlers and about: filename	2017-05-04 16:45:12 -04:00
Vladyslav Stelmakhovskyi	d522864141	Remove debug prints	2017-05-04 21:16:58 +02:00
Vladyslav Stelmakhovskyi	c8a9b02c7a	Block only secondary button	2017-05-04 20:26:02 +02:00
Vladyslav Stelmakhovskyi	4cefa0379c	Merge branch 'master' into rightclick-fix	2017-05-04 16:13:07 +02:00
Vladyslav Stelmakhovskyi	99ed2556f2	Do not send non primary button events to Tablet window	2017-05-04 16:11:07 +02:00
Seth Alves	69944cc76d	add a way to get a SpatiallyNestable's name without knowing what its type is	2017-05-03 21:32:49 -07:00
Seth Alves	a259d00b63	Merge pull request #10332 from sethalves/bullet-constraints-5 ... Bullet constraints	2017-05-03 16:30:34 -07:00
Zach Fox	4d49ae5b09	Remove the +1s	2017-05-03 15:43:57 -07:00
Zach Fox	07d3e482cf	ARG	2017-05-03 15:40:39 -07:00
trent	d7ed727faf	Adjustments based on PR feedback, though it looks like this snap-turn-snafu-story is not yet complete.	2017-05-03 16:56:18 -04:00
trent	ca4b563768	Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270	2017-05-03 16:34:34 -04:00
Zach Pomerantz	4a8f5e380f	Merge pull request #10358 from zzmp/fix/minimize-deadlock ... Fix deadlock from minimizing	2017-05-03 15:06:27 -04:00
Zach Fox	ae72b9b73d	Merge pull request #10357 from zfox23/newSnapshotReview_Improvements2 ... Lots of Snapshot app improvements, Round Two	2017-05-03 11:44:40 -07:00
trent	fc3cce6b73	Fixed the silly and stupid subtle issue that was causing the bug in inconsistencies.	2017-05-03 12:35:35 -04:00
trent	24f2678cdd	Adjusted the smooth time for the snap-turn remote view. Fixed tab issue.	2017-05-03 12:05:21 -04:00
trent	786838d092	Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270	2017-05-02 20:21:35 -04:00
Zach Pomerantz	ad8d3e5490	continue idling while minimized	2017-05-02 20:05:55 -04:00
trent	557a8fffd7	Addressing some PR feedback; moved easeInEaseOut to Interpolate class. My function is faster than andrew's. :D	2017-05-02 19:56:47 -04:00
Trent Polack	0a5dfbb9af	Changed l to interp. ... In my defense, if anyone ever looked at it and thought the 'l' was a '1', they should never be programming unless they used a special language where you could reassign numbers.	2017-05-02 19:10:33 -04:00
Sam Gateau	a7eecdfb26	Merge pull request #10265 from samcake/ambient ... Making the render engine Job/Task system configurable and reusable	2017-05-02 14:55:53 -07:00
Zach Fox	d1dff7606c	Lint cleanup; Immediate share button visibility;	2017-05-02 14:10:24 -07:00
Zach Fox	5302110e7b	Merge pull request #10346 from zfox23/newSnapshotReview_Improvements ... Lots of Snapshot app improvements, Round One	2017-05-02 13:00:08 -07:00
Vladyslav Stelmakhovskyi	e789b69a8e	Merge branch 'master' into audio-source-sync	2017-05-02 20:57:01 +02:00
trent	f79e032841	Silly online git merge tool. You are silly. Errors fixed.	2017-05-02 14:48:27 -04:00
Zach Fox	c9e0679b70	Subscribe to changes to snapshotsLocation setter for better UX	2017-05-02 10:55:57 -07:00
trent	6d1fb8a6f8	Merge branch 'feature/snap-turn-smoothing-21270' of https://github.com/mittens/hifi into feature/snap-turn-smoothing-21270	2017-05-02 13:55:39 -04:00
trent	49881b5ea2	Actually the full set of changes. Kids: don't forget to pop your stash.	2017-05-02 13:55:32 -04:00
samcake	df54ad2339	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-02 10:50:39 -07:00
Trent Polack	8f93a9a074	Merge branch 'master' into feature/snap-turn-smoothing-21270	2017-05-02 13:43:32 -04:00
trent	8f34ec4c7f	Iteration on the snap-turn smoothing based on feedback from Andrew. Also additional cleanup.	2017-05-02 13:41:34 -04:00
Brad Davis	425405f72d	Merge pull request #10245 from AndrewMeadows/avatar-renderer-002 ... more cleanup in preparation for moving Avatar class to lib	2017-05-02 10:37:22 -07:00
Seth Alves	dc569051f9	Merge branch 'master' of github.com:highfidelity/hifi into grab-try-timer-instead-of-update	2017-05-02 09:50:13 -07:00
trent	6317857e3d	Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270	2017-05-02 12:11:39 -04:00
samcake	4514da2a09	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-01 16:49:35 -07:00
Seth Alves	45a50f9a46	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-5	2017-05-01 15:32:29 -07:00
Seth Alves	a75544a9fb	Merge pull request #10319 from hyperlogic/feature/head-standard-action ... Head, Hips and Chest IK can now be controlled from Controller inputs	2017-05-01 13:03:23 -07:00
trent	4d7eeed343	Marking MyAvatar's rotation as dirty if smoothing is going down.	2017-05-01 15:21:25 -04:00
Brad Davis	40e4e2f307	Merge pull request #10327 from jherico/face_tracker_refactor ... Remove Faceshift	2017-05-01 12:14:55 -07:00
trent	773563850c	Merge hifi/master with my branch, fixed merge issue.	2017-05-01 13:23:02 -04:00
Vladyslav Stelmakhovskyi	dde363ef3d	Merge branch 'master' into audio-source-sync	2017-05-01 18:42:53 +02:00
Vladyslav Stelmakhovskyi	28447cde0b	Get rid of QML errors in HMD mode. Sync Audio menu in Tablet/HMD without recreating menu items	2017-05-01 18:41:38 +02:00
Anthony J. Thibault	0c09823f67	clang warning fixes, unused variables...	2017-05-01 09:10:31 -07:00
Seth Alves	7f69bdecb2	first try at angular-velocity setting action	2017-05-01 07:06:21 -07:00
Seth Alves	7ce0ef2ec4	fix spring action so that it can be linear or rotational or both	2017-04-30 10:04:07 -07:00
Seth Alves	4c4e0dffcc	bullet cone-twist constraint	2017-04-29 12:30:12 -07:00
Seth Alves	6623028d71	ball-and-socket constraint	2017-04-29 08:35:55 -07:00
Seth Alves	9e7ef83bd1	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-4	2017-04-29 07:01:44 -07:00
Brad Davis	2b43a1989f	Moving face and eye trackers out of interface	2017-04-28 23:28:17 -07:00
Brad Davis	5e1bc0d908	Remove faceshift	2017-04-28 16:34:54 -07:00
Stephen Birarda	c518aa55be	Merge pull request #10312 from birarda/upload-new-models-to-entity ... add an entity file replacement via domain-server content page	2017-04-28 16:06:05 -07:00
Vladyslav Stelmakhovskyi	368334e07e	Merge branch 'master' into audio-source-sync	2017-04-28 23:04:17 +02:00
Vladyslav Stelmakhovskyi	d18ac6dd49	Reimplemented Tablet Audio screen using C++ model	2017-04-28 23:02:28 +02:00
Anthony J. Thibault	108cd80bb5	Merge branch 'master' into feature/head-standard-action	2017-04-28 10:41:29 -07:00
Andrew Meadows	994eed7b83	safer delete of AvatarMotionStates	2017-04-28 10:18:19 -07:00
Stephen Birarda	9bc0609b1e	address code review comments	2017-04-28 10:17:48 -07:00
Seth Alves	2a0fc5b34c	Merge pull request #10273 from hyperlogic/feature/hips-ik-target ... Avatar IK system now supports manipulating the hips.	2017-04-28 09:17:33 -07:00
Anthony J. Thibault	b80270400f	Merge branch 'master' into feature/hips-ik-target	2017-04-27 18:15:12 -07:00
Anthony J. Thibault	2120e63e3a	Merge branch 'master' into feature/head-standard-action	2017-04-27 17:51:13 -07:00
Stephen Birarda	038ac745c8	clear domain octree details if ES killed	2017-04-27 17:47:18 -07:00
Anthony J. Thibault	764f6c69ea	Head input action will override the HMD for IK.	2017-04-27 17:39:25 -07:00
Zach Fox	3ce81844da	Snapshot JS interface for better Settings handling	2017-04-27 14:01:08 -07:00
Zach Fox	6711e8cbc2	Remove duplicate setting; Make settings page open; button state	2017-04-27 14:01:07 -07:00
Zach Fox	3221214283	New Snap FTUE flow	2017-04-27 14:01:07 -07:00
Zach Fox	eaa699bbfd	Wow, it's really coming together!	2017-04-27 14:01:06 -07:00
Zach Fox	880bcf3b1e	Checkpoint	2017-04-27 14:01:06 -07:00
Zach Fox	16b4af8a9d	Rearchitecture	2017-04-27 14:01:06 -07:00
Howard Stearns	88c3b4d9d3	Merge pull request #10258 from howard-stearns/watch-for-announcements ... watch for announcements	2017-04-27 14:00:39 -07:00
Andrew Meadows	5cf233db3a	less labyrinth	2017-04-27 13:16:50 -07:00
Andrew Meadows	aa90a6bd02	use static methods for setting avatar debug options	2017-04-27 13:16:50 -07:00
Andrew Meadows	75b563d598	restore rendering of avatar receive stats	2017-04-27 13:16:50 -07:00
Andrew Meadows	442080dec7	remove unused RenderArgs::_cameraMode hack	2017-04-27 13:16:50 -07:00
Andrew Meadows	00b05ed137	connect menu options to avatar render features	2017-04-27 13:16:50 -07:00
Andrew Meadows	823f3a73c6	remove commented out cruft	2017-04-27 13:16:50 -07:00
Andrew Meadows	72f5860538	restore RecordingScriptingInterface to Application	2017-04-27 13:16:50 -07:00
Andrew Meadows	caf6a77baf	repair bad merge during rebase	2017-04-27 13:16:50 -07:00
Andrew Meadows	2441536de3	remove Avatar dependency on AvatarMotionState	2017-04-27 13:16:49 -07:00
trent	53f47c132f	Avatar snap-turn rotation smoothing (sent out from the local client outward).	2017-04-27 16:12:25 -04:00
Andrew Meadows	010d1dfa22	remove Menu dependency from Avatar class	2017-04-27 13:11:57 -07:00
Andrew Meadows	6393972874	remove AvatarManager dependency from Avatar	2017-04-27 13:11:57 -07:00
Andrew Meadows	65682a914d	remove cufty AvatarManager LocalLights feature	2017-04-27 13:11:57 -07:00
Andrew Meadows	4c212fb1e5	pull qApp spaghetti out of Avatar class ... some ends of spaghetti get pushed into AvatarManger class split Camera class into Camera base and FancyCamera derivation Application::getCamera() returns Camera by refence instead of pointer	2017-04-27 13:11:57 -07:00
Seth Alves	b0c12dd84a	warn rather than crash if we get unexpected action data	2017-04-27 13:04:47 -07:00
Seth Alves	203a14f2a0	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-2-redux	2017-04-27 12:56:11 -07:00
David Kelly	63468cc9e1	Thread safety for sending location	2017-04-27 12:20:56 -07:00
Philip Rosedale	f555291d92	Merge pull request #10296 from Triplelexx/21296 ... 21296 - Move two menu items	2017-04-27 11:37:07 -07:00
Seth Alves	93f9716557	merge from upstream	2017-04-27 10:17:00 -07:00
Seth Alves	15661987be	load tablet overlay models with higher priority	2017-04-27 10:16:08 -07:00
Seth Alves	68b59e4601	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-2-redux	2017-04-27 07:56:49 -07:00
Seth Alves	b196dd082b	expose bullet slider constraint to javascript	2017-04-27 07:56:35 -07:00
Triplelexx	a154879001	change menu item text Audio Noise Reduction to Noise Reduction	2017-04-27 03:25:24 +01:00
Triplelexx	f9c6cb27f4	change menu item for avatar collisions to "Collide with world"	2017-04-27 03:16:04 +01:00
ZappoMan	c0df82ff69	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-26 18:49:24 -07:00
ZappoMan	834a447d62	remove debugging code	2017-04-26 18:36:44 -07:00
Triplelexx	f795027ab7	change menu item locations ... AudioNoiseReduction moved under Audio. Avatar Collision under Avatar.	2017-04-27 01:09:04 +01:00
anshuman64	d146431e9b	Merge pull request #10268 from druiz17/input-recorder ... Input recorder/ input playback system for all input actions	2017-04-26 16:20:20 -07:00
humbletim	f8bbd9174c	Merge remote-tracking branch 'upstream/master' into 21281	2017-04-26 18:26:15 -04:00
anshuman64	5bd9b2e631	Merge pull request #10130 from ctrlaltdavid/21249 ... New avatar record and playback script	2017-04-26 15:18:30 -07:00
Ryan Huffman	8ba56a96df	Merge pull request #10240 from zzmp/fix/hmd-tutorial ... Condition tutorial on active HMD	2017-04-26 14:00:02 -07:00
Andrew Meadows	fd874429c1	remove unused cruft	2017-04-26 12:51:16 -07:00
Andrew Meadows	ac751029c0	remove identity cache code	2017-04-26 12:51:16 -07:00
Andrew Meadows	4511156d7b	cache avatar identity info forever	2017-04-26 12:50:48 -07:00
Anthony J. Thibault	ef43ff4b99	Add default pose matrices to InputCalibrationData structure	2017-04-26 11:55:24 -07:00
ZappoMan	5dd6daaad7	send identity on nodeActivated not nodeAdded	2017-04-26 11:42:38 -07:00
Dante Ruiz	d8e6e8e7d0	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-26 16:53:02 +01:00
David Rowe	1b635d8c5e	Replace FIXMEs with proper code	2017-04-26 13:29:51 +12:00
David Rowe	4a5f84f4b9	Merge branch 'master' into 21249 ... # Conflicts: # libraries/audio-client/src/AudioClient.cpp	2017-04-26 13:24:18 +12:00
ZappoMan	65801cbb4d	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-25 18:21:17 -07:00
ZappoMan	5164aa4056	hacking	2017-04-25 18:21:09 -07:00
trent	2963d3d212	Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270	2017-04-25 19:31:21 -04:00
ZappoMan	90cdeb9582	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-25 16:09:59 -07:00
Atlante45	33f58f99d1	CR	2017-04-25 16:09:31 -07:00
Dante Ruiz	5a9cf554e7	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-25 23:57:48 +01:00
Atlante45	62b7855e1f	Add pending to stats	2017-04-25 15:56:23 -07:00
Atlante45	ad16a935e9	Texture::create returns shared pointer	2017-04-25 15:56:23 -07:00
Atlante45	a450f52427	Start to setup image library	2017-04-25 15:56:22 -07:00
David Rowe	7c2e1aa846	Tidy FIXME	2017-04-26 10:16:35 +12:00
Anthony J. Thibault	dc19f37726	input/controller routing thru skeleton model and rig.	2017-04-25 15:04:47 -07:00
Brad Hefta-Gaub	1962a49f3b	Merge pull request #10225 from sethalves/bullet-constraints-1 ... Bullet constraints + far-grab bootstrap fix	2017-04-25 13:36:47 -07:00
Zach Pomerantz	d2bfcce3f7	Merge pull request #10242 from zzmp/fix/display-log ... Send changed_display_mode after it changes	2017-04-25 16:36:12 -04:00
trent	f28b58f56e	Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270	2017-04-25 15:35:11 -04:00
Seth Alves	23592f4a53	get rid of _trackedHeadPosition ... (cherry picked from commit e909938b232e11400832ae7dd29de16968967668)	2017-04-25 11:03:43 -07:00
Seth Alves	0cd2863df4	start on routing HMD position and rotation through controller interface ... (cherry picked from commit bca5241bae7674ff7e41c037d84bb78e5152046a)	2017-04-25 11:01:52 -07:00
David Rowe	d682924b00	Temporary fix for recording audio	2017-04-25 21:08:10 +12:00
ZappoMan	382645ddd0	more cleanup	2017-04-24 18:01:54 -07:00
ZappoMan	aa955ee360	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-24 17:36:30 -07:00
ZappoMan	c9aad6b762	new approach to the tpose fix, as well as other improvements	2017-04-24 17:36:05 -07:00
Anthony J. Thibault	937f308ba8	code cleanup	2017-04-24 17:04:16 -07:00