7245 commits

Author	SHA1	Message	Date
Stephen Birarda	112abc9d7e	Merge pull request #13148 from birarda/feat/new-version-numbers ... add SHA to PR/master version, add build_type (stable/master/pr/dev)	2018-06-08 14:44:22 -07:00
John Conklin II	1646f543cd	Merge pull request #13273 from danteruiz/fix-show-overlays-menu ... fixing show overlays menu item on start up	2018-06-07 11:34:30 -07:00
John Conklin II	3b413d0f72	Merge pull request #13272 from zfox23/MS14615_memoryUsageMinimized ... MS14615: Prevent memory overuse when minimized	2018-06-07 11:16:56 -07:00
Sam Gateau	146732a20f	Merge pull request #13317 from jherico/feature/mac_resources ... Use binary resources on OSX	2018-06-07 09:38:00 -07:00
Zach Fox	7f04506020	Merge pull request #13318 from zfox23/MS14925_doubleCallingDisplayChanged ... Fix MS14925: Don't double-emit signal for display plugin change	2018-06-07 09:32:50 -07:00
Bradley Austin Davis	fa51c15849	Use binary resources on OSX	2018-06-06 15:10:52 -07:00
Zach Fox	6869718025	Fix MS14925: Don't double-call signal for display plugin change	2018-06-06 14:41:33 -07:00
Seth Alves	6c8e514367	Merge pull request #13224 from danteruiz/fix-key-conflicts ... Allow using the key 1,2,3 to swicth views and also to enter text in web entity or overlay	2018-06-06 11:08:04 -07:00
Ken Cooke	83dda420ba	Merge pull request #13256 from danteruiz/remove-dead-code ... remove dead code in Application::keyPressEvent	2018-06-05 09:16:28 -07:00
Sam Gondelman	38e7b31c32	Merge pull request #13176 from SimonWalton-HiFi/low-connectivity ... Try reducing concurrent downloads	2018-06-04 14:48:46 -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
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
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
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
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