7019 commits

Author	SHA1	Message	Date
Gabriel Calero	c8fe45eb8f	Remove debug statements and unused code. Put JNI code in a separated file.	2018-04-19 11:41:59 -03:00
Gabriel Calero	e3b94b163c	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-16 14:55:16 -03: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
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
Gabriel Calero	bd4a7ce4fa	Hide jump button while moving. Fix jump button right alignment in pixel	2018-04-12 19:02:03 -03: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
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
Gabriel Calero	b30cb25a3f	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-09 12:20:35 -03:00
Gabriel Calero	e85f5c97dc	Remove bottom bar. Apply new design for android	2018-04-09 11:41:00 -03:00
Stephen Birarda	1d76dea9f6	Merge pull request #12818 from highfidelity/RC66 ... Merge back RC66 to master	2018-04-06 10:43:01 -07:00
Gabriel Calero	0da2c972e3	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-05 16:22:56 -03: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
Gabriel Calero	99d8f822b2	Fix crash selecting domain for second time. Stop rendering while Goto activity is started	2018-04-04 19:24:26 -03:00
Gabriel Calero	ddbf4417ff	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-04 12:24:25 -03:00
Clément Brisset	3d4490f3fd	Merge pull request #12737 from highfidelity/RC66 ... RC66 mergeback	2018-04-03 15:39:16 -07:00
Gabriel Calero	2ff13270ed	Go back to GoTo screen	2018-04-02 12:22:21 -03: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
Gabriel Calero	b123b67134	Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash	2018-03-30 15:38:36 -03: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
Brad Davis	aacfe92751	Don't trigger crashes from timers while waiting for some operation on exit	2018-03-28 09:09:56 -07:00
Seth Alves	bb101956a6	fix entity importing	2018-03-27 18:25:43 -07:00
Gabriel Calero	8558759d41	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-03-23 16:56:53 -03:00
Dante Ruiz	a14d5c6546	make alternate keys work	2018-03-23 11:55:16 -07:00
Dante Ruiz	1d17658c80	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-22 16:29:16 -07:00
Seth Alves	6c1d713968	review	2018-03-21 19:21:57 -07:00
Seth Alves	916ed3a0d4	review	2018-03-21 16:18:31 -07:00
Seth Alves	196f621a60	remove unneeded setSessionUUID	2018-03-21 15:21:49 -07:00
Seth Alves	ef52ae13ee	rearrange domain-url-changed signals	2018-03-21 14:30:00 -07:00
Gabriel Calero	35935ed41a	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-03-21 17:41:02 -03:00
Gabriel Calero	11bfc1ca74	Add Goto as splash screen in android	2018-03-21 17:40:14 -03:00
Dante Ruiz	9d8770b134	changing speed	2018-03-21 13:25:50 -07:00
Seth Alves	4033af9b11	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-21 11:11:43 -07:00
Dante Ruiz	cce77e3e68	made requested changes	2018-03-21 10:15:42 -07:00
Ken Cooke	f5f4e2a780	Merge pull request #12635 from ctrlaltdavid/21776 ... Fix Window hasFocus(), setFocus(), and raiseMainWindow()	2018-03-21 09:27:51 -07:00
Dante Ruiz	86cd5ffa30	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-21 08:49:25 -07:00
Seth Alves	585a523823	unmangle merge	2018-03-20 11:17:56 -07:00
John Conklin II	40d6e51da8	Merge pull request #12597 from ElderOrb/FB12956 ... Fix for broken 'toggle audio meter' button	2018-03-20 11:03:32 -07:00
Seth Alves	bd10cd6fa9	'disconnect' from serverless domain when transitioning from a serverless-domain to a DNS name (rather than a place name)	2018-03-20 10:53:17 -07:00
Stephen Birarda	cd887b5faf	Merge pull request #12654 from huffman/feat/content-zip-upload ... Add support for .content.zip content uploads	2018-03-20 10:07:53 -07:00
Seth Alves	e3022da787	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-16 09:34:38 -07:00
Atlante45	d96f7553d9	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2018-03-15 15:22:43 -07:00
Ryan Huffman	03c8c14f61	Fix content replacement being allowed from all URLs	2018-03-15 12:49:22 -07:00