29975 commits

Author	SHA1	Message	Date
Zach Fox	c13697803d	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-16 12:14:44 -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
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
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
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
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
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
Shannon Romano	8c981140b0	Merge pull request #16005 from ctrlaltdavid/DOC-61 ... DOC-61: Render API JSDoc	2019-08-06 13:18:17 -07:00
milad	1a95c126c3	working version but taking a snapshot of added emoji code before removing for handoff	2019-08-06 13:13:38 -07:00