7163 commits

Author	SHA1	Message	Date
Zach Fox	486f33b4bd	Merge branch 'master' of github.com:highfidelity/hifi into MS15103_snapFolderCrash	2018-05-16 14:14:35 -07:00
Zach Fox	585957409d	Merge pull request #13141 from zfox23/spectatorCameraImprovements ... Spectator Camera V2	2018-05-16 13:38:07 -07:00
Zach Fox	f8215b5999	Fix final? crash	2018-05-16 11:05:21 -07:00
Zach Fox	c34605f686	GIF snapshots using the Snap app are still weird, but the bug is fixed	2018-05-16 10:15:51 -07:00
Zach Fox	012ae741a5	Fix MS15103: Interface crashes on snap if snap dir is deleted	2018-05-16 09:52:19 -07:00
John Conklin II	aca261af3e	Merge pull request #12939 from Cristo86/android_places_goto ... Android Search & Go To	2018-05-15 16:43:38 -07:00
Gabriel Calero	b80597a436	Restore display plugin activation/deactivation	2018-05-15 15:51:11 -03:00
Zach Fox	bccaa2dbe5	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-15 11:50:38 -07:00
Gabriel Calero	306b8cc68a	Set HomeActivity transparent to avoid texture corruption (black and white)	2018-05-15 15:14:17 -03:00
Zach Fox	a54ce96ac2	Clement's CR	2018-05-14 17:46:58 -07:00
NissimHadar	d4d2f3c957	Moved ownership of test location into the Test Scripting class.	2018-05-14 16:32:04 -07:00
Zach Fox	43254e2981	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-14 15:12:44 -07:00
NissimHadar	5f219e27f7	Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1	2018-05-14 10:35:48 -07:00
Gabriel Calero	db460e9856	Put back the worker thread for account manager in android	2018-05-11 16:09:40 -03:00
John Conklin II	5cd225e4de	Merge pull request #12947 from jherico/feature/splash2 ... Additional work on splash screen	2018-05-11 11:26:37 -07:00
NissimHadar	1364f4391d	Can store JSON object.	2018-05-10 18:02:44 -07:00
Seth Alves	826c427e2a	trying to sort-out audio-stream logging	2018-05-10 15:42:59 -07:00
Seth Alves	32d10641dc	don't enable so much logging when 'verbose logging' is turned on	2018-05-10 14:41:54 -07:00
Gabriel Calero	a1a48d9b9e	Merge remote-tracking branch 'upstream/master' into android_places_goto	2018-05-10 18:24:26 -03:00
Zach Fox	ce575d367a	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-10 09:31:02 -07:00
Zach Fox	44cfa95830	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-09 15:01:24 -07:00
Seth Alves	16e832ac08	use setFilterRules rather than specifying each logging category to suppress	2018-05-09 13:01:49 -07:00
Seth Alves	7466d08f1f	more suppression of logging	2018-05-09 13:01:49 -07:00
Howard Stearns	bf466344ee	Merge pull request #13135 from zfox23/MS14951_fixSnapshotHotkeySound ... MS14951: Fix Snapshot hotkey sound playback	2018-05-09 11:07:46 -07:00
Sam Gateau	17350a79dd	Merge pull request #13046 from NissimHadar/commandLineParametersForAutotester ... Command line parameters for autotester	2018-05-09 10:51:31 -07:00
Gabriel Calero	843282739e	Remove unused includes and white spaces	2018-05-09 14:16:51 -03:00
Thijs Wenker	a42491ded7	Merge pull request #13055 from misslivirose/remove-help-ftue ... Do not open help on first run	2018-05-09 18:48:05 +02:00
Zach Fox	06c6f55069	MS14951: Fix Snapshot hotkey sound playback	2018-05-09 09:35:42 -07:00
Gabriel Calero	5e337e90a3	Deactivates display plugin when qt app goes to background	2018-05-08 16:55:04 -03:00
Gabriel Calero	da69c9d077	Make qt application not stop in background and remove separete thread	2018-05-08 15:45:33 -03:00
NissimHadar	eb14658bc5	Per Austin's comments.	2018-05-08 11:13:06 -07:00
NissimHadar	8ad13826bd	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-07 13:11:39 -07:00
NissimHadar	2e51a66441	Use 'standard' format for command line parameter with multiple options.	2018-05-07 13:01:18 -07:00
John Conklin II	6ac43c34c2	Merge pull request #13032 from druiz17/fix-spamming-reset-sensors ... don't spam resetSensors function when holding down Qt::Key_Apostrophe	2018-05-07 10:52:51 -07:00
NissimHadar	481eddb2a3	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-07 08:24:03 -07:00
Bradley Austin Davis	38f43bdc68	Disable current splash frame implementaton	2018-05-04 16:40:05 -07:00
Bradley Austin Davis	803bd284a6	Alternate shader	2018-05-04 16:40:05 -07:00
Brad Davis	72526781d9	Additional work on splash screen	2018-05-04 16:40:05 -07:00
Cristian Luis Duarte	03ca427234	Merge remote-tracking branch 'hifi/master' into android_places_goto	2018-05-04 20:18:15 -03:00
Stephen Birarda	ec354620db	Merge pull request #12956 from huffman/feat/client-texture-selection-baking ... Add support for client texture selection	2018-05-04 16:14:43 -07:00
Cristian Luis Duarte	8c96d2be3c	Patch for secondary camera assert error on Android	2018-05-04 18:44:07 -03:00
Clement	ad60a79180	Fix for android builds	2018-05-04 14:43:28 -07:00
Clement	b04c5bd0db	CR	2018-05-04 14:43:16 -07:00
Cristian Luis Duarte	9f5365a277	Merge remote-tracking branch 'hifi/master' into android_places_goto	2018-05-04 18:38:08 -03:00
Liv Erickson	ee0af079cf	merge from upstream master and fix conflict	2018-05-04 14:34:38 -07:00
NissimHadar	2311fa33fb	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-04 14:13:43 -07:00
NissimHadar	aef5ea0936	Correct usage of the test script URL.	2018-05-04 12:30:13 -07:00
Zach Fox	1da840984b	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-04 10:24:28 -07:00
Clement	487a63025f	Fix warning	2018-05-03 18:19:52 -07:00
Clement	d87cd2af6e	Update avatar query names	2018-05-03 18:19:30 -07:00