1683 commits

Author	SHA1	Message	Date
ZappoMan	c3d1d13fa9	Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes	2014-10-29 11:56:27 -07:00
Stephen Birarda	7f3482bbdd	swithc from elif to elsif	2014-10-29 10:53:34 -07:00
Stephen Birarda	03e1da0ba9	include unistd only on Q_OS_LINUX	2014-10-29 10:37:39 -07:00
ZappoMan	3e9bc23c2f	moving RenderArgs into shared so it can be used by overlays, first cut at ray picking against submeshes	2014-10-29 10:19:04 -07:00
Andrew Meadows	c39b239f99	fix linux build for missing getpid()	2014-10-29 09:30:51 -07:00
Brad Hefta-Gaub	be65a798db	Merge pull request #3681 from birarda/verbose-log-silencer ... logging tweaks to reduce spam from repeated log messages	2014-10-28 17:58:17 -07:00
Stephen Birarda	9af097967d	remove ctime since windows build did not fail without it	2014-10-28 15:56:30 -07:00
Stephen Birarda	992396ba63	add ctime for strftime call	2014-10-28 15:48:06 -07:00
Stephen Birarda	01de6305e9	add time header for date in log entry	2014-10-28 15:42:03 -07:00
Stephen Birarda	c4538836c1	always output the first matching repeated log message	2014-10-28 14:51:47 -07:00
Stephen Birarda	424793b905	complete output of suppressed repeated messages to log	2014-10-28 14:49:14 -07:00
Stephen Birarda	8e3102266a	use the LogHandler in Interface	2014-10-28 14:23:34 -07:00
Stephen Birarda	d3bbd251db	move Logging to LogHandler	2014-10-28 13:59:23 -07:00
Andrew Meadows	4c3cdf5b7a	move stuff out of shared and into physics library	2014-10-28 13:51:45 -07:00
Stephen Birarda	2711ff2b5f	move functionality from VerboseLoggingHelper into the Logging class	2014-10-28 13:48:53 -07:00
Stephen Birarda	8a4c716452	leverage the VerboseLoggingHelper for packets from unknown nodes	2014-10-28 12:15:52 -07:00
Stephen Birarda	9c30903eb6	add the VerboseLoggingHelper class for repeated messages	2014-10-28 12:05:56 -07:00
ZappoMan	fc507850be	Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles	2014-10-16 20:36:28 -07:00
samcake	3d13792a9d	Merge pull request #3599 from ZappoMan/frustumCullModelParts ... Frustum cull model parts	2014-10-15 11:56:00 -07:00
ZappoMan	64fecba011	removed some unneeded scaling to AABox and AACube debug	2014-10-14 17:17:30 -07:00
ZappoMan	e235af1331	add debeg streaming to Extents	2014-10-14 17:16:49 -07:00
ZappoMan	f04c2b6e6f	fix possible buffer overrun asserts	2014-10-14 17:14:12 -07:00
Andrzej Kapolka	60576bdcbd	Basic metavoxel scripting bits.	2014-10-13 15:05:16 -07:00
ZappoMan	4c85e9f581	removing particles	2014-10-13 14:10:57 -07:00
Stephen Birarda	c16ab0a19f	remove definition for an unused method	2014-09-29 15:27:45 -07:00
Stephen Birarda	bd4a32551b	fix for settings save without organization	2014-09-29 10:09:33 -07:00
Stephen Birarda	5e2870ac5f	require a distinction between master config and user config	2014-09-29 09:30:08 -07:00
Stephen Birarda	7c738edbd8	Merge pull request #3488 from PhilipRosedale/master ... Correct eye contact for Oculus users	2014-09-26 15:42:03 -07:00
Stephen Birarda	e75a2d355e	Merge branch 'master' of https://github.com/highfidelity/hifi into domain-wizard	2014-09-26 14:31:52 -07:00
Stephen Birarda	94f30fe4d9	handle password setting by not converting to double	2014-09-26 12:20:12 -07:00
Stephen Birarda	21809cc9df	fix http username with no password	2014-09-26 12:09:29 -07:00
Stephen Birarda	e6449da890	repair a crash while overriding a config map	2014-09-26 11:10:56 -07:00
Stephen Birarda	954fbc2017	use DomainServerSettingsManager to handle simulation settings and config	2014-09-26 11:06:05 -07:00
Philip Rosedale	f66f565f53	update stDev (standard deviation) class to coding standard	2014-09-25 18:14:02 -07:00
Stephen Birarda	a684191cf1	change the default config path to system config path	2014-09-25 14:50:07 -07:00
ZappoMan	9cd76983a2	swith to using shape collider instead of spheres	2014-09-25 14:35:20 -07:00
Andrew Meadows	58bcb98dd6	remove virtual for ListShape::findRayIntersection()	2014-09-23 10:04:36 -07:00
Andrew Meadows	7dd9587d20	remove warning about hidden virtual override	2014-09-23 09:07:23 -07:00
Stephen Birarda	0033dfe5af	use quat orientation to store locations and user locations	2014-09-16 09:57:21 -07:00
Andrew Meadows	0539246089	merge upstream/master into andrew/ragdoll	2014-09-15 13:56:51 -07:00
ZappoMan	fd9f64cb44	normalize all quats before packing	2014-09-15 08:46:28 -07:00
ZappoMan	4ae3360f83	fix warning	2014-09-13 08:50:52 -07:00
ZappoMan	e76ffb2ecb	fixed another warning	2014-09-13 08:44:13 -07:00
ZappoMan	973479d1ac	fix warning in ByteCountCoded<>	2014-09-13 07:57:45 -07:00
Andrew Meadows	f2882618be	merge upstream/master into andrew/inertia ... Conflicts: interface/src/avatar/MyAvatar.cpp	2014-09-12 17:50:26 -07:00
Andrew Meadows	62867391a3	collide against PhysSimulation instead of VoxelTree	2014-09-12 17:38:45 -07:00
Andrew Meadows	32b07027d3	namechange planeNormal --> faceNormal	2014-09-12 17:27:56 -07:00
Andrew Meadows	4e7a7667b1	remove unused variable	2014-09-12 09:19:03 -07:00
Andrew Meadows	825be3e1e7	fix for ray-vs-AACubeShape intersection test	2014-09-12 08:40:48 -07:00
Andrew Meadows	a9957ac7df	the real fix for ray-vs-plane intersection	2014-09-12 08:40:03 -07:00