7340 commits

Author	SHA1	Message	Date
John Conklin II	378e84b7ce	Merge pull request #13257 from danteruiz/rc68-reload-scripts ... adding back reload scripts shortcut and clean up AboutUtil(RC68)	2018-06-01 15:10:28 -07:00
Zach Fox	96858c9586	MS15529: Add secondary camera snapshot notification flag	2018-06-01 13:38:41 -07:00
John Conklin II	194c33bf19	Merge pull request #13254 from danteruiz/add-back-reload-scripts ... adding back reload scripts shortcut and clean up AboutUtil	2018-06-01 09:31:13 -07:00
Dante Ruiz	caa7f64865	fixing show overlays menu item	2018-05-31 10:58:04 -07:00
Zach Fox	259803f856	MS14615: Prevent memory overuse when minimized	2018-05-31 10:30:25 -07:00
Andrew Meadows	003e444246	Merge branch 'master' into 'workload'	2018-05-30 16:04:13 -07:00
John Conklin II	6095a3b319	Merge pull request #13082 from jherico/feature/shader_cache ... Shader load time performance optimiziations	2018-05-30 13:55:34 -07:00
Gabriel	6fa58fce1f	Update Application.cpp ... Remove the mic bar for android	2018-05-30 15:40:05 -03:00
Dante Ruiz	3942f397d0	adding back reload scripts	2018-05-30 11:15:47 -07:00
Dante Ruiz	c4358aad81	remove dead code in Application::keyPressEvent	2018-05-30 07:33:32 -07:00
Dante Ruiz	ea10dc176a	adding back reload scripts	2018-05-29 17:38:02 -07:00
Gabriel	cf499ca047	Update Application.cpp ... Remove the mic bar for android	2018-05-29 16:42:09 -03:00
NissimHadar	9ed8c04097	Merge branch 'master' of github.com:highfidelity/hifi into fixCameraMode	2018-05-24 17:40:21 -07:00
Anthony Thibault	eae5215d94	Merge pull request #13206 from ctrlaltdavid/21872-c ... JSDoc fixes	2018-05-24 16:44:55 -07:00
Bradley Austin Davis	3beb77694f	Cached shader binaries and uniform data for shaders	2018-05-24 12:42:33 -07:00
Stephen Birarda	2cb7c9cc62	add a BUILD_TYPE to BuildInfo, fix conditional	2018-05-24 12:04:32 -07:00
Stephen Birarda	55bf70991b	cleanup wording and formatting for version in window title	2018-05-24 12:03:03 -07:00
Stephen Birarda	c3595a3216	pass STABLE_BUILD instead of BUILD_BRANCH through cmake	2018-05-24 12:03:03 -07:00
samcake	40370f860a	Merge branch 'workload' of https://github.com/highfidelity/hifi into workload	2018-05-23 17:26:08 -07:00
Andrew Meadows	d50da2babc	Merge 'master' into 'workload'	2018-05-23 14:51:05 -07:00
Dante Ruiz	c2ceb48a28	fixing key conflicts	2018-05-23 14:16:05 -07:00
NissimHadar	06203d44d8	Correct Camera.mode command.	2018-05-22 17:08:28 -07:00
Simon Walton	f702374db3	Just have one const for concurrent downloads	2018-05-22 10:16:44 -07:00
Dante Ruiz	249d22b4b4	Merge branch 'master' of github.com:highfidelity/hifi into menu-updates	2018-05-21 10:31:24 -07:00
Sam Gondelman	6eb6a5b767	Merge pull request #13197 from gcalero/your_last_location ... Add "Your Last Location" to Android Home	2018-05-21 09:28:56 -07:00
David Rowe	6d4f704279	Regularize some JSDoc usage	2018-05-21 09:32:10 +12:00
druiz17	f2807e38f9	fix goto shortcut	2018-05-19 17:36:46 -07:00
Dante Ruiz	3b59af3ed7	Merge branch 'master' of github.com:highfidelity/hifi into menu-updates	2018-05-18 16:42:31 -07:00
Sam Gateau	07f1ab8c98	Merge pull request #13194 from SamGondelman/resolution ... Fix Scale Resolution option	2018-05-18 15:23:01 -07:00
Gabriel Calero	7a6b7b8ba3	Add Your Last Location in Android Home	2018-05-18 12:26:41 -03:00
Andrew Meadows	a23126a6b2	Merge 'master' into 'workload'	2018-05-18 07:38:02 -07:00
SamGondelman	c57c15f22c	fix resolution option	2018-05-17 16:58:35 -07:00
Sam Gondelman	74840d2130	Merge pull request #12935 from gcalero/android_new_login ... Android new login	2018-05-17 15:53:25 -07:00
vladest	eb25601856	Return back LOD tools	2018-05-17 20:41:50 +02:00
Gabriel Calero	5a73da6fdf	Bugfix: stop audio when app starts	2018-05-17 14:05:49 -03:00
Gabriel Calero	8741c5e6a4	Make haptic pulse duration configurable in VirtualPadDevice	2018-05-17 11:37:13 -03:00
Dante Ruiz	f8e9afb115	fixing damn build issues	2018-05-16 15:08:09 -07:00
Dante Ruiz	3be4b01d2c	move overlays menu back	2018-05-16 14:36:55 -07:00
Zach Fox	486f33b4bd	Merge branch 'master' of github.com:highfidelity/hifi into MS15103_snapFolderCrash	2018-05-16 14:14:35 -07:00
Dante Ruiz	fbc3d97af3	adding back overlay menu and avatar size	2018-05-16 13:48:29 -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
Simon Walton	b43cb5b86f	Take out VS's auto reformatting	2018-05-16 09:36:55 -07:00
Gabriel Calero	5afc9c6df3	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-16 12:45:17 -03:00
vladest	5127cb0ea6	Merge branch 'master' into menu-updates	2018-05-16 14:37:00 +02: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
Simon Walton	f4d24a3d0e	Quiet MacOS warning	2018-05-15 16:40:21 -07:00
Simon Walton	2b30c1389e	Try reducing concurrent downloads for Android	2018-05-15 14:30:08 -07:00
vladest	7ea6181520	Merge branch 'master' into menu-updates	2018-05-15 21:54:45 +02: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
Andrew Meadows	c7c4324b3c	Merge 'master' into 'workload'	2018-05-15 10:22:50 -07:00
vladest	fee3cc0aca	Implemented backend for About dialog	2018-05-15 15:49:20 +02: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
vladest	f8ebe7e669	remoed no more used LOD dialogs. Fixed Slider properties min and max settings	2018-05-12 16:01:43 +02:00
vladest	0a67fc3b36	Merge conflicts	2018-05-12 11:24:35 +02: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
vladest	62aa2df836	Merge branch 'master' into menu-updates	2018-05-10 10:36:38 +02: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
Gabriel Calero	9b63b76b68	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-07 16:06:02 -03:00
Gabriel Calero	66b975192d	Merge remote-tracking branch 'cristo86/android_places_goto' into android_new_login	2018-05-07 15:56:43 -03: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
vladest	1794113f37	Check global switch as well	2018-05-06 12:51:59 +02:00
vladest	c7ab1f3dbf	Merge branch 'master' into menu-updates	2018-05-05 20:48:40 +02:00
vladest	5a5bfcfe02	Merge branch 'master' into menu-updates	2018-05-05 07:11:39 +02: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
Gabriel Calero	087c6ff730	Patch for secondary camera assert error on Android	2018-05-04 18:45:39 -03: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