15935 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	b0c286bc3b	Merge branch 'master' of https://github.com/highfidelity/hifi into toggleOverlay ... Conflicts: interface/src/Application.cpp	2016-02-25 16:21:38 -08:00
Brad Hefta-Gaub	202a456e1a	Merge pull request #7126 from AndrewMeadows/cleanup ... cleanup ViewFrustum method names	2016-02-25 16:12:25 -08:00
Brad Hefta-Gaub	82cbf19bca	Merge pull request #7078 from zzmp/fix/light-intensity ... Reimplement light attenuation for spot and point lights	2016-02-25 16:08:28 -08:00
Brad Hefta-Gaub	519a90f2bd	fix the overlays visible on startup case	2016-02-25 16:02:05 -08:00
Clément Brisset	2e7c7eace5	Merge pull request #7179 from birarda/domain-security ... verified domain ownership for full automatic networking	2016-02-25 15:24:09 -08:00
Brad Hefta-Gaub	366aa39be8	handle startup overlay visibility correctly	2016-02-25 14:46:08 -08:00
Brad Hefta-Gaub	8422d4f36a	Merge pull request #7198 from howard-stearns/snapTurnDefault ... snap turn default	2016-02-25 14:25:00 -08:00
Seth Alves	489fad4141	Merge pull request #7188 from ZappoMan/menuGroups ... remove some unimplemented menu items	2016-02-25 14:00:38 -08:00
howard-stearns	d8fe55ddc5	Proper default for snapTurn preference (and new name so as to update old ... users).	2016-02-25 13:06:34 -08:00
Zach Pomerantz	32ce7c6eab	Rename light surfaceRadius->falloffRadius	2016-02-25 10:02:33 -08:00
Andrew Meadows	9c927ea36b	ViewFrustum method renames and whitespace cleanup ... fooInFrustum() --> computeFooViewLocation() except pointInFrustum() --> computeFrustumLocation()	2016-02-25 09:11:28 -08:00
Brad Hefta-Gaub	91f6b7e80d	Merge pull request #7186 from zzmp/feat/scene-ambient-tex ... Wire up zone ambientURL	2016-02-25 09:05:25 -08:00
Brad Hefta-Gaub	526f9dc248	check/uncheck the overlays menu when you toggle the overlays via some other mechanism	2016-02-25 08:41:38 -08:00
Brad Hefta-Gaub	5828c32041	add toggleOverlays menu item and action	2016-02-25 08:31:11 -08:00
Seth Alves	cfdaf643a1	Merge pull request #7181 from sethalves/fix-grab-action ... fix avatarActionHold	2016-02-24 16:28:17 -08:00
Brad Hefta-Gaub	ecb03562d3	fix build buster	2016-02-24 16:24:48 -08:00
Zach Pomerantz	c2ed5e5474	Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity	2016-02-24 16:24:09 -08:00
Brad Hefta-Gaub	f9b55c4b87	Merge pull request #7185 from ctrlaltdavid/20809 ... Fixes for new modal message dialog	2016-02-24 16:20:40 -08:00
Brad Hefta-Gaub	ca5de8d6a9	remove some unimplemented menu items	2016-02-24 16:17:11 -08:00
Zach Pomerantz	1817b8ef2f	Use only skyboxTexture in DeferredLightingEffect	2016-02-24 16:07:28 -08:00
Zach Pomerantz	95d98e3ed7	Wire up zone ambientURL	2016-02-24 16:07:04 -08:00
Anthony J. Thibault	62ed5333e0	AvatarActionHold: compute velocities for other avatars	2016-02-24 15:14:56 -08:00
Anthony J. Thibault	b3b4c6473d	Merge branch 'master' into fix-grab-action	2016-02-24 14:34:23 -08:00
David Rowe	b9a1c2051b	Fix modal dialog not being opaque to mouse clicks	2016-02-25 10:52:16 +13:00
Brad Hefta-Gaub	568fd3e77f	Merge pull request #7164 from ctrlaltdavid/20809 ... Restyle message box modal dialogs	2016-02-24 13:47:00 -08:00
Brad Hefta-Gaub	1699e4a396	Merge pull request #7131 from ctrlaltdavid/20805 ... Restyle the Running Scripts dialog	2016-02-24 13:45:40 -08:00
Zach Pomerantz	3c4ab077be	Init validOrientation for myAvatar calc	2016-02-24 13:16:45 -08:00
Zach Pomerantz	e78905a6d1	Rm previousDeltaTimeStep unused field from AvatarActionHold	2016-02-24 13:15:49 -08:00
David Rowe	51b41da488	Horizontally center short messages in the dialog	2016-02-25 09:15:07 +13:00
Seth Alves	e1b10e79df	don't crash when watching someone else near-grab something	2016-02-24 12:09:51 -08:00
Brad Hefta-Gaub	2a18127a01	Merge pull request #7171 from jherico/avatar_qml_location ... Allow avatar positioning from QML	2016-02-24 11:37:12 -08:00
Brad Hefta-Gaub	3df5d0abad	Merge pull request #7161 from zzmp/fix/overlay-model-scale ... Use proper getter for model overlay scaling	2016-02-24 09:31:47 -08:00
Chris Collins	64a07440cc	Merge pull request #7180 from jherico/qml ... Several QML fixes	2016-02-24 08:20:03 -08:00
Chris Collins	7f679af186	Merge pull request #7176 from zzmp/menu/graphics ... Update graphics menus	2016-02-24 08:18:58 -08:00
Brad Davis	fa23e2023e	Fix bad tool window placement	2016-02-23 21:05:57 -08:00
Clément Brisset	8e8e23452f	Merge pull request #7156 from ZappoMan/depthReticleWork ... Depth reticle work	2016-02-23 17:54:35 -08:00
Andrew Meadows	8d91912d4b	Merge pull request #7162 from hyperlogic/tony/controller-velocity ... Improve hand controller move and throw velocity	2016-02-23 17:13:13 -08:00
David Rowe	a816d835d3	Finesse modal message box dialog layout	2016-02-24 13:59:43 +13:00
Zach Pomerantz	ea8edb3744	Remove antialiasing from menus, default to on	2016-02-23 16:24:44 -08:00
Zach Pomerantz	7ae9752272	Remove Render > Ambient Light menu	2016-02-23 16:24:43 -08:00
Chris Collins	94d018be3e	Merge pull request #7172 from zzmp/fix/stats ... Consolidate stats for opaque/transparent/other	2016-02-23 16:23:11 -08:00
Zach Pomerantz	1f9324c78f	Move Graphics... to Developer menu	2016-02-23 16:14:41 -08:00
David Rowe	7ee1edac3a	Merge branch '20805' into 20809	2016-02-24 13:08:28 +13:00
David Rowe	beef3f59eb	Fix QML warning	2016-02-24 12:59:21 +13:00
David Rowe	76ec5e4600	Merge branch 'master' into 20805	2016-02-24 12:38:44 +13:00
David Rowe	ad4d697f38	Use names for HiFi glyph characters	2016-02-24 12:37:23 +13:00
David Rowe	bac703b29e	Adjust height of Running Scripts now that fonts are consistently sized	2016-02-24 12:36:46 +13:00
David Rowe	128583660b	Specify font sizes in pixels instead of points ... Makes the dialog layout and look consistent across different devices.	2016-02-24 12:10:19 +13:00
Stephen Birarda	42582e5d0f	remove old voxel cost model from application	2016-02-23 14:53:35 -08:00
Stephen Birarda	6cab831ea0	re-gen the interface keypair while being denied from domain	2016-02-23 14:52:12 -08:00