83939 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
kasenvr	ee554ad8f1	Remove hardcoded checkForUpdates.js version value ... Uses About API instead of the deprecated HifiAbout API.	2020-09-02 18:40:43 -04:00
HifiExperiments	1403f8908f	don't capture mouse when other windows or menus are active	2020-09-02 11:58:22 -07:00
Martin Allerton	86b2f1894c	Updated add location script code ... Have not been able to test this due to not been near a proper machine, but I believe this code change should hopefully resolve the issue with the add location beacon script being wrong.	2020-09-02 19:46:47 +01:00
HifiExperiments	5281f89d0d	FUUUUUUUCK FINALLY	2020-09-02 11:28:43 -07:00
Kalila L	40219e6ff9	Merge branch 'master' into fix/domain-threading-defaults	2020-09-02 05:41:28 -04:00
David Rowe	9fc9b203ae	Rename constant	2020-09-02 12:45:44 +12:00
Kalila L	b8181d92a5	Merge branch 'master' into pr/441	2020-09-01 17:42:35 -04:00
kasenvr	60e6d99aff	Merge branch 'master' into feature/package-startup-interface	2020-09-01 17:40:37 -04:00
David Rowe	2bfdaa31ab	Add FIXME for missing relative URL handling case	2020-09-02 09:20:35 +12:00
Kalila L	4096d75bb4	Add checkbox for showing extra source logs.	2020-09-01 16:46:22 -04:00
HifiExperiments	9b47d924b3	fix merge conflict	2020-09-01 09:37:59 -07:00
HifiExperiments	ae944fd985	merge with master	2020-09-01 09:34:54 -07:00
HifiExperiments	75fa55baf7	tabs.css issue?	2020-09-01 09:34:11 -07:00
David Rowe	4214182b2f	Tidy JSON relative URLs importing	2020-09-01 21:08:52 +12:00
kasenvr	f2cc30d6d9	Merge pull request #276 from HifiExperiments/parenting ... Improving performance of entity updates	2020-09-01 04:34:51 -04:00
kasenvr	6a872ef525	Merge pull request #586 from makitsune/relative-urls ... Allow resolving relative urls when importing entities json	2020-09-01 04:34:12 -04:00
HifiExperiments	776b1071a0	try to do it without QCursor::setPos	2020-08-31 15:44:06 -07:00
kasenvr	e4a80a9931	Merge pull request #465 from kasenvr/feature/domain-metadata-exporter ... Domain Metadata Exporter	2020-08-31 18:08:37 -04:00
David Rowe	22e6ae9710	Fix hasBlendedMeshes() value	2020-08-31 21:44:19 +12:00
David Rowe	bd1be872a8	Support using blendshapes in file without needing an FST	2020-08-31 21:31:55 +12:00
Heather Anderson	ee43cfd892	add more details to messages logged in entity scripts	2020-08-30 23:47:54 -07:00
Kalila L	61d12c6641	Caps the variables.	2020-08-31 01:03:24 -04:00
Kalila L	58c1518d0b	Updating some .cpp and .h URLs.	2020-08-31 01:00:05 -04:00
Kalila L	6e39e048be	First pass at centralizing some URLs.	2020-08-31 00:43:30 -04:00
Kalila L	b988bd15af	Merge remote-tracking branch 'origin/feature/add-update-notififier' into fix/URL-migrations	2020-08-31 00:06:36 -04:00
Heather Anderson	2067a438c2	fixed apparent typo preventing the CUSTOM_ASSIGNMENT_SERVER_HOSTNAME_OPTION or CUSTOM_ASSIGNMENT_SERVER_PORT_OPTION options from being reachable	2020-08-30 17:20:39 -07:00
David Rowe	0fcc73d5cd	Fix multiple blendshapes targeted to one model blendshape	2020-08-31 11:20:56 +12:00
Kalila L	1e15458c64	Merge branch 'feature/add-update-notififier' of https://github.com/kasenvr/project-athena into feature/add-update-notififier	2020-08-30 13:58:12 -04:00
Kalila L	ec25ac9e7d	Update checkForUpdates.js ... "retrievedMetadata" -> "vircadiaMetadata"	2020-08-30 13:57:45 -04:00
kasenvr	0b1dce14a0	Apply suggestions from code review ... Co-authored-by: David Rowe <david@ctrlaltstudio.com>	2020-08-30 13:56:09 -04:00
David Rowe	5d02e0fe28	Fix blendshapes on planar meshes	2020-08-29 16:12:10 +12:00
David Rowe	128745ef36	Make blendshapes work for glTF with multiple mesh parts	2020-08-29 16:11:35 +12:00
David Rowe	a819b140dc	Don't weight blendshapes by default blendshape values	2020-08-29 14:17:54 +12:00
David Rowe	f946791791	Make blendshaps work for glTF with single mesh part	2020-08-29 14:17:13 +12:00
David Rowe	77dbe7a254	Rename FACESHIFT_BLENDSHAPES to BLENDSHAPE_NAMES	2020-08-29 11:21:56 +12:00
David Rowe	e0767e2f8c	Add HFM model dump for FBX files	2020-08-29 11:02:54 +12:00
David Rowe	98cef38aea	Initial tidying	2020-08-29 09:14:49 +12:00
daleglass	c099cfe904	Merge pull request #652 from kasenvr/kasenvr-patch-1 ... Update BUILD.md	2020-08-27 23:39:31 +02:00
daleglass	0f6f788879	Merge pull request #641 from ArcadeFever/fix/AC-placeholder-rebrand ... changed url for AC script examples from HiFi to Vircadia github	2020-08-27 23:34:58 +02:00
daleglass	aba63051e5	Merge pull request #606 from AleziaKurdis/530_593_CrAppUIadust ... Change colorSpread color-picker and other small fixes	2020-08-27 23:30:16 +02:00
Dale Glass	5a8be4de4b	Fix -Wclass-memaccess warnings	2020-08-27 19:49:48 +02:00
Dale Glass	baa0fd34f4	Fix unsigned warnings	2020-08-27 19:48:27 +02:00
Dale Glass	eeb13fe17f	Fix numerical precision warning	2020-08-27 19:27:11 +02:00
Dale Glass	afa44dccf6	Fix initialization order warning ... https://stackoverflow.com/questions/30364585/will-be-initialized-after-wreorder	2020-08-27 19:27:11 +02:00
Dale Glass	a8ab9307d0	Add fall-through comments to fix GCC warnings ... Unfortunately the attribute can't be used since we're not on C++17 yet.	2020-08-27 19:27:11 +02:00
Dale Glass	e6bd75d497	Fix incorrect fall-through in RenderPipelines	2020-08-27 19:27:11 +02:00
Kalila L	abac59c09b	Add checkForUpdates.js to the defaultScripts.js	2020-08-27 05:38:50 -04:00
Kalila L	4836f4b369	NOTE: Undo commit before merging, for testing purposes only.	2020-08-27 05:32:07 -04:00
Kalila L	68055f2458	Add update checker and notifier for Interface.	2020-08-27 05:30:45 -04:00
Kalila L	e8526aa6b7	Update chat to accept system notifications.	2020-08-27 05:28:07 -04:00