8143 commits

Author	SHA1	Message	Date
Howard Stearns	33f1bd965e	Merge pull request #15549 from SimonWalton-HiFi/call-reset-in-NodeList ... Call correct NodeList::reset() from Application	2019-05-13 19:49:41 -07:00
Simon Walton	305a215d21	Pass a QObject context for the functor	2019-05-13 15:50:04 -07:00
Simon Walton	ede8859cc7	Call correct NodeList::reset() from Application	2019-05-13 14:38:34 -07:00
Shannon Romano	32d3014d0d	Merge pull request #15301 from SaracenOne/disable_away_on_focus_loss_push_2 ... case 22190: Disable triggering away state when interface focus lost	2019-05-13 13:22:28 -07:00
Sam Gondelman	4c4589271c	Merge pull request #15469 from SamGondelman/switch ... Case 22379: Run-time switch for deferred/forward rendering	2019-05-13 11:14:26 -07:00
SamGondelman	eb8c722080	fix runtime switch	2019-05-13 09:58:55 -07:00
Shannon Romano	5c9570cffb	Merge pull request #15539 from jherico/fix/watchdog_spam ... BUGZ-131: Reduce spam from watchdog thread	2019-05-10 14:24:15 -07:00
Brad Davis	0f8ddae9df	Reduce spam from watchdog thread	2019-05-10 12:01:07 -07:00
Shannon Romano	0d28932181	Merge pull request #15529 from Atlante45/feat/more-ice-logging ... Add instrumentation to help track down connection issues	2019-05-10 11:57:24 -07:00
Clement	0a7352074c	Fix android build	2019-05-09 17:17:43 -07:00
Shannon Romano	930032bcc6	Merge pull request #15511 from AndrewMeadows/build-shapes-off-mainloop ... case 22166: Build complex shapes in ThreadPool instead of MainLoop	2019-05-09 17:14:50 -07:00
SamGondelman	59e7db2d6b	Merge remote-tracking branch 'upstream/master' into switch	2019-05-09 11:42:05 -07:00
Clement	b3d0705e39	Extend ICE logging + make it more searchable	2019-05-08 18:38:00 -07:00
Anthony Thibault	4ee39355f1	Merge pull request #15525 from hyperlogic/feature/backtrace-gpu-ident ... Add gpu_name, gpu_driver & gpu_memory to crash annotations	2019-05-08 16:09:13 -07:00
Anthony Thibault	78403e4436	Add gpu_name, gpu_driver & gpu_memory to crash annotations ... This may help us identify the hardware causing early gl initialization errors.	2019-05-08 13:33:45 -07:00
Shannon Romano	15484436ca	Merge pull request #15507 from danteruiz/dockable-windows ... case LILY-30: Dockable Interactive Windows	2019-05-08 12:16:04 -07:00
danteruiz	3806631bf1	dockable window	2019-05-08 10:04:31 -07:00
Shannon Romano	e90f91f109	Merge pull request #15488 from sethalves/fix-indep-camera ... case 22412: allow independent camera to be set by scripts 👍 by QL for pre-merge testing in the manu ticket	2019-05-07 09:38:54 -07:00
Andrew Meadows	e770bd6142	build CollisionShapes and load RigidBodies even when not yet stepping	2019-05-06 17:37:35 -07:00
Andrew Meadows	915cbb69df	split work out of EntityTree::update(), call it preUpdate()	2019-05-06 17:37:35 -07:00
Andrew Meadows	3eed8218ca	overhaul of MotionState and shape creations	2019-05-06 17:37:35 -07:00
Shannon Romano	86f562de1b	Merge pull request #15515 from kencooke/midi-devicechange-audio-deadlock ... Case 20521: Unplugging headphones with hifi open causes freeze	2019-05-06 15:03:56 -07:00
Shannon Romano	1636256068	Merge pull request #15496 from davidkelly/dk/bugz-6 ... Increase max heartbeat time to 10 sec on mac	2019-05-06 13:03:25 -07:00
Ken Cooke	ea9690d72b	Disable MIDI rescan after devicechange, to avoid deadlock	2019-05-06 10:46:54 -07:00
Shannon Romano	4c31c6f6e5	Merge pull request #15453 from SimonWalton-HiFi/avatar-verification ... Avatar verification	2019-05-06 08:04:06 -07:00
John Conklin II	16ece6c2fc	Merge pull request #15493 from amantley/bugPushToTalk ... When you unmute using ctrl-m during push to talk, you now see that reflected in the audio icon	2019-05-03 09:03:36 -07:00
Angus Antley	1f004f34c4	added check for valid dynamic casts	2019-05-02 21:59:11 -07:00
Angus Antley	f019fa3a7c	Merge remote-tracking branch 'upstream/master' into bugPushToTalk	2019-05-02 18:28:34 -07:00
Sam Gateau	46f4b13f2f	Merge pull request #15499 from samcake/coco ... BUGZ-92: Refresh rate Throttling refinements	2019-05-02 17:24:34 -07:00
Shannon Romano	5d3c88b964	Merge pull request #15502 from sabrina-shanman/crash_snapshot_no-directory ... (case 22368) Fix snapshots freezing Interface when no snap directory defined	2019-05-02 15:59:25 -07:00
David Kelly	0b2d11aeef	Merge branch 'master' of github.com:highfidelity/hifi into dk/bugz-6	2019-05-02 12:37:16 -07:00
Shannon Romano	caefa3e06a	Merge pull request #15362 from ctrlaltdavid/M22075 ... Case 22075: Controller JSDoc update	2019-05-02 11:34:58 -07:00
Sam Gateau	7f22ac1be4	FIxing a warning on unix	2019-05-02 08:57:19 -07:00
Sam Gateau	c7702048ad	Merge branch 'master' of github.com:highfidelity/hifi into coco	2019-05-02 08:50:30 -07:00
David Rowe	e217909f17	Merge branch 'master' into M22075	2019-05-02 20:19:17 +12:00
amantley	a8b54cbe10	changed reinterpret to dynamic cast	2019-05-01 17:32:39 -07:00
Sam Gateau	7f71ec8d3d	Apply my own comments	2019-05-01 16:57:03 -07:00
danteruiz	f65f28c52a	refresh rate controller	2019-05-01 16:04:33 -07:00
David Kelly	02b960db33	Increase max heartbeat time to 10 sec on mac (for now - not long-term solution)	2019-05-01 15:06:02 -07:00
amerhifi	a878232c6d	setting default cursor after display initialization for systems that do not call checkcursor on startup	2019-05-01 14:31:40 -07:00
amantley	4b7b416abf	corrected the behaviour for ctrl-m so that when you unmute during push to talk you will see it reflected in the audio icon color	2019-05-01 14:00:56 -07:00
Seth Alves	9321cf89d3	allow independent camera to be set by scripts	2019-05-01 07:20:52 -07:00
sabrina-shanman	ef1ff2183b	Fix snapshots freezing Interface when no snap directory defined	2019-04-30 17:45:17 -07:00
amer cerkic	df3049cb44	simplified way to switch to system cursor if non hmd mode	2019-04-30 11:49:33 -07:00
amer cerkic	978108b3ba	found a more simplified way to stop rendering the mouse unless its the Reticle cursor	2019-04-30 11:34:11 -07:00
amer cerkic	7d2b75673c	fixed syntax for cursor	2019-04-29 16:42:49 -07:00
SamGondelman	8c032ea83f	Merge remote-tracking branch 'upstream/master' into switch	2019-04-29 11:08:01 -07:00
Simon Walton	60389017a4	Merge from master, including avatar protocol change ... Tony had added HandController version-type.	2019-04-26 18:51:41 -07:00
David Rowe	407ce745d5	Merge branch 'master' into M22075 ... # Conflicts: # libraries/controllers/src/controllers/Actions.cpp	2019-04-27 10:51:13 +12:00
SamGondelman	ca5c7e3904	runtime switch for deferred/forward rendering	2019-04-26 14:37:27 -07:00