25323 commits

Author	SHA1	Message	Date
NissimHadar	bea21e3a68	WIP.	2018-05-30 17:06:49 -07:00
NissimHadar	6717a16098	WIP.	2018-05-30 17:04:19 -07:00
NissimHadar	51b1188bdb	WIP.	2018-05-30 17:01:47 -07:00
NissimHadar	df668e44ca	WIP.	2018-05-30 16:59:53 -07:00
NissimHadar	c1bc3bd154	WIP.	2018-05-30 16:58:35 -07:00
NissimHadar	d01d774f76	WIP.	2018-05-30 16:51:17 -07:00
NissimHadar	78f04f84c5	Merge branch 'master' of github.com:highfidelity/hifi into DailyTests	2018-05-30 16:45:53 -07:00
NissimHadar	c8a04911f4	Interface respects Show Overlay menu checkbox on start up.	2018-05-30 16:45:29 -07:00
samcake	37c1f4fc06	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-30 16:05:46 -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
Sam Gondelman	46a6334c72	Merge pull request #13249 from gcalero/android_remove_mic_bar ... Android: Update Application.cpp	2018-05-30 14:31:31 -04:00
samcake	2e9076c71e	Clean up and trying to get ready for merge	2018-05-30 11:14:49 -07:00
Wayne Chen	81eea5d8d1	Merge pull request #13213 from wayne-chen/filebrowser-case-14515 ... Adding showHidden properties to file dialogs to allow for showing hidden files/folders	2018-05-30 10:43:58 -07:00
Dante Ruiz	c4358aad81	remove dead code in Application::keyPressEvent	2018-05-30 07:33:32 -07:00
Dante Ruiz	543a721a11	fix headers	2018-05-29 17:55:42 -07:00
samcake	873cabe284	Cleaning the code	2018-05-29 17:46:25 -07:00
Dante Ruiz	ea10dc176a	adding back reload scripts	2018-05-29 17:38:02 -07:00
David Rowe	08cb5c7191	Fix JSDoc example typo	2018-05-30 10:25:16 +12:00
David Rowe	0db440931e	Miscellaneous JSDoc fixes	2018-05-30 10:02:30 +12:00
Gabriel	cf499ca047	Update Application.cpp ... Remove the mic bar for android	2018-05-29 16:42:09 -03:00
NissimHadar	5fb7ec7b72	Updated jsdoc	2018-05-29 11:50:23 -07:00
NissimHadar	855084b6d5	Updated jsdoc.	2018-05-29 11:29:59 -07:00
NissimHadar	c49bcbe4e9	Removed "Don't show toolbar in test mode.." as this functionality is available through JS commands.	2018-05-29 11:20:29 -07:00
NissimHadar	0af1599b53	Added jsdoc to TestScriptingInterface.	2018-05-29 09:45:03 -07:00
samcake	82503a9e64	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-29 08:59:37 -07:00
NissimHadar	658c0e329f	Corrected comment.	2018-05-28 19:57:54 -07:00
David Rowe	a9c4eab099	Fix up JSDoc for Window.takeSnapshot() and related	2018-05-28 12:46:51 +12:00
David Rowe	b31a4d0b64	Add JSDoc stubs for new HifiAbout API	2018-05-28 10:40:42 +12:00
Sam Gateau	678effdb48	Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey	2018-05-26 23:28:59 -07:00
NissimHadar	20d2128a10	Corrected timing bug.	2018-05-25 17:36:55 -07:00
Dante Ruiz	9a25a74834	fix copy delete cut paste commands and menus	2018-05-25 15:34:17 -07:00
NissimHadar	00300f4b2f	Merge branch 'master' of github.com:highfidelity/hifi into DailyTests	2018-05-25 15:02:43 -07:00
NissimHadar	87220e501a	Don't show tablet in test mode, so that it won't appear in snapshots. Its location is not fixed - this will cause image comparisons to fail)	2018-05-25 15:02:00 -07:00
John Conklin II	eeed3ae82d	Merge pull request #13211 from druiz17/login-fix ... Fixing Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password"	2018-05-25 11:33:29 -07:00
John Conklin II	1d9f33a637	Merge pull request #13220 from NissimHadar/fixCameraMode ... Correct `Camera.mode` command.	2018-05-25 10:47:31 -07:00
John Conklin II	82bb664cb3	Merge pull request #13235 from druiz17/fix-qml-crash-v2 ... Remove offscreenUi desktop qml object from being a contextProperty for Web3DOverlay	2018-05-25 10:46:11 -07:00
samcake	051776ab1d	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-25 10:30:45 -07:00
NissimHadar	54b64c59d7	Merge branch 'master' of github.com:highfidelity/hifi into DailyTests	2018-05-25 08:29:09 -07:00
John Conklin II	0d8fb90fa8	Merge pull request #13222 from SamGondelman/mirror ... Fix image and text overlay drifting	2018-05-25 08:26:33 -07:00
Sam Gateau	aa49595a23	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-24 18:19:55 -07:00
Dante Ruiz	e34d67fee4	fix crash	2018-05-24 17:54:53 -07:00
NissimHadar	d01482bf68	Now looks for an actual change in the boom length (vs a change has been requested).	2018-05-24 17:44:39 -07:00
NissimHadar	9ed8c04097	Merge branch 'master' of github.com:highfidelity/hifi into fixCameraMode	2018-05-24 17:40:21 -07:00
Clement	19100c9550	Coding Standard ... Spacing Self-Sufficient Headers	2018-05-24 17:30:32 -07:00
NissimHadar	77d6ea6bec	Added hide/show for task bar (Windows only).	2018-05-24 16:48:03 -07:00
Anthony Thibault	eae5215d94	Merge pull request #13206 from ctrlaltdavid/21872-c ... JSDoc fixes	2018-05-24 16:44:55 -07:00
samcake	44a8d880fa	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-24 14:31:53 -07:00
David Rowe	bc757ddd41	Fix typo	2018-05-25 09:04:06 +12:00
John Conklin II	04bf8f851f	Merge pull request #13219 from samcake/one ... Bringing Evolution to the Job Engine Task library developed in the workload project to master	2018-05-24 13:30:16 -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
Andrew Meadows	31dd59d212	double bits in collision groups	2018-05-24 11:28:52 -07:00
Sam Gateau	13d02011f3	There and back again...	2018-05-24 00:53:29 -07:00
samcake	cf58f31f3e	Renaming the render::Engine to render::RenderEngine so the instancied Engine class coming from the task namesapce from which it derives, is just named 'Engine'	2018-05-23 15:08:48 -07:00
Dante Ruiz	c2ceb48a28	fixing key conflicts	2018-05-23 14:16:05 -07:00
SamGondelman	940b112f62	fix image and text overlay drifting	2018-05-23 11:58:50 -07:00
samcake	5bede45c85	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-23 11:26:07 -07:00
Wayne Chen	345138f4ff	Changing showHidden property to be always true	2018-05-23 10:30:08 -07:00
NissimHadar	e07e716d40	Fixed stupid gcc warning.	2018-05-23 07:35:25 -07:00
NissimHadar	06203d44d8	Correct Camera.mode command.	2018-05-22 17:08:28 -07:00
Wayne Chen	e3414c320e	changing property to alias to reflect folderListModel	2018-05-22 11:03:31 -07:00
Wayne Chen	1774b401c8	allowing file dialogs to show hidden files/folders via showHidden property	2018-05-22 10:24:04 -07:00
Simon Walton	f702374db3	Just have one const for concurrent downloads	2018-05-22 10:16:44 -07:00
Dante Ruiz	5fb08d0d9c	fix speech api not showing up	2018-05-21 14:21:21 -07:00
David Rowe	fa54461788	Update some recent JSDoc additions	2018-05-22 08:52:39 +12:00
Alexander Ivash	d659696b60	FB13789 - Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password?" links	2018-05-21 13:29:41 -07:00
samcake	b4807becb6	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-21 10:41:25 -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	bd3a9865bf	moving control speech to developer menu	2018-05-19 18:27:28 -07:00
druiz17	f2807e38f9	fix goto shortcut	2018-05-19 17:36:46 -07:00
samcake	3aaa01788c	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-18 17:42:30 -07:00
samcake	36a08fdd84	Friday night end of the day, last compilation.... almost	2018-05-18 17:41:28 -07:00
Dante Ruiz	8a2b54c2b7	fixing mistakes	2018-05-18 17:09:41 -07:00
Dante Ruiz	3b59af3ed7	Merge branch 'master' of github.com:highfidelity/hifi into menu-updates	2018-05-18 16:42:31 -07:00
Dante Ruiz	60dd7e49ab	making requested changes	2018-05-18 16:41:39 -07:00
Sam Gateau	07f1ab8c98	Merge pull request #13194 from SamGondelman/resolution ... Fix Scale Resolution option	2018-05-18 15:23:01 -07:00
Dante Ruiz	6eb5a78611	fixing code that breaks andriod build	2018-05-18 10:33:03 -07:00
Brad Davis	ae07036f20	Add ideal resource texture memory stat	2018-05-18 09:23:53 -07:00
Dante Ruiz	ea771c2325	make final changes	2018-05-18 09:21:41 -07:00
Liv	40ff3f966f	Merge pull request #13165 from ctrlaltdavid/21872-b ... JSDoc stubs for various APIs	2018-05-18 09:11:55 -07:00
Gabriel Calero	7a6b7b8ba3	Add Your Last Location in Android Home	2018-05-18 12:26:41 -03:00
samcake	aa18aaa7b1	Maybe	2018-05-17 18:06:46 -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
samcake	0cf87748cd	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-05-17 14:20:44 -07:00
Dante Ruiz	0f122e3dbc	Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates	2018-05-17 13:33:34 -07:00
Dante Ruiz	e760912fd2	fix warning	2018-05-17 13:33:19 -07:00
Clement	da08d747dc	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2018-05-17 12:10:08 -07:00
vladest	eb25601856	Return back LOD tools	2018-05-17 20:41:50 +02:00
Dante Ruiz	ccea493498	Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates	2018-05-17 11:36:03 -07:00
Dante Ruiz	201b8a5140	fixing the graphics preference	2018-05-17 11:35:34 -07: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
vladest	95cd9476c3	Fixed modality in Desktop	2018-05-17 16:11:28 +02:00
David Rowe	d20cd6ad44	Add missing JSDoc of parameter in takeSecondaryCamera360Snapshot()	2018-05-17 20:25:25 +12:00
David Rowe	6db4dd8673	Merge branch 'master' into 21872-b ... # Conflicts: # interface/src/ui/Snapshot.h	2018-05-17 20:11:14 +12:00