25116 commits

Author	SHA1	Message	Date
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
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
Sam Gateau	07f1ab8c98	Merge pull request #13194 from SamGondelman/resolution ... Fix Scale Resolution option	2018-05-18 15:23:01 -07:00
Brad Davis	ae07036f20	Add ideal resource texture memory stat	2018-05-18 09:23:53 -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
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
Clement	da08d747dc	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2018-05-17 12:10:08 -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
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
samcake	ade1d6c056	use the correct call to toggle the debugFXAA on the AaConfig	2018-05-16 15:37:13 -07:00
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
samcake	21e069c90c	Adding a toggle button to the developer/Render menu to be able to disable taa and fall back to Fxaa	2018-05-16 13:09:55 -07:00
John Conklin II	8d437892cb	Merge pull request #13175 from luiscuenca/fixAvatarDisappearing ... Fix hips position when flying	2018-05-16 12:37:07 -07:00
Zach Fox	f8215b5999	Fix final? crash	2018-05-16 11:05:21 -07:00
Zach Fox	c3ea176b58	Give me my reticle back!	2018-05-16 10:54:58 -07:00
luiscuenca	7b48dc2370	normalize vector	2018-05-16 10:17:38 -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
Sam Gateau	523d57d948	Merge pull request #13162 from AndrewMeadows/avatar-collisions ... avatars collide again	2018-05-16 09:25:05 -07:00
Gabriel Calero	5afc9c6df3	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-16 12:45:17 -03: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
David Rowe	f571e90ef5	Merge branch 'master' into 21872-b	2018-05-16 10:20:53 +12:00
David Rowe	f629022b8c	AvatarList API JSDoc stubs	2018-05-16 10:16:13 +12:00
John Conklin II	1313d28b9d	Merge pull request #13112 from sethalves/fix-overlay-asan-warning ... Fix overlay asan warning	2018-05-15 14:51:05 -07:00
David Rowe	fdeb0e3305	Avatar API JSDoc stubs	2018-05-16 09:20:54 +12:00
luiscuenca	4b09f1dc30	Fix vector transformation when calculating flying hip position	2018-05-15 14:19:17 -07:00
John Conklin II	a6cda2166a	Merge pull request #13158 from highfidelity/stable ... RC67.1 stable mergeback to master	2018-05-15 14:01:06 -07:00
Andrew Meadows	c5773cbe84	restore 'virtual' keyword for overrides	2018-05-15 13:59:22 -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
Dante Ruiz	931c8f5abe	Merge pull request #13110 from ctrlaltdavid/21866 ... Don't unnecessarily scroll HTML content when keyboard is raised	2018-05-15 11:00:38 -07:00
Seth Alves	78a8e8e500	quiet asan warning	2018-05-15 11:00:08 -07:00
Seth Alves	24404afe26	Merge pull request #13115 from sethalves/fix-autoAdjustLOD-asan ... fix divide-by-zero asan warning in LODManager::autoAdjustLOD	2018-05-15 10:58:00 -07:00
John Conklin II	574a52fdbe	Merge pull request #13154 from NissimHadar/perfTest_1 ... Added method to test namespace to save JSON object to a file.	2018-05-15 10:30:34 -07:00
John Conklin II	e9cb46a2a5	Merge pull request #13169 from hyperlogic/bug-fix/remove-unused-menu-item ... OpenVR: Remove reference to HMD Standing Mode menu item	2018-05-15 10:30:00 -07:00
David Rowe	b7a0ff523a	LaserPointers API JSDoc stubs	2018-05-15 17:36:23 +12:00
David Rowe	8e9799b80f	Pointers API JSDoc fix up	2018-05-15 16:36:42 +12:00
Zach Fox	a54ce96ac2	Clement's CR	2018-05-14 17:46:58 -07:00
Zach Fox	e607c68bea	Thanks Mukul!	2018-05-14 16:48:40 -07:00
David Rowe	9040e45be7	RayPick API JSDoc stubs	2018-05-15 11:43:49 +12:00
NissimHadar	d4d2f3c957	Moved ownership of test location into the Test Scripting class.	2018-05-14 16:32:04 -07:00
NissimHadar	8e3844a235	Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1	2018-05-14 16:23:36 -07:00
David Rowe	3fb6fd1afb	Picks API JSDoc stubs	2018-05-15 11:22:47 +12:00
Zach Fox	43254e2981	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-14 15:12:44 -07:00