14830 commits

Author	SHA1	Message	Date
samcake	bfed0304c3	Merge pull request #7218 from zzmp/fix/resort-in-octree ... Fix item key lookup on updated items in scene	2016-03-08 17:48:51 -08:00
Brad Hefta-Gaub	35d6afbe77	Merge branch 'master' of https://github.com/highfidelity/hifi into fixSceneNotStable	2016-03-08 14:53:41 -08:00
Brad Hefta-Gaub	6d211dd4e5	first cut at fixing the scene not stable bug	2016-03-08 14:52:21 -08:00
Seth Alves	b780fad83f	Merge pull request #7270 from birarda/local-socket-check ... add a secondary method for local socket check	2016-03-08 10:48:08 -08:00
Brad Hefta-Gaub	19ad4314ca	Merge pull request #7276 from jherico/bookmarks ... Don't trigger modal dialog from menu handler	2016-03-08 10:29:29 -08:00
Zach Pomerantz	d1324b2e7a	Merge branch 'master' of github.com:highfidelity/hifi into fix/resort-in-octree	2016-03-08 10:22:25 -08:00
Brad Hefta-Gaub	50eb07d465	Merge pull request #7221 from jherico/threaded_compositing2 ... Migrate composition of the overlay and pointer to the present thread	2016-03-08 10:22:02 -08:00
Brad Davis	f08f54fd22	Don't trigger modal dialog from menu handler	2016-03-07 21:48:07 -08:00
James B. Pollack	2e9ebfb178	remove avatar head and body from pacakage model selections	2016-03-07 21:03:11 -08:00
Stephen Birarda	ed9faf4189	add a secondary check for local IP address	2016-03-07 18:00:09 -08:00
Brad Davis	8988dd9771	Fix mouse drag turning	2016-03-07 17:14:44 -08:00
Brad Davis	634f8fbc83	Fix texture leak	2016-03-07 17:14:43 -08:00
Brad Davis	28103cf5ef	Migrate composition of the overlay and pointer to the present thread	2016-03-07 17:14:41 -08:00
Philip Rosedale	7c765f3d5a	Merge pull request #7258 from hyperlogic/tony/better-lean-detection ... MyAvatar: use a box instead of a sphere for horizontal re-centering	2016-03-07 15:05:10 -08:00
Chris Collins	7850ca3576	Merge pull request #7227 from hyperlogic/tony/eye-look-at-fixes ... Avatar eye look at fixes for HMD and desktop	2016-03-07 11:50:16 -08:00
Anthony Thibault	2cbb41fd38	MyAvatar: bug fix for forward/backward lean detection	2016-03-07 10:11:22 -08:00
Anthony J. Thibault	aefeff2493	MyAvatar: Use a box instead of a sphere for horizontal re-centering	2016-03-07 09:50:38 -08:00
Philip Rosedale	ee3e0fcc38	Merge pull request #7238 from hyperlogic/tony/hmd-follow-work ... MyAvatar: Improved body recentering for room scale	2016-03-04 15:51:07 -08:00
Anthony Thibault	0de19d13c4	MyAvatar: open up horizontal leaning threshold	2016-03-04 15:28:38 -08:00
Brad Hefta-Gaub	30bcb04a2f	Merge pull request #7149 from jherico/overlays_qml ... Make Overlay API usable from QML	2016-03-04 15:00:45 -08:00
Brad Davis	468cb05571	Merge pull request #7231 from ctrlaltdavid/20812 ... Restyle settings dialogs	2016-03-04 14:33:21 -08:00
Anthony Thibault	37ba0ecd9f	MyAvatar: prevent face from being visible when crouching ... Overall, this should fix many of the issues with the head being visible when it shouldn't.	2016-03-04 11:48:55 -08:00
Brad Davis	2f89253dc1	Make Overlays usable from QML	2016-03-04 11:35:54 -08:00
Anthony J. Thibault	dc456cbdbe	MyAvatar: dropped vertical recenter limit.	2016-03-04 11:15:11 -08:00
Brad Hefta-Gaub	5b2c3b4b26	Merge pull request #7243 from thoys/20821 ... CR for Job #20821 - Remove stray tray icon	2016-03-03 18:10:56 -08:00
Brad Hefta-Gaub	7bb87305d4	Merge pull request #7234 from zzmp/fix/line3d-back-cull ... Render line3d without backface culling	2016-03-03 17:16:54 -08:00
Thijs Wenker	17f0688db5	removed stray traybar icon	2016-03-03 19:18:47 +01:00
Anthony J. Thibault	2a75084579	Merge branch 'master' into tony/hmd-follow-work	2016-03-02 17:44:13 -08:00
David Rowe	c83ed578db	Merge branch 'master' into 20812	2016-03-03 02:01:20 +13:00
Brad Hefta-Gaub	cfce5af8d4	Merge pull request #7191 from samcake/orange ... Better Shading Model and support fr Stingray material	2016-03-01 18:24:09 -08:00
Anthony J. Thibault	6e80665107	MyAvatar: reduced rotation re-center threshold to 30 degrees ... Also, warning fix for Linux.	2016-03-01 17:45:16 -08:00
Anthony J. Thibault	2dfc517d14	MyAvatar: re-center vertically, on x & z drive keys	2016-03-01 16:45:36 -08:00
samcake	16ac69315f	Imroving the roughness/specular highlight nd fixing a bug with the CUbemap texture	2016-03-01 16:38:02 -08:00
Anthony J. Thibault	be446f4e96	MyAvatar: separate rotation, horizontal and vertical HMD follow	2016-03-01 15:38:02 -08:00
Zach Pomerantz	48aaac2971	Render line3d without backface culling	2016-03-01 14:57:02 -08:00
Zach Pomerantz	5c64115b26	Use keyLight in DLE instead of _skyboxTexture	2016-03-01 14:44:34 -08:00
Stephen Birarda	f44cf3903c	re-instate verified domain ownership for full automatic networking ... This reverts commit 34408c8144.	2016-03-01 13:04:37 -08:00
Stephen Birarda	b0c11e6562	Merge pull request #7217 from huffman/udt-random-seq ... Randomize initial send sequence number in UDT	2016-03-01 12:59:10 -08:00
David Rowe	881302df02	Merge branch 'master' into 20812	2016-03-02 09:55:17 +13:00
Atlante45	14ae35e741	CR	2016-03-01 12:00:43 -08:00
Atlante45	4944d0a8d0	Handle threading inside AssetServer	2016-03-01 12:00:43 -08:00
Atlante45	f0ccada945	Fix for Ubuntu	2016-03-01 12:00:43 -08:00
Atlante45	6a4b93a4e7	Proper fix for DiskCacheInfo	2016-03-01 12:00:43 -08:00
Atlante45	40d307a37b	Temporary fix to disk cache editor crash	2016-03-01 12:00:43 -08:00
Atlante45	2c1762526d	Move all resource requests to the same thread	2016-03-01 12:00:43 -08:00
Ryan Huffman	cc9c87d281	Fix packet version mismatch not showing for domain packets	2016-03-01 11:36:49 -08:00
Anthony J. Thibault	506e46faee	MyAvatar: fix for missing include	2016-03-01 11:21:14 -08:00
Anthony J. Thibault	babf48ac57	MyAvatar: take IPD scale into account when computing corrected eye lookAt	2016-03-01 11:17:03 -08:00
Anthony J. Thibault	3cde972174	Rig: issue warnings for missing joints ... Also, Removed Rig::computeEyesInRigFrame, it was causing warnings because it was looking up Eye and Head joints for all models, not just avatars.	2016-03-01 11:07:22 -08:00
Brad Hefta-Gaub	a3f4dbddcf	Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking	2016-02-29 20:23:14 -08:00