25358 commits

Author	SHA1	Message	Date
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
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
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
Andrew Meadows	57138b5fb7	disable workload region regulation by default ... also set default region radiuses large	2018-05-29 14:21:16 -07:00
Gabriel	cf499ca047	Update Application.cpp ... Remove the mic bar for android	2018-05-29 16:42:09 -03: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
Andrew Meadows	cd568867b2	disable regulation of workload views by default	2018-05-25 08:30:11 -07:00
Andrew Meadows	85beca6b67	tweak to dynamic workload regions regulation	2018-05-25 08:30:11 -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
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
samcake	559d436dfa	Fixing the merge conflicts	2018-05-24 16:57:10 -07:00
Anthony Thibault	eae5215d94	Merge pull request #13206 from ctrlaltdavid/21872-c ... JSDoc fixes	2018-05-24 16:44:55 -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
Andrew Meadows	31dd59d212	double bits in collision groups	2018-05-24 11:28:52 -07:00
samcake	40370f860a	Merge branch 'workload' of https://github.com/highfidelity/hifi into workload	2018-05-23 17:26:08 -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
Andrew Meadows	d50da2babc	Merge 'master' into 'workload'	2018-05-23 14:51:05 -07:00
SamGondelman	940b112f62	fix image and text overlay drifting	2018-05-23 11:58:50 -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
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
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
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
Andrew Meadows	a9c193b672	merge 'workload-014' into 'workload'	2018-05-18 10:12:04 -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
Andrew Meadows	a23126a6b2	Merge 'master' into 'workload'	2018-05-18 07:38:02 -07:00
Andrew Meadows	00e360aff0	reduce sim ownership priority when releasing grab	2018-05-17 17:25:07 -07:00