7039 commits

Author	SHA1	Message	Date
luiscuenca	50ca09b3b4	minor fixes	2018-04-30 16:26:04 -07:00
luiscuenca	2de982a5a2	Added script types and better script reload	2018-04-30 12:04:35 -07:00
luiscuenca	12f578c93c	More fixes	2018-04-25 19:46:31 -07:00
luiscuenca	e0770f06b1	Add scripts to Model Packager	2018-04-25 19:35:26 -07:00
luiscuenca	165c3214a7	Avatar Scripts	2018-04-24 18:43:53 -07:00
Brad Davis	861200db27	Attempt to shutdown web surfaces more consistently	2018-04-23 14:32:38 -07:00
Sam Gateau	7842ee8eac	Merge pull request #12962 from SamGondelman/menu ... Android: Hide menu and fix shader compilation	2018-04-23 09:51:20 -07:00
David Rowe	34d0a892a0	Point to example using Hardware.Application item	2018-04-21 15:01:46 +12:00
David Rowe	748052614f	Doc review	2018-04-21 12:45:00 +12:00
SamGondelman	d59f368ad6	hide menu, fix shaders	2018-04-20 17:38:38 -07:00
David Rowe	7087abd201	Merge branch 'master' into 21815	2018-04-21 10:49:56 +12:00
Seth Alves	c20346ca53	Merge pull request #12937 from SamGondelman/startup ... Make Audio.cpp threadsafe	2018-04-20 11:36:08 -07:00
SamGondelman	3b4b43cf66	try to fix audio crash on startup	2018-04-20 10:23:47 -07:00
Sam Gateau	1e086332cc	Merge pull request #12911 from jherico/feature/splash ... Pre-requisite changes for splash screen rendering	2018-04-19 09:19:05 -07:00
Stephen Birarda	c4ad93bafb	Merge pull request #12782 from SimonWalton-HiFi/qregexp ... Replace LogHandler repeated regex scheme with assigned ID tracking scheme	2018-04-18 17:28:48 -07:00
John Conklin II	710bfb894a	Merge pull request #12907 from AndrewMeadows/more-correct-stats-002 ... more correct stats names	2018-04-18 10:50:38 -07:00
John Conklin II	005b6a6b1f	Merge pull request #12893 from ctrlaltdavid/21843 ... Fix overlay toggling	2018-04-18 10:49:05 -07:00
Stephen Birarda	95c172f418	Merge branch 'stable' of github.com:highfidelity/hifi into merge-back-stable-66	2018-04-17 15:34:46 -07:00
Zach Fox	3b8e52ea41	Merge pull request #12862 from zfox23/discovery_April2018 ... Discovery: April 2018 (Huge PR; see description)	2018-04-17 15:11:50 -07:00
Brad Davis	d478204722	Working on splash rendering	2018-04-17 14:17:41 -07:00
David Rowe	e3edc45081	Document NavigationFocused	2018-04-18 07:04:55 +12:00
David Rowe	c1ede6ef58	Merge branch 'master' into 21815 ... # Conflicts: # tools/jsdoc/plugins/hifi.js	2018-04-17 11:54:56 +12:00
David Rowe	9f83c606e9	Controller API JSDoc	2018-04-17 11:46:40 +12:00
Anthony J. Thibault	0a162e62b0	transmit sendAll packet in nodeActivated signal callback ... (cherry picked from commit 9f1a8290148da12849935c916b2e0a59864cb49b)	2018-04-16 16:16:56 -07:00
Andrew Meadows	a80cf49eb3	split 'ETRupdate' out of 'postPhysics' stat context	2018-04-16 13:31:36 -07:00
Andrew Meadows	ace32193b4	more correct stat names	2018-04-16 13:31:36 -07:00
Sam Gateau	3ac4a1db2d	Merge pull request #12850 from SimonWalton-HiFi/early-trace ... Enable Interface tracing from earliest execution point	2018-04-16 10:24:55 -07:00
Zach Fox	071bf35683	Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018	2018-04-16 10:11:44 -07:00
David Rowe	df31d20430	Fix overlay toggling	2018-04-14 17:06:34 +12:00
Seth Alves	a56f3f4a10	code review	2018-04-12 19:06:12 -07:00
Simon Walton	76468f7f26	Use existing DISABLE_WATCHDOG global to turn off thread entirely	2018-04-12 16:58:13 -07:00
Clement	157ca8cd68	Update docs with correct qt version	2018-04-12 16:21:26 -07:00
Simon Walton	5c141aa5e9	Add --disableWatchdog command-line option ... Watchdog still runs but doesn't abort on timeout. Also fixes for previous tracing improvements.	2018-04-12 09:28:28 -07:00
Zach Fox	a9b9a1cb10	Commerce: Gifts	2018-04-10 15:54:19 -07:00
Seth Alves	f81836c830	support specification of named landing-points in serverless-domain json files	2018-04-10 14:25:59 -07:00
Simon Walton	ca5720c015	Take out superfluous DependencyManager::set<tracing::Tracer>()	2018-04-10 13:52:46 -07:00
Simon Walton	cf3648409d	Allow duration for tracing, other fixes	2018-04-10 13:14:52 -07:00
Simon Walton	513a4875f0	Move --traceFile option to start of main()	2018-04-10 13:13:47 -07:00
Stephen Birarda	1d76dea9f6	Merge pull request #12818 from highfidelity/RC66 ... Merge back RC66 to master	2018-04-06 10:43:01 -07:00
John Conklin II	9e21bab67e	Merge pull request #12748 from AndrewMeadows/untangle-003 ... cleanup around simulation-ownership	2018-04-05 10:58:45 -07:00
Seth Alves	4b0d338e57	on first run, send user to serverless tutorial rather than checking for a local sandbox	2018-04-04 18:00:11 -07:00
Simon Walton	692ccfc09b	Create HIFI_FCDEBUG(_ID) variants that require a category ... Original macros use default settings.	2018-04-04 09:49:15 -07:00
Simon Walton	7d16ca9c1c	Remove uses of addRepeatedMessageRegex() and its implementation ... Change to new log-message ID scheme.	2018-04-03 17:54:01 -07:00
Clément Brisset	3d4490f3fd	Merge pull request #12737 from highfidelity/RC66 ... RC66 mergeback	2018-04-03 15:39:16 -07:00
Andrew Meadows	73fa6d3d2f	slightly simpler EntityMotionState delete logic	2018-03-30 13:18:32 -07:00
Andrew Meadows	6837d042ad	move entityCollisionWithEntity to PhysicalEntitySimulation	2018-03-30 13:18:32 -07:00
John Conklin II	5013760aa1	Merge pull request #12742 from jherico/fix/rc66_crashes ... Fix/rc66 crashes	2018-03-29 18:04:52 -07:00
Seth Alves	dcfebde54a	put back the pre serverless-domain behavior for when a json file is dragged-and-dropped into the interface window -- import the json rather than load as a serverless-domain	2018-03-29 10:50:43 -07:00
John Conklin II	97d9c1b735	Merge pull request #12726 from jherico/fix/rc66_crashes ... Attempt to resolve potential overlay crashes at shutdown	2018-03-29 09:37:23 -07:00
Brad Hefta-Gaub	16df773de4	Merge pull request #12721 from highfidelity/RC66 ... RC66 - Mergeback	2018-03-28 09:55:46 -07:00