30282 commits

Author	SHA1	Message	Date
sabrina-shanman	46616b4efd	Fix more integer conversion warnings	2019-09-16 09:55:25 -07:00
sabrina-shanman	a166b41216	Fix build warnings/errors	2019-09-13 15:39:29 -07:00
luiscuenca	5adf3e8c25	Expose API some parameters for live configuration	2019-09-13 14:10:11 -07:00
Shannon Romano	79d845d127	Merge pull request #16190 from danteruiz/fix-html ... BUGZ-1398: HMD Tablet Apps blocked by Web access error	2019-09-13 12:35:29 -07:00
amerhifi	cc11bd9552	created new AudioWrapper	2019-09-13 11:24:41 -07:00
danteruiz	8491a37923	fixing WebEntities html	2019-09-13 09:57:51 -07:00
Ryan Huffman	5370e67507	Update logo on login popup	2019-09-12 14:48:21 -07:00
sabrina-shanman	b944db3e79	std::vector-ize joints and materials in hfm::Model	2019-09-11 16:54:07 -07:00
luiscuenca	8af22f0c04	Compute when negative deltas	2019-09-11 16:27:07 -07:00
luiscuenca	793b2917f6	Compute only when delta is not zero	2019-09-11 16:25:48 -07:00
luiscuenca	8a6cb93a84	Limit the camera pitch and use the eyes as the pivot point	2019-09-11 16:08:14 -07:00
MiladNazeri	fb9a6a3c78	Merge pull request #16175 from MiladNazeri/dev-551/hide-crash-menu-behind-enviornment-variables ... DEV-551/hide-crash-menu-behind-environment-variable	2019-09-11 15:47:40 -07:00
Zach Fox	a5504c3780	Merge pull request #16176 from MiladNazeri/BUGZ-1456/HMD-audio-setting-shows-up-when-desktop-mode ... BUGZ-1456/HMD-audio-setting-shows-up-when-desktop-mode	2019-09-11 15:05:44 -07:00
luiscuenca	7c7c3cd223	merge master	2019-09-11 14:07:19 -07:00
Shannon Romano	65d0bb1342	Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc ... Kasen Plugin Infrastructure v½ Codename "Modkit Mini"	2019-09-11 13:04:01 -07:00
MiladNazeri	a9da5b8f16	Update interface/resources/qml/hifi/audio/Audio.qml ... Co-Authored-By: Zach Fox <fox@highfidelity.com>	2019-09-11 12:45:18 -07:00
MiladNazeri	d95a803324	Update interface/resources/qml/hifi/audio/Audio.qml ... Co-Authored-By: Zach Fox <fox@highfidelity.com>	2019-09-11 12:44:59 -07:00
milad	3cf56210b2	modified Audio.qml to handle desktop audio level meter visible	2019-09-11 12:30:24 -07:00
milad	f9c5d00efa	remove source from variable name	2019-09-11 12:10:47 -07:00
luiscuenca	f0dcfa7f15	fix rotation frame	2019-09-11 12:04:23 -07:00
luiscuenca	b28154235a	Look at camera when camera in front	2019-09-11 11:43:26 -07:00
milad	5ec8b0d589	added environment variable check for crash menu	2019-09-11 11:39:19 -07:00
luiscuenca	7584fe587e	Fix warnings and initial camera orientation	2019-09-11 11:21:53 -07:00
luiscuenca	2f33e37eb6	Angles instead dot product and fix API	2019-09-10 18:10:02 -07:00
Zach Fox	50ba55a988	Protect against engine not returning a valid CPU/GPU object	2019-09-10 13:03:40 -07:00
Zach Fox	e52d65a7bc	BUGZ-1451: Update links in controller reference	2019-09-10 11:31:51 -07:00
Zach Fox	eb286d992e	Merge pull request #16160 from RebeccaStankus/emojiDoubleClickSound ... Emoji app duplicates sound on opening from toolbar	2019-09-09 11:27:26 -07:00
Shannon Romano	e1dac580b6	Merge pull request #16121 from luiscuenca/audioPosesSyncFix ... BUGZ-1234: Mitigate the effect of audio noise on talking animations	2019-09-09 10:37:07 -07:00
RebeccaStankus	33b78bea4f	Changed textField module sounds	2019-09-09 10:36:35 -07:00
Shannon Romano	ca190f9932	Merge pull request #16143 from dooglifeSF/Sitting_emote_variants ... Sitting emote variants, revisions on stand emote agree anims, point bug fix	2019-09-09 10:12:56 -07:00
Shannon Romano	4017a4f937	Merge pull request #16156 from sethalves/wtf-audio-devices ... BUGZ-1434: use existing audio settings on startup	2019-09-09 10:09:34 -07:00
Shannon Romano	c7db287458	Merge pull request #16146 from AndrewMeadows/ess-with-simulation ... BUGZ-1385: allow entity-script-server to move entities kinematically	2019-09-09 07:51:28 -07:00
Seth Alves	4eb88fb396	use existing audio settings on startup	2019-09-07 15:55:31 -07:00
Matt Hardcastle	3074ff96e0	Merge pull request #16150 from MattHardcastle/add-signing-2.0-rebase ... Add signing 2.0 rebase	2019-09-07 09:09:11 -07:00
luiscuenca	1f458d195e	Refactorting, up/down attenuation and comments	2019-09-06 17:50:06 -07:00
Andrew Meadows	227b99859d	fix api for checking EntityItem grab status	2019-09-06 17:23:38 -07:00
dooglifeSF	932093bead	Merge branch 'master' into Sitting_emote_variants	2019-09-06 15:06:52 -07:00
luiscuenca	3b8d3f987d	Add animation	2019-09-06 14:31:53 -07:00
luiscuenca	0e4e09acb5	Add blending	2019-09-06 14:30:10 -07:00
luiscuenca	189ddf39e2	Merge branch 'master' into addLookAtThirdCamera	2019-09-06 14:29:51 -07:00
dooglifeSF	422ad52a87	Add one more sitting emote: clap03, touch up two of the standing clap anims, adjust frame ranges	2019-09-06 13:57:33 -07:00
dante ruiz	768ac08d11	Add entitlements for Launcher and Interface	2019-09-06 11:20:16 -07:00
dante ruiz	c2e0e6a976	Change Launcher config.json location ... Launcher `config.json` can not be inside Interface's app bundle, as it will break signing.	2019-09-06 11:20:06 -07:00
luiscuenca	78eee5961c	Fix key mapping for new camera	2019-09-05 18:05:46 -07:00
luiscuenca	ddbd30fac9	Fix magic numbers and refactor some code	2019-09-05 17:14:35 -07:00
luiscuenca	ff8f2c5c16	Add new LookAt camera	2019-09-05 17:04:39 -07:00
dooglifeSF	b5d2675a05	Merge branch 'master' into Sitting_emote_variants	2019-09-05 16:45:24 -07:00
dooglifeSF	5061aca487	Update sitting_emote_raisehand03_all.fbx	2019-09-05 16:44:13 -07:00
dooglifeSF	9cfa4753d9	sitting emote acknowledge and dismiss added, also went through emote_agree set and pushed them per Josh feedback. Fixed point glitch stand/sit	2019-09-05 15:31:07 -07:00
Anthony J. Thibault	c35640f739	Warning fixes and small bug fix to anim stats	2019-09-05 14:54:19 -07:00
humbletim	271fac4bca	Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge	2019-09-05 09:46:21 -04:00
Zach Fox	df3f7fcb72	Merge pull request #16132 from MiladNazeri/dev-486/emote-ui-toggle-fix ... Dev-486 : emote indicator should still be showing	2019-09-04 13:11:24 -07:00
milad	5fdcf0ecaf	updated setting name and changed default value to true for show tray	2019-09-04 12:59:17 -07:00
Shannon Romano	24faa4a7cb	Merge pull request #16124 from MattHardcastle/call-interface-highfidelity ... Call Interface "High Fidelity" on macOS	2019-09-04 09:34:35 -07:00
milad	669fef763a	removed logs	2019-09-03 18:11:56 -07:00
milad	44e518f5a1	working fix	2019-09-03 18:06:25 -07:00
dooglifeSF	6b3dfd6d56	sitting emote raised hand 03 wip	2019-09-03 16:53:36 -07:00
Shannon Romano	5f4b2a0080	Merge pull request #16109 from sethalves/fix-saccade-override ... apply fake eye saccades if eye joints aren't overridden	2019-09-03 11:34:02 -07:00
Zach Fox	d88c43614c	Merge pull request #16129 from RebeccaStankus/feetPosition ... Feet position	2019-09-03 11:04:17 -07:00
Jamil Akram	a9d8f105ae	Merge pull request #16112 from dooglifeSF/Anim_memory_reduction ... Anim memory reduced ~10mb by removing static channels	2019-09-03 10:08:02 -07:00
RebeccaStankus	a34a533c07	Added defaults for some params	2019-09-03 10:06:17 -07:00
RebeccaStankus	37304f57ea	Merge branch 'master' of github.com:highfidelity/hifi into feetposition	2019-08-30 14:20:58 -07:00
RebeccaStankus	5fadfa5275	Updated property in MyAvatar.h	2019-08-30 13:52:02 -07:00
Bradley Austin Davis	8e3b337a6e	Merge pull request #16120 from jherico/fix/bugz-1365 ... BUGZ-1365: prevent server scripts from accessing local files in HTML controls	2019-08-30 13:10:09 -07:00
Bradley Austin Davis	29424ca971	Merge pull request #16113 from jherico/fix/bugz-1363 ... BUGZ-1363: crash when checking for web content restrictions	2019-08-30 13:09:49 -07:00
Matt Hardcastle	f91ec8fbf5	Call Interface "High Fidelity" on macOS	2019-08-30 09:18:36 -07:00
Brad Davis	82a49d4641	Fix android build	2019-08-29 20:19:49 -07:00
luiscuenca	265b6f57a1	Try to mitigate the effect of background mic noise when simulating talking	2019-08-29 15:19:17 -07:00
Brad Davis	6aa967f29f	fixing test code	2019-08-29 14:11:22 -07:00
Brad Davis	31340d278a	Add test for local file access	2019-08-29 13:45:43 -07:00
Brad Davis	428a58710d	BUGZ-1365: Ensure that by default web views can't access local content	2019-08-29 13:44:49 -07:00
Shannon Romano	3695a5e633	Merge pull request #16105 from amerhifi/bugz-186 ... CASE DEV-186: HQ Launcher/Interface Icons and wording need to be standardized	2019-08-28 15:58:10 -07:00
Shannon Romano	e07e8abc0d	Merge pull request #16106 from AndrewMeadows/less-MyAvatar-mesh-tuneling-2 ... BUGZ-1325 prevent MyAvatar from pushing through mesh barrier	2019-08-28 15:51:42 -07:00
dooglifeSF	974b18b16b	Export one more that used to be hosted. I moved it to the source repo.	2019-08-28 14:16:57 -07:00
dooglifeSF	a5118d8a31	Merge branch 'master' into Anim_memory_reduction	2019-08-28 10:21:21 -07:00
dooglifeSF	577a82f750	Export animations, remove static channels. Remove unused joints. Exclude all scene data from fbx.	2019-08-28 10:10:39 -07:00
Brad Davis	954773124a	BUGZ-1363: crash when checking for web content restrictions	2019-08-28 09:56:45 -07:00
Anthony Thibault	1a1e8297e6	Merge pull request #16077 from dooglifeSF/tweak_sit_pose ... Sit pose reworked and new sit emote variants added.	2019-08-28 09:06:31 -07:00
Andrew Meadows	6be3750b38	use collision brake feedback to prevent tunneling	2019-08-27 20:28:56 -07:00
Seth Alves	1979e1dbc7	apply fake eye saccades if eye joints aren't overridden (rather than if HasProceduralEyeFaceMovement is true)	2019-08-27 16:47:01 -07:00
amerhifi	42357904cd	fixed icon name spacing	2019-08-27 20:13:15 +02:00
amerhifi	335dea43df	changing app name to high fidelity and changing icons to the new logo	2019-08-27 20:08:21 +02:00
Shannon Romano	3134332513	Merge pull request #16098 from hyperlogic/feature/backtrace-shutdown-flag ... Added "shutdown" crash annotation and crash menu option	2019-08-27 10:57:07 -07:00
dooglifeSF	c6f72e0e77	Merge branch 'master' into Anim_memory_reduction	2019-08-27 09:52:16 -07:00
Anthony J. Thibault	e98cdab294	Moved CrashHelper.h include to the appropriate place.	2019-08-26 17:05:08 -07:00
Bradley Austin Davis	07ee9e901f	Merge pull request #16099 from jherico/fix/wake_crash ... BUGZ-1264: Support platform independent sleep/wake notifications	2019-08-26 16:20:50 -07:00
Brad Davis	e1bf3f2540	PR feedback	2019-08-26 11:51:33 -07:00
Zach Fox	83ef260941	Merge pull request #16093 from zfox23/emoteTweaks ... BUGZ-1346: Tons of changes to Emote/Emoji system	2019-08-26 10:15:03 -07:00
Zach Fox	497edf6068	Add a comment	2019-08-26 09:03:10 -07:00
Brad Davis	dfd78a2662	Support platform independent sleep/wake notifications	2019-08-24 13:16:48 -07:00
Anthony J. Thibault	d410cb4fda	Added "shutdown" crash annotation and crash menu option	2019-08-24 11:12:28 -07:00
dooglife@gmail.com	01b912210a	json tuning to minimize the double-blend reduced animation effect, and to address some Joshua feedback	2019-08-23 15:06:31 -07:00
dooglife@gmail.com	e8492beb4a	Merge branch 'master' into tweak_sit_pose	2019-08-23 14:21:09 -07:00
Zach Fox	dfcf70b9b5	Tons of Emote/Emoji changes	2019-08-23 14:14:53 -07:00
RebeccaStankus	f6a32b9318	Fix for PTT not working comments	2019-08-23 13:46:46 -07:00
RebeccaStankus	f109edbd48	Fix for PTT not working comments	2019-08-23 13:45:32 -07:00
RebeccaStankus	63038d12c2	Fix for PTT not working comments	2019-08-23 13:43:15 -07:00
RebeccaStankus	85ee61af9d	Fix for PTT not working	2019-08-23 13:35:58 -07:00
Shannon Romano	af46a180ab	Merge pull request #16091 from luiscuenca/reactionsRefCountFix ... BUGZ-1265: Don't allow reactions refcount go bellow 0	2019-08-23 10:57:56 -07:00
Shannon Romano	86518d222d	Merge pull request #16089 from RebeccaStankus/MuteIssues ... Push To Talk Bugs 1207/1208	2019-08-23 10:42:16 -07:00
dooglife@gmail.com	fed14ac588	Merge branch 'master' into tweak_sit_pose	2019-08-23 09:34:45 -07:00
luiscuenca	19d85ba824	MyAvatar.endReaction return false when no reaction has been trigger previously	2019-08-23 09:07:27 -07:00
luiscuenca	da9163616a	Don't allow reactions ref count got bellow 0	2019-08-23 08:46:59 -07:00
dooglife@gmail.com	01e98e194a	animation tuning pass	2019-08-22 16:48:41 -07:00
Andy Howell	f5767168ed	Merge pull request #16035 from MiladNazeri/emojiAppAdd ... Using my superpowers to get this in the build.	2019-08-22 16:10:22 -07:00
RebeccaStankus	6e96b800b6	Engine handles turning PTT off if unmuting	2019-08-22 13:22:45 -07:00
Zach Fox	7c4a0545c4	BUGZ-1327: Fix PTT icon when PTTing and clipping	2019-08-22 12:51:34 -07:00
dooglife@gmail.com	75dd4d8da9	json tuning, adding cheer/disbelief anim block-ins, BUG: these are tposing here so do not merge - this is a test	2019-08-22 11:50:22 -07:00
Zach Fox	177590614e	Fix emote bar always visible on MacOS; small logic cleanup	2019-08-22 11:44:09 -07:00
Zach Fox	330b8ceb91	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-22 10:24:00 -07:00
dooglife@gmail.com	ec06a02fdf	Merge branch 'master' of https://github.com/highfidelity/hifi into tweak_sit_pose	2019-08-21 08:46:59 -07:00
Andrew Meadows	7cf0899d59	more correct safeLanding trigger	2019-08-20 17:33:29 -07:00
Andrew Meadows	32400a6baf	improved isStuck detection and MyAvatar::safeLanding() trigger	2019-08-20 17:33:29 -07:00
Andrew Meadows	c8c704eb57	revert last change	2019-08-20 17:33:29 -07:00
Andrew Meadows	6d7565a568	CharacterController don't fight MyaAvatar::safeLanding()	2019-08-20 17:33:29 -07:00
Ryan Huffman	de476d0569	Merge pull request #16075 from huffman/fix/mouse-look-stuck-on-macos ... BUGZ-374: Fix Mac getting stuck in mouse look	2019-08-20 16:25:02 -07:00
Zach Fox	70b3f44f8c	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-20 14:04:35 -07:00
RebeccaStankus	cc22386f06	CR feedback changes	2019-08-20 13:29:02 -07:00
Zach Fox	780a081d16	Remove unused TabletAddressDialog internal property, fixing BUGZ-1294	2019-08-20 12:05:00 -07:00
Zach Fox	41d992a307	Merge pull request #16078 from zfox23/helpSupport1 ... DEV-412: Implement Support tab in Help app	2019-08-20 11:57:44 -07:00
dooglifeSF	8d05d9e5d4	fix the worst of the mismatched emote poses for the eval mtg	2019-08-20 11:57:20 -07:00
Zach Fox	bb97b4f866	Fix BUGZ-1303: Make 'View All Controls' go to knowledge base	2019-08-20 11:17:05 -07:00
Anthony Thibault	2b74e2a7fa	Merge pull request #16066 from hyperlogic/bug-fix/sit-bug-fixes ... Avatar sitting bug fixes	2019-08-20 11:09:25 -07:00
Zach Fox	0cc28c58ae	DEV-415: Implement Support tab in Help app	2019-08-20 10:54:58 -07:00
Zach Fox	010b4b8312	Merge pull request #16076 from zfox23/removeAboutFromSettings ... Remove 'About' tab from Settings	2019-08-20 10:46:42 -07:00
dooglifeSF	8a3b93b913	add 3 sits with different hand placements for eval - also 2 new sit emotes	2019-08-20 10:35:56 -07:00
RebeccaStankus	e48e733343	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-20 09:01:18 -07:00
Shannon Romano	1569c4049f	Merge pull request #16069 from SimonWalton-HiFi/nonverified-avatar-more-robust ... BUGZ-1247: Better handling of other-avatar verify-failed appearance	2019-08-19 17:32:27 -07:00
Zach Fox	78edfb9af9	Remove 'About' tab from Settings	2019-08-19 17:22:38 -07:00
Zach Fox	083470e4fe	Ensure that geometryChanged is emitted after docked widget is resized	2019-08-19 16:48:40 -07:00
Ryan Huffman	8097ecef11	Fix cmd-leftclick not working correctly on Mac OS ... On Mac OS, Cmd+LeftClick is treated as a RightClick (more specifically, it seems to be Cmd+RightClick without the modifier being dropped). Starting in Qt 5.12, only on Mac, the MouseButtonRelease event for these mouse presses are sent to the top level QWidgetWindow, but are not propagated further. The change here gets around this problem by capturing these pseudo-RightClicks, and re-emitting them as "pure" RightClicks.	2019-08-19 15:53:20 -07:00
Zach Fox	b40d5658e3	Moved a timer from JS to QML; progress circle on Emote Indicator	2019-08-19 15:12:48 -07:00
Jamil Akram	a3919af747	Merge pull request #16062 from dooglifeSF/animation_json_tuning ... Tuning pass on anim-graph, using the new blend modes and engine features	2019-08-19 14:02:37 -07:00
Zach Fox	14a04dfb1a	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-19 13:52:35 -07:00
Zach Fox	072261f551	Merge pull request #16074 from zfox23/helpQuickFixes ... BUGZ-1295: Fix typo in Help > Controls > Turn Right	2019-08-19 13:15:10 -07:00
Zach Fox	36dffb7dc8	Merge pull request #16073 from zfox23/micIconFix ... Fix some engine bugs that fix muted state in all UIs including simplifiedUI	2019-08-19 13:09:43 -07:00
Zach Fox	35a2cb7f27	BUGZ-1295: Fix typo in Help > Controls > Turn Right	2019-08-19 13:08:42 -07:00
Zach Fox	ca2cdfc533	Fix some engine bugs that fix muted state in all UIs including simplifiedUI	2019-08-19 11:13:11 -07:00
Zach Fox	42705c2fea	Combine conditional statements	2019-08-19 11:04:54 -07:00
Zach Fox	2b86947d4a	Mipmap images; better padding	2019-08-19 10:32:08 -07:00
Simon Walton	150b4e45d4	More robust handling of the avatar verify-failed property	2019-08-16 17:30:28 -07:00
Zach Fox	3de9f44bf3	It's working	2019-08-16 16:00:30 -07:00
Zach Fox	4c006c50aa	Controls almost done	2019-08-16 15:53:30 -07:00
Zach Fox	30d552919a	Merge branch 'master' of github.com:highfidelity/hifi into helpApp1	2019-08-16 14:06:58 -07:00
Zach Fox	c13697803d	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-16 12:14:44 -07:00
Anthony J. Thibault	381f7c6bc4	Avatar sitting bug fixes ... * Added seatedToIdle transition, to make transition quicker to better match the capsule physics. * Made switching into and out of instantly set animVar for the animation graph, previously it was delayed by 100 ms. * Created "isNotSeated" anim var for exiting the seated state. * MyAvatar::beginSit & MyAvatar::endSit no longer calls goToPosition, instead MyAvatar::slamPosition is called. * MyAvatar::slamPosition will cause the AvatarTransit class to NOT play the teleport anticipation/reaction animation. Note: This does not prevent other clients from interpolating the position when entering the seat, but it prevents the teleport reaction animation from playing. * Disable leg IK in HMD mode while seated.	2019-08-16 10:57:03 -07:00
Simon Walton	85da916a3b	Merge pull request #16061 from SimonWalton-HiFi/entities-scriptengine-takedown ... BUGZ-984: Wait for client entity-scripts to unload when shutting down	2019-08-16 10:12:38 -07:00
Zach Fox	92c5ca2d75	Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd	2019-08-16 09:58:44 -07:00
RebeccaStankus	c64da85344	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-16 09:11:03 -07:00
Zach Fox	a053f9ed9e	Impelement settingChanged; clean up some emoteIndicatorVisible code	2019-08-15 17:00:27 -07:00
Zach Fox	0338b0258c	Add Search to Emoji window and clean up some code	2019-08-15 12:21:29 -07:00
Zach Fox	143c3e966c	Big optimizations to Emoji window	2019-08-15 10:58:13 -07:00
Brad Hefta-Gaub	b0b406adda	Merge pull request #16015 from HifiExperiments/renderUpdate ... BUGZ-902: Drastically reduce locking and branching necessary for render updates	2019-08-15 09:35:17 -07:00
dooglifeSF	2f3f6be693	Tuning pass on anim-graph, using the new blend modes and engine features.	2019-08-14 15:18:19 -07:00
Simon Walton	9aacd136b8	Add blocking to script unload for client entity-scripts	2019-08-14 13:51:40 -07:00
RebeccaStankus	0645796e74	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-14 13:28:08 -07:00
RebeccaStankus	8728640f60	Initial CR changes	2019-08-14 12:03:49 -07:00
Zach Fox	52c4d4fe69	better FAQ	2019-08-14 09:31:08 -07:00
Zach Fox	7297ac9a09	Merge branch 'master' of github.com:highfidelity/hifi into helpApp1	2019-08-14 09:11:04 -07:00
Sam Gateau	9a1e1a001a	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-08-13 10:00:59 -07:00
Zach Fox	a225a009cd	BUGZ-1233: Remove keyboard shortcut to LoD tools	2019-08-12 11:27:34 -07:00
Sam Gateau	53642763c9	Merge branch 'master' of https://github.com/highfidelity/hifi into toulouse	2019-08-11 21:57:36 -07:00
Shannon Romano	1011880698	Merge pull request #16049 from sabrina-shanman/ourLODEInvestigation ... (BUGZ-1112) Make 20:20 vision equal seeing 1m cube from 400 meters away	2019-08-09 17:28:46 -07:00
sabrina-shanman	16593ec3c9	Remove invalid deprecated comment	2019-08-09 16:32:31 -07:00
sabrina-shanman	07ea79689e	Fix build warnings	2019-08-09 13:34:55 -07:00
Zach Fox	66199297cb	button	2019-08-09 12:24:37 -07:00
Zach Fox	dc2e08ef6b	Initial integration of browser	2019-08-09 12:05:03 -07:00
sabrina-shanman	49f1ecb1bf	Fix new bugs in TabletLODTools.qml	2019-08-09 11:41:11 -07:00
Sam Gateau	fe08609b0c	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-08-09 11:25:03 -07:00
Anthony Thibault	c2fbfd70c4	Merge pull request #16045 from hyperlogic/feature/reaction-intro-loop-outro ... Higher quality standing and seated reactions	2019-08-09 11:16:49 -07:00
Brad Hefta-Gaub	555a875405	Merge pull request #16047 from jherico/fix/bugz-1097 ... BUGZ-1097: Fix invalid rendering of splash frame on AMD based macs	2019-08-09 09:51:38 -07:00
Zach Fox	e8b93998da	Merge branch 'master' of github.com:highfidelity/hifi into helpApp1	2019-08-09 09:33:13 -07:00
Shannon Romano	1993ff6277	Merge pull request #15922 from SimonWalton-HiFi/min_threadpool_2 ... BUGZ-993: Bump minimum threadpool size to 2	2019-08-09 09:20:55 -07:00
Anthony J. Thibault	733d7455f4	new seated talking anim	2019-08-09 08:52:38 -07:00
Brad Davis	c28d850514	BUGZ-1097: Fix invalid rendering of splash frame on AMD based macs	2019-08-09 08:13:20 -07:00
Anthony J. Thibault	b4869508a0	updated clap	2019-08-08 14:47:31 -07:00
sabrina-shanman	8347d9d23e	Update LODManager setter in TabletLODTools.qml	2019-08-08 13:59:50 -07:00
sabrina-shanman	99a774c89c	Do not display high viewing distance as 20:0 vision	2019-08-08 13:03:40 -07:00
sabrina-shanman	1571c2be27	Fix LOD math	2019-08-08 13:03:20 -07:00
Anthony J. Thibault	ef81ccafed	Hooked up seated clap	2019-08-08 13:02:19 -07:00
RebeccaStankus	ecbcb6a178	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-08 11:16:31 -07:00
Anthony J. Thibault	5d405cac3b	Merge branch 'master' into feature/reaction-intro-loop-outro	2019-08-08 09:56:45 -07:00
Anthony J. Thibault	317c2f5219	sitting raise hand	2019-08-08 09:37:03 -07:00
sabrina-shanman	9c16fcfdef	Make the LOD half angle the definitive LOD variable	2019-08-07 17:23:04 -07:00
Sam Gateau	c01ab954e3	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-08-07 16:39:11 -07:00
Anthony J. Thibault	e5e012a83e	agree, point and disagree sitting emotes	2019-08-07 14:15:29 -07:00
Zach Fox	72e14a32f9	Implement the Help App skeleton; Implement Help App Controls; Implement Help App About	2019-08-07 17:13:20 -04:00
Sabrina Shanman	0728df8a8f	Merge pull request #16025 from sabrina-shanman/picks_debug ... (BUGZ-1059) Improve debug API for picks/pointers	2019-08-07 12:01:26 -07:00
sabrina-shanman	66dbb08b01	Be explicit about pickType/pointerType being returned when getting script parameters	2019-08-07 10:44:43 -07:00
sabrina-shanman	4cb925e973	Fix jsdoc for getPointerScriptParameters	2019-08-07 10:04:44 -07:00
sabrina-shanman	8cde93973d	Disambiguate pick and pointer types in the returned properties	2019-08-07 09:56:23 -07:00
Anthony J. Thibault	147753309f	Updated clap02 with new version that is not as slow.	2019-08-06 17:57:27 -07:00
Anthony J. Thibault	3f6b488f27	Added intro-loop-outro phases for raiseHand, applaud and point	2019-08-06 17:39:30 -07:00
sabrina-shanman	0d5260bccc	More LOD renaming with focus on angles	2019-08-06 16:35:41 -07:00
sabrina-shanman	6db6890bac	Deprecate LODManager script properties: boundaryLevelAdjust and octreeSizeScale	2019-08-06 15:54:28 -07:00
sabrina-shanman	bc3acfa3c0	Clean up and re-name to reflect what uses octreeSizeScale and what uses ... visibilityDistance	2019-08-06 15:46:10 -07:00
Simon Walton	baa586939c	Merge branch 'master' into min_threadpool_2	2019-08-06 14:25:37 -07:00
milad	75708170dd	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-06 13:23:32 -07:00
Shannon Romano	93d5d9bd3f	Merge pull request #15988 from ctrlaltdavid/DOC-98 ... DOC-98, DOC-114: PlatformInfo API changes JSDoc	2019-08-06 13:22:36 -07:00
Shannon Romano	9e0e6f9d5e	Merge pull request #16003 from ctrlaltdavid/DOC-84 ... DOC-84: Update JSDoc with glTF	2019-08-06 13:22:04 -07:00