overte-HifiExperiments

mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-25 09:38:46 +02:00

Author	SHA1	Message	Date
Brad Hefta-Gaub	27c37f3a4e	Merge pull request #3784 from ctrlaltdavid/20157 CR for Job #20157 - Enable "Get Overlay properties" from javascript	2014-11-13 20:43:38 -08:00
David Rowe	8076bfea72	Merge branch 'master' into 20157 Conflicts: interface/src/ui/overlays/Text3DOverlay.cpp	2014-11-13 14:53:57 -08:00
Stephen Birarda	e10d132f75	avoid Qt QTimer thread bug by putting SoundCache on same thread	2014-11-13 14:47:28 -08:00
Sam Gateau	420118e9db	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-11-13 11:04:12 -08:00
Sam Gateau	7e2c4c0561	SImplified the Transform usage in the gpu::api, no more pointers, just values. Improved the Transform by compressing the memory footprint	2014-11-13 10:57:32 -08:00
ZappoMan	09a06c9d82	add debug streamer for xColor	2014-11-13 08:14:01 -08:00
David Rowe	fac6b6b426	Refactor QRect conversion to QScriptValue	2014-11-12 21:32:55 -08:00
Sam Gateau	b6c004c431	Fix syntax that doesn't compile on linux and used smart glm::max instruction	2014-11-12 17:16:43 -08:00
Sam Gateau	8fb04af59d	defined the ViewTransform as the matrix transforming from eye space to world space (the opposite of before this commit) since it seems a better design	2014-11-12 16:40:45 -08:00
Sam Gateau	e47524d70a	fix syntax and missing constant name	2014-11-12 10:41:50 -08:00
Sam Gateau	b716a512c6	Stable version of the Transform and usage for Model rendering with soimilar performances and same accuracy level	2014-11-12 00:26:44 -08:00
Sam Gateau	668c5e298d	clean up the Transform class and the rendering path in Model.cpp	2014-11-11 16:39:00 -08:00
Sam Gateau	ad51416c28	move the transform class files to the Shared library, still problem with negative scale composition	2014-11-11 09:54:35 -08:00
Stephen Birarda	9b2acadb4b	include c++ header for memset	2014-11-07 17:24:05 -08:00
Stephen Birarda	6a4808aac8	include string.h for memset usage	2014-11-07 17:22:54 -08:00
Stephen Birarda	2ca673175a	rename StdDev to StDev, patch its leak	2014-11-07 17:15:54 -08:00
Stephen Birarda	4fd22914c0	fix a leak in StdDev	2014-11-07 17:11:00 -08:00
Stephen Birarda	3f44203984	remove getpid usage and replace with Qt solution	2014-11-05 11:42:40 -08:00
Philip Rosedale	cdad40faec	Merge pull request #3736 from ZappoMan/entityBugs reset the QElapsedTimer in usecTimestampNow() periodically to prevent error	2014-11-04 12:59:13 -08:00
ZappoMan	a89287e404	reset the QElapsedTimer in usecTimestampNow() periodically to prevent error	2014-11-04 11:01:37 -08:00
Stephen Birarda	8d6b041758	send a pick ray with HFActionEvent, not x,y	2014-11-04 10:01:25 -08:00
Stephen Birarda	6b922fc3e7	final tweak for linux unistd include	2014-10-30 10:03:36 -07:00
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
Andrew Meadows	ff0872a5f0	add RayIntersectionInfo::getIntersectionPoint()	2014-09-12 08:38:44 -07:00
Andrew Meadows	46089a0611	fix ray-vs-AACube logic	2014-09-12 08:37:47 -07:00
ZappoMan	9f4d199440	move bound proxy rendering to EntityTreeRedering, added helper functions for various bounding boxes	2014-09-11 15:36:13 -07:00
ZappoMan	d616c7fa0c	handy conversions between AABox, AACube, and Extents	2014-09-11 12:23:35 -07:00
ZappoMan	7cadc3433a	improve constness for operators on PropertyFlags<>	2014-09-11 12:13:34 -07:00
ZappoMan	13cffa6e44	moved Extents to shared	2014-09-11 12:12:25 -07:00
Andrew Meadows	0494ffcf38	implement Ray-vs-Capsule and Ray-vs-AACube	2014-09-10 17:01:51 -07:00
Andrew Meadows	4da1ca22ba	Add RayIntersectionInfo and use for shape-vs-ray	2014-09-09 17:35:06 -07:00
Ryan Huffman	ecadf7dd33	Add include for QtGlobal to ensure OS global has been defined	2014-09-08 12:40:53 -07:00
Ryan Huffman	b0a0760be2	Update ShutdownEventListener to not stop event handling	2014-09-05 11:26:22 -07:00
Ryan Huffman	38a14c3864	Reapply "Update assignment client to close on WM_CLOSE message on Windows" This reverts commit `a603453cf2`.	2014-09-05 11:19:36 -07:00
Leonardo Murillo	a603453cf2	Revert "Update assignment client to close on WM_CLOSE message on Windows"	2014-09-05 11:36:56 -06:00
Brad Hefta-Gaub	9648c0d64e	Merge pull request #3343 from AndrewMeadows/ragdoll Ragdoll Part 12: first pass avatar skeleton collides with voxels	2014-09-04 23:09:08 -07:00
Andrew Meadows	7cde6811ca	remove unecessary AACube::operator<()	2014-09-04 15:21:19 -07:00
AndrewMeadows	8223481ecb	Merge pull request #3341 from huffman/19967 Code Review for Job #19967	2014-09-03 16:51:19 -07:00
AndrewMeadows	9036954d38	Merge pull request #3311 from huffman/fix-wm-close Update assignment client to close on WM_CLOSE message on Windows	2014-09-03 16:43:12 -07:00
Andrew Meadows	e120697a9b	merge upstream/master into andrew/ragdoll	2014-09-03 15:49:32 -07:00
AndrewMeadows	bd55da4a83	Merge pull request #3335 from ZappoMan/virtualEntities Model Server to Entity Server Refactoring	2014-09-03 15:48:58 -07:00
Andrew Meadows	a3b26582ba	fix for nan in sphereVsAACubeHelper()	2014-09-03 15:39:26 -07:00
Andrew Meadows	4270c4d989	merge upstream/master into andrew/ragdoll	2014-09-03 14:42:17 -07:00
Andrew Meadows	361d1e83b0	use PhysicsEntity::stepForward() in simulation loop	2014-09-03 13:18:35 -07:00
Andrew Meadows	6454fd2627	add PhysicsEntity::stepForward()	2014-09-03 13:18:12 -07:00
Andrew Meadows	06e1d4a8bc	init Shape::_mass in all ctors	2014-09-03 13:16:49 -07:00
Andrew Meadows	0cc6f559d4	add AACube::operator<() so they can be sorted	2014-09-03 13:13:54 -07:00
Ryan Huffman	5937830443	Update getWindowTitleBarHeight signature	2014-09-03 08:27:18 -07:00
Ryan Huffman	1ee23a1661	Add Windows.h include to ShutdownEventListener	2014-09-03 08:04:39 -07:00
Ryan Huffman	76bede04aa	Move stdout/err disabling to a library class	2014-09-03 07:06:08 -07:00
Ryan Huffman	c27bee2c06	Move wm_close handling to a shared library	2014-09-03 07:05:24 -07:00
Andrew Meadows	7c04a25095	fix whitespace formatting of curly braces	2014-09-02 16:29:20 -07:00
Ryan Huffman	67cefc8d54	Reduce height of RunningScripts so titlebar is inside main window	2014-09-02 13:12:52 -07:00
ZappoMan	ea22073ddc	removed some accidentally added code	2014-09-01 23:05:23 -07:00
ZappoMan	d1a046e6ed	properly handle LOD in rendering by not rendering small entities	2014-08-29 21:18:31 -07:00
Andrew Meadows	aeb355e3da	re-enabling legacy avatar-vs-voxel collisions so that I don't break anything when this merges with upstream	2014-08-29 15:53:20 -07:00
Andrew Meadows	ebcc960ec7	merge upstream/master into andrew/ragdoll	2014-08-29 15:48:40 -07:00
Andrew Meadows	a0eb13f6db	collision logic for capsule-side-vs-cube-face with unit tests	2014-08-29 14:23:00 -07:00
ZappoMan	2bcad6ab2b	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: assignment-client/src/Agent.cpp examples/editModels.js	2014-08-28 21:19:56 -07:00
Andrew Meadows	00913d4422	fixes for capsuleVsAACube() with unit tests	2014-08-28 16:51:16 -07:00
ZappoMan	76c77d6994	first cut at properly working lifetime	2014-08-28 13:46:54 -07:00
Andrew Meadows	921c8cfec3	fix broken build for using unititialized const float	2014-08-27 12:21:15 -07:00
Andrew Meadows	e133a696f5	merge andrew/ragdoll into some ShapeCollider work	2014-08-27 12:12:08 -07:00
Andrew Meadows	c6253bb51a	AACube vs Sphere and Capsule collision tests Sphere is unit tested. Also removed the shape collision query against Octree	2014-08-27 12:09:41 -07:00
Craig Hansen-Sturm	e941e58626	merge HEAD with PR-3281	2014-08-26 18:25:40 -07:00
Andrew Meadows	7a5c4fdb16	remove commented out #includes	2014-08-25 15:25:46 -07:00
ZappoMan	1764839223	get basics of referentials working	2014-08-25 14:07:01 -07:00
Andrew Meadows	681c526fe1	exploit symmetry of collision pairings	2014-08-25 08:52:45 -07:00
Andrew Meadows	f684608d1f	Added AACubeShape with stubbed collision functions	2014-08-25 08:24:44 -07:00
Andrew Meadows	1bd7734ec1	sometimes swap order of shapes for simpler code	2014-08-22 18:07:11 -07:00
Andrew Meadows	1be922f986	add shapeVsList etc to dispatch table renamed some functions for more readability	2014-08-22 11:20:53 -07:00
Andrew Meadows	3ebd8c1969	use dispatchTable for shape-vs-shape collisions	2014-08-21 16:40:25 -07:00
Andrew Meadows	f511fe2657	Ragdoll cannot assume skeleton's rootIndex is 0 some Models have extra "joints" not part of the normal skeleton	2014-08-19 11:31:50 -07:00
ZappoMan	32d5eb3cea	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: assignment-client/CMakeLists.txt interface/CMakeLists.txt libraries/entities/CMakeLists.txt libraries/models/src/ModelEditPacketSender.cpp libraries/models/src/ModelEditPacketSender.h libraries/models/src/ModelItem.cpp libraries/models/src/ModelItem.h libraries/octree/src/OctreeEditPacketSender.cpp libraries/octree/src/OctreeEditPacketSender.h libraries/octree/src/OctreePacketData.h libraries/octree/src/OctreeQuery.cpp libraries/particles/src/ParticleEditPacketSender.cpp libraries/particles/src/ParticleEditPacketSender.h libraries/script-engine/CMakeLists.txt tests/octree/CMakeLists.txt	2014-08-18 15:16:35 -07:00
Andrew Meadows	543bf5224c	add VerletPoint::shift()	2014-08-18 12:54:26 -07:00
Andrew Meadows	7e7978de1a	compute and store Ragdoll::_accumulatedMovement	2014-08-18 12:53:04 -07:00
Andrew Meadows	fe5f9f8fe5	use relative mass when enforcing ContactPoint	2014-08-18 12:49:47 -07:00
Andrew Meadows	54851c5ced	add Ragdoll::_accumulatedMovement	2014-08-18 12:49:12 -07:00
Andrew Meadows	432c14408c	removed hackery from ContactPoint enforcement	2014-08-14 15:29:57 -07:00
Andrew Meadows	98d27ad2b5	more correct names for ContactPoint API renamed (and disabled) the useless enforce() to applyFriction() changed the buildConstraints() method to more correct name: enforce() will eventually change how ContactPoint actually works, but later	2014-08-14 15:17:03 -07:00
Andrew Meadows	60d411ead5	cleanup Ragdoll API (less "ragdoll" qualifiers)	2014-08-14 14:41:51 -07:00
Andrew Meadows	46c91052c9	split SkeletonModel and Ragdoll classes apart	2014-08-14 14:29:03 -07:00
Andrew Meadows	ee0d0a1566	remove ragdoll from simulation in dtor	2014-08-14 09:20:53 -07:00
wangyix	81fa5ed41f	readPendingDatagrams stats printed and sent to domain page jittertester now prints out send or receive error msgs	2014-08-13 16:48:06 -07:00
Andrew Meadows	f66398d366	adding comment about parameter's purpose	2014-08-13 15:06:34 -07:00
Andrew Meadows	7852321152	merge upstream/master into andrew/ragdoll	2014-08-13 14:52:14 -07:00
Andrew Meadows	b177686f74	minor tweak to how ContactPoint is updated	2014-08-13 14:50:25 -07:00
Andrew Meadows	2f1a56a87c	ContactPoint tries to help maintain collisions so that collision events will continue to update the contact	2014-08-13 13:48:04 -07:00
wangyix	b17c9102c9	added stats for readPendingDatagrams in audiomixer	2014-08-13 13:30:02 -07:00
Andrew Meadows	bc432aa8e8	use relative masses for ContactPoint contsrtaint	2014-08-13 11:29:54 -07:00
Andrew Meadows	4de43b7cbe	cleanup and reordering of code	2014-08-13 11:19:32 -07:00
wangyix	db0fbcab97	merge with upstream	2014-08-13 11:09:55 -07:00
ZappoMan	3551bd676f	quiet a lot of debugging, fix issue with updating entities that overhang the domain bounds	2014-08-12 13:14:28 -07:00
ZappoMan	027b1d58cc	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: interface/src/Application.h interface/src/entities/EntityTreeRenderer.h interface/src/models/ModelTreeRenderer.cpp libraries/models/src/ModelItem.h libraries/models/src/ModelTree.h	2014-08-08 14:26:56 -07:00
Stephen Birarda	d5b1bee13c	resolve conflicts on merge with upstream master	2014-08-08 13:48:32 -07:00
Stephen Birarda	6eb2c73624	add assert include to SharedUtil	2014-08-08 13:23:54 -07:00
Stephen Birarda	b1310c065c	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
Stephen Birarda	27419b7b6b	fix some build blockers in test directory	2014-08-08 13:17:54 -07:00
Stephen Birarda	26f7b1ba62	add macro to link shared dependencies to target	2014-08-08 13:17:54 -07:00
Stephen Birarda	c9f8433a2d	tweak setup_hifi_library to bubble up full path of Qt modules	2014-08-08 13:17:54 -07:00
Stephen Birarda	87cf262b9e	get to successful cmake after library link macro changes	2014-08-08 13:17:53 -07:00
Stephen Birarda	0378fb3049	break glm helpers out of SharedUtil	2014-08-08 13:17:53 -07:00
Stephen Birarda	892e30c5e1	get past assignment-client build after cmake auditing	2014-08-08 13:17:53 -07:00
Stephen Birarda	b5c8a4d2c6	fix requirement of networking in audio library	2014-08-08 13:17:52 -07:00
Stephen Birarda	fa26957b23	more CMakeLists cleanup for sub-dependencies	2014-08-08 13:17:52 -07:00
Stephen Birarda	33e5826842	remove animation server, bubble up qt modules	2014-08-08 13:17:52 -07:00
Stephen Birarda	9a50532b1f	bubble up sub dependencies to link_hifi_library	2014-08-08 13:17:52 -07:00
wangyix	63624fae7d	cleaned up code, fixed typos	2014-08-08 11:40:48 -07:00
wangyix	b670226ee3	removed printf, removed random copy of some file	2014-08-08 11:22:04 -07:00
Philip Rosedale	96a795eea4	Merge pull request #3263 from AndrewMeadows/ragdoll Ragdoll Part 9:	2014-08-07 22:12:31 -07:00
wangyix	1153a76ab1	new option knobs added, no new behavior yet	2014-08-07 16:37:36 -07:00
ZappoMan	84f3ede32f	small change to force rebuild	2014-08-07 15:09:24 -07:00
Andrew Meadows	bb33266635	merge upstream/master into andrew/ragdoll	2014-08-07 14:37:10 -07:00
Andrew Meadows	94da63006c	VerletPoint::_mass is now private We set the mass of other avatars artificially high so they are less movable.	2014-08-07 14:35:32 -07:00
Andrew Meadows	0f784a9cc5	add other ragdolls to simulation	2014-08-07 13:09:05 -07:00
wangyix	357ba92181	working towards more dials for InboundAdioStream	2014-08-07 12:41:09 -07:00
Andrew Meadows	87350ad2d0	ragdoll simulation now in model-relative frame (same rotation as world-frame, but translated to MyAvatar origin)	2014-08-07 11:45:06 -07:00
Andrew Meadows	27b876e84c	namechange _frame --> _frameCount	2014-08-07 09:02:31 -07:00
AndrewMeadows	2653b33b67	Merge pull request #3257 from Atlante45/referentials Referentials	2014-08-06 14:12:18 -07:00
Andrew Meadows	cb8c0792b2	make main ragdoll and entity special also addded some logic (unused) to add ragdolls of other avatars	2014-08-06 10:43:56 -07:00
Andrew Meadows	a1fccdb177	remove dangling shape pointers from PhysicsSimulation	2014-08-05 08:32:14 -07:00
Andrew Meadows	39d3deee90	merge upstream/master into andrew/ragdoll	2014-08-04 17:37:28 -07:00
Andrew Meadows	f126ce299a	ContactPoint = set of assymetric distance consraints	2014-08-04 17:34:24 -07:00
Andrew Meadows	4beee3fecf	add Shape::getVerletPoints()	2014-08-04 17:33:24 -07:00
Andrew Meadows	d1b2ba4a43	fix bug: false positive capsuleCapsule() collision for capsules with parallel axes and negative pojection of center-to-center separation also replace fabs() with fabsf()	2014-08-04 17:30:23 -07:00
Stephen Birarda	9fc545001c	look for a config.json file by default in resources	2014-08-04 15:40:45 -07:00
Atlante45	d9dde06c14	Various tweaks to referentials	2014-08-04 14:59:15 -07:00
ZappoMan	3a8c5018ee	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: interface/src/Application.h libraries/entities/src/EntityTreeElement.h libraries/models/src/ModelItem.cpp libraries/models/src/ModelItem.h libraries/models/src/ModelTree.cpp libraries/models/src/ModelTree.h libraries/models/src/ModelTreeElement.cpp libraries/networking/src/PacketHeaders.h libraries/octree/src/OctreeEditPacketSender.cpp libraries/octree/src/OctreeEditPacketSender.h	2014-08-04 12:01:23 -07:00
Andrew Meadows	1ec6ee05f3	Rename ContactConstraint to ContactPoint	2014-08-01 15:08:21 -07:00
Andrew Meadows	3305f5edf9	merge upstream/master into andrew/ragdoll	2014-08-01 11:13:18 -07:00
Andrew Meadows	789eeed760	limit action of ContactConstraint to penetration	2014-08-01 11:11:41 -07:00
Andrew Meadows	9d2744296e	update physics stats names	2014-07-31 13:33:46 -07:00
Andrew Meadows	fc1d805d54	add ContactConstraint and use to impede muscles	2014-07-31 13:16:06 -07:00
Andrew Meadows	0f82236f2c	minor cleanup	2014-07-31 13:09:10 -07:00
Andrew Meadows	0b9f246661	set the shape ID in the ctor's NOT the dtor	2014-07-31 13:08:27 -07:00
ZappoMan	77e1867b11	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: assignment-client/src/Agent.cpp assignment-client/src/Agent.h examples/editModels.js interface/src/Application.h	2014-07-31 10:34:23 -07:00
Brad Hefta-Gaub	d4d4069f11	Merge pull request #3225 from birarda/master cmake file cleanup to suppress warnings on cmake 3.0	2014-07-30 19:20:18 -07:00
Brad Hefta-Gaub	d6e6cfd585	Merge pull request #3216 from wangyix/inbound_audio_stream Audio ringbuffer classes refactored into subclasses of InboundAudioStream	2014-07-30 18:00:17 -07:00
Stephen Birarda	2796f71419	library cleanup to suppress warnings on cmake 3.0	2014-07-30 15:06:15 -07:00
Andrew Meadows	f579d2a0e2	add CollisionInfo::getShapePairKey()	2014-07-30 13:11:45 -07:00
Andrew Meadows	176d8d157d	remove unused Constraint::_type	2014-07-30 13:07:32 -07:00
Andrew Meadows	7b76753daf	add PhysicsSimulation::_frame	2014-07-30 11:45:53 -07:00
Andrew Meadows	c0689f3784	fix old bug: rotation of CapsuleShape not updated when setting endpoints directly	2014-07-30 11:30:08 -07:00
Andrew Meadows	53db6dec13	fix old copy-n-paste typo	2014-07-30 11:29:43 -07:00
Andrew Meadows	917833d92a	namechange for Shape::_id	2014-07-30 11:29:07 -07:00
Andrew Meadows	dde0cbddcc	add Shape::_id	2014-07-30 11:09:19 -07:00
Andrew Meadows	81ba686fdf	more perfstats for ragdoll simulation	2014-07-30 11:02:47 -07:00
Andrew Meadows	67b9c185eb	formatting and minor tweaks to constraint strengths	2014-07-29 16:48:34 -07:00
wangyix	71c23eac1e	added TimeWeightedAvg to InboundAudioStream _maxFramesOverDesired hardcoded right now	2014-07-29 13:51:46 -07:00
Atlante45	03031c4c04	Outdated link	2014-07-28 16:36:12 -07:00
ZappoMan	805a88b73b	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: examples/editModels.js interface/src/entities/EntityTreeRenderer.h libraries/models/src/ModelsScriptingInterface.cpp libraries/script-engine/src/ScriptEngine.cpp	2014-07-28 13:39:35 -07:00
wangyix	9bbd055404	added stdev method of jitter calc to InboundAudioStream	2014-07-28 11:41:08 -07:00
Andrew Meadows	60612f6397	implement VerletPoint::integrateForward()	2014-07-25 15:23:12 -07:00
Andrew Meadows	b2c2cfec79	implement base Ragdoll::stepRagdollForward()	2014-07-25 15:22:25 -07:00
Andrew Meadows	2ddca4fbf9	split independent classes out of Ragdoll files	2014-07-24 09:50:16 -07:00
Andrew Meadows	b62f04e9fe	check for nan's coming out of rotationBetween()	2014-07-23 16:51:53 -07:00
Andrew Meadows	c0e02107c5	minor cleanup	2014-07-23 16:51:26 -07:00
ZappoMan	30aee70346	latest work	2014-07-21 09:18:21 -07:00
Philip Rosedale	1b265f3adb	Merge pull request #3180 from AndrewMeadows/ragdoll Ragdoll Part4: ragdoll shapes follow target joints, visible joints follow ragdoll shapes	2014-07-17 16:00:02 -07:00
Brad Hefta-Gaub	437e3efbc2	Merge pull request #3179 from wangyix/quick_audio_PR Lost audio packets are replaced with silent frames in AudioMixer; AudioMixer silent-packet-dropping now enabled no matter what; Moving avg of audio frames available replaces _currentJitterBufferFrames	2014-07-17 11:44:05 -07:00
Andrew Meadows	b22652f441	merge upstream/master into andrew/ragdoll	2014-07-17 10:52:27 -07:00
Andrew Meadows	66158cb8a2	fix capsule-vs-capule collision test	2014-07-17 09:19:17 -07:00
wangyix	6764ace8eb	droppable silent packets are added for dropped packets; _currentJitterBufferFrames replaced with moving average of frames available. Downstream framesAvailable stat now includes the frames in QAudioOutput as well as the ringbuffer.	2014-07-16 14:41:24 -07:00
Andrew Meadows	922912b784	merge upstream/master into andrew/ragdoll Conflicts: interface/src/Menu.h	2014-07-16 09:00:36 -07:00
Andrzej Kapolka	469e31cc05	Script bindings for QColor.	2014-07-15 16:44:02 -07:00
ZappoMan	1eb472c43a	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities	2014-07-15 10:05:06 -07:00
ZappoMan	2baac96665	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: examples/sit.js interface/src/Application.cpp libraries/models/src/ModelItem.cpp libraries/models/src/ModelsScriptingInterface.cpp	2014-07-15 10:04:40 -07:00
wangyix	1047ec7c87	merge with upstream	2014-07-14 16:25:26 -07:00
Aleric Inglewood	935f28aa35	Type fix. That that even compiled :/	2014-07-14 21:18:37 +02:00
wangyix	cb5a9bf668	moved some const defs to avoid redefinition	2014-07-14 10:43:02 -07:00
Aleric Inglewood	13c2c69d06	Fix another typo in previous commit	2014-07-13 20:54:27 +02:00
Aleric Inglewood	ea98b58b40	Debug support: allow printing of glm types to QDebug. This adds support for serialization to QDebug of glm::vec3, glm::quat and glm::mat4. Output example: qDebug().nospace() << "Calling PhysicsEntity::findRayIntersection(" << origin << ", " << direction << ", &distance) const; numShapes = " << numShapes; leads to: [2014-07-13T20:24:47] Calling PhysicsEntity::findRayIntersection({type='glm::vec3', x=5222.45, y=2159.05, z=6527.79}, {type='glm::vec3', x=0, y=-0.119145, z=-0.992877}, &distance) const; numShapes = 0 Note that we explicitly don't return dbg.space() because we want to be able to print these things comma separated as follows: {...}, {...}, ... as opposed to {...} , {...} etc. I changed the already existing operator<< for Box to the more general case, where it just prints its members and doesn't mess with the internals of its members. The result is more verbose, but also more recognizable when in the future everything will look the same, allowing for speed reading the debug output. The constructor of Box needed to made explicit because it was too annoying that when one forgets to #include "StreamUtils.h" that writing a glm::vec3 resulted in printing out a Box, implicitly converted from the vector.	2014-07-13 20:43:02 +02:00
wangyix	82e9aa8bb7	made stats easier to read; reverted injected stream deletion conditions	2014-07-11 16:08:15 -07:00
Andrew Meadows	c5a5f8c5d4	bug fix: bad logic in capsule-vs-capsule	2014-07-11 10:54:16 -07:00
Andrew Meadows	7c8f5e2c12	Remove some old TODO comments	2014-07-11 10:54:03 -07:00
wangyix	25f4f63a1e	added window PacketStreamStats to AudioStreamStats	2014-07-10 16:42:23 -07:00
ZappoMan	780532bfd8	more model to entity renaming, adding AABox:clamp() and AACube::clamp() fix AddEntity to support adding an entity that extends over bounds of universe	2014-07-10 13:42:49 -07:00
wangyix	35419eb939	Merge remote-tracking branch 'upstream/master' into quick_audio_PR	2014-07-10 11:56:35 -07:00
wangyix	a955a17472	changed RingBufferHistory to use qvector instead of raw array	2014-07-10 11:55:19 -07:00
wangyix	0b213f9616	streamlined AudioStreamStats packing; added #include <limits>	2014-07-10 10:44:33 -07:00
wangyix	35e4b253c2	added typename keyword in MovingMinMaxAvg.h	2014-07-10 10:35:29 -07:00
wangyix	763cc26fa9	added operator= to RingBufferHistory<T>::Iterator	2014-07-10 10:21:03 -07:00
wangyix	37b60a63b2	removed spaces	2014-07-10 10:01:32 -07:00
wangyix	0d83b9a6f6	tidied up code	2014-07-10 09:51:01 -07:00
wangyix	01f10024ae	all stats added, needs testing; created PacketStreamStats struct	2014-07-09 18:13:33 -07:00
wangyix	81e168f657	added RingBufferHistory template class, used it in SentPacketHistory and MovingMinMaxAvg	2014-07-09 15:38:03 -07:00
Andrew Meadows	9ce6844e9d	fix accidental broken class definition	2014-07-09 14:39:08 -07:00
Andrew Meadows	63bcee0229	fix whitespace formatting	2014-07-09 14:33:09 -07:00
wangyix	d03d3ef817	new auidostreamstats displayed in interface, domain page stats updated	2014-07-09 11:59:50 -07:00
Andrew Meadows	d26585728b	Improved stat accumulation and context names	2014-07-09 11:53:53 -07:00
Andrew Meadows	d214998d1a	enforce coding standard: explicit casts	2014-07-09 11:53:09 -07:00
wangyix	54e8ed5e11	added MovingMinMaxAvg and unit test; added additional stats to AudioStreamStats struct	2014-07-09 09:41:49 -07:00
ZappoMan	c449ba27a9	more virtual entity work	2014-07-03 15:18:17 -07:00
ZappoMan	ec0c350f60	Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities Conflicts: interface/src/Application.cpp interface/src/DatagramProcessor.cpp libraries/script-engine/src/ScriptEngine.cpp	2014-07-03 14:20:40 -07:00
Andrew Meadows	8c8a29f477	merge upstream/master into andrew/ragdoll	2014-07-03 09:27:52 -07:00
Andrew Meadows	356a29c2fb	add AngularConstraint::softClamp() for hands	2014-07-03 08:40:34 -07:00
Atlante45	106e5b578b	Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager	2014-07-02 16:06:41 -07:00
Clément Brisset	1f92d57230	Merge pull request #3103 from AlericInglewood/19827 Code Review for Job #19827	2014-07-02 15:53:57 -07:00
Atlante45	6e02561d96	Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager	2014-07-02 14:08:57 -07:00
Andrew Meadows	f5debdb930	merge upstream/master into andrew/bispinor	2014-07-02 11:23:42 -07:00
Atlante45	15b37ec3d1	Switched ResourceCache to NetworkAccessManager	2014-07-02 11:21:07 -07:00
Andrew Meadows	5934ee5b22	added tests for ConeRollerConstraint	2014-07-01 09:35:47 -07:00
Andrew Meadows	9ca1bfdfe5	add AngularConstraint.* with some unit tests more unit tests to follow	2014-06-30 18:05:22 -07:00
Aleric Inglewood	f13bbdfae6	Compile fix for non-standard Qt5 install. When Qt5 5.2.1 is compiled from source, configured with -developer-build, and used without being installed; then compiling interface results in the following compile error: libraries/shared/src/RegisteredMetaTypes.h:17:34: fatal error: QtScript/QScriptEngine: No such file or directory This commit fixes this by explicitely adding the include directory for QtScript/QScriptEngine to libraries/shared/CMakeLists.txt Likewise we get the compile error: In file included from /opt/highfidelity/hifi/hifi/animation-server/../libraries/voxels/src/VoxelEditPacketSender.h:18:0, from /opt/highfidelity/hifi/hifi/animation-server/src/AnimationServer.cpp:26: /opt/highfidelity/hifi/hifi/animation-server/../libraries/voxels/src/VoxelDetail.h:15:34: fatal error: QtScript/QScriptEngine: No such file or directory which is fixed by added the include directory for QtScript/QScriptEngine to animation-server/CMakeLists.txt Finally, compile errors like In file included from /opt/highfidelity/hifi/hifi/libraries/audio/src/AudioInjectorOptions.h:20:0, from /opt/highfidelity/hifi/hifi/libraries/audio/src/AudioInjector.h:21, from /opt/highfidelity/hifi/hifi/libraries/audio/src/AudioInjector.cpp:22: /opt/highfidelity/hifi/hifi/assignment-client/../libraries/shared/src/RegisteredMetaTypes.h:17:34: fatal error: QtScript/QScriptEngine: No such file or directory that requires to do the same in libraries/audio/CMakeLists.txt	2014-06-30 02:06:44 +02:00
Andrew Meadows	552efa3e91	remove warning: unused variables	2014-06-25 09:01:49 -07:00
ZappoMan	a019b70e58	Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel Conflicts: tests/octree/CMakeLists.txt tests/octree/src/ModelTests.cpp tests/octree/src/main.cpp	2014-06-24 15:59:17 -07:00
Andrew Meadows	df740dd82a	Fix bad static const inside class.	2014-06-23 14:07:09 -07:00
Andrew Meadows	e2204ab78e	friend foo --> friend class foo	2014-06-23 13:59:44 -07:00
Andrew Meadows	3e0673418f	more complete physics iteration for stability	2014-06-23 12:32:23 -07:00
Andrew Meadows	5e4d757e4e	merge upstream/master into andrew/ragdoll	2014-06-23 10:43:40 -07:00
Andrew Meadows	b50bf09c93	findPlaneCollisions() works in theory, not used	2014-06-23 10:39:50 -07:00
Andrew Meadows	8986be5f1c	remove old collideAgaintsOurself() code	2014-06-23 10:36:31 -07:00
Andrew Meadows	c1c2df5933	remove debug include	2014-06-23 08:53:58 -07:00
Andrew Meadows	b2ea8c0bf9	Compute more correct masses for ragdoll parts also pin root ragdoll shape at the local-frame origin for stability	2014-06-23 08:37:11 -07:00
Andrew Meadows	ea83a97b75	Add getVolume() method to Shape	2014-06-23 08:36:45 -07:00
Andrzej Kapolka	de0c45a919	Spanner mutation in test.	2014-06-20 18:09:51 -07:00
Andrew Meadows	dcd9d8871d	re-enabling some temporary debug stuff	2014-06-20 16:36:44 -07:00
Andrew Meadows	c17b8fdb60	collisions update shapes VerletShapes keep pointers to VerletPoints (rather than to glm::vec3's) VerletShapes compute lagrangian coefficients VerletShapes send their movement accumulations to their VerletPoints	2014-06-20 16:31:39 -07:00
Andrew Meadows	c7ad3da47d	stubbery for processing collisions PhysicsSimulation tells CollisionInfos to apply() themselves CollisionInfo knows how to apply() itself to affected shapes Shape gets _mass and some stubbed methods for accumulating movement VerletPoint gets movement accumulator	2014-06-20 10:55:57 -07:00
Andrew Meadows	4a0ce7a9ae	support disabling collisions btw adjacent joints	2014-06-19 17:39:50 -07:00
Andrew Meadows	f0c2417206	Split PhysicsSimulation::stepForward() into parts	2014-06-19 15:50:16 -07:00
Andrew Meadows	716ae3e479	add MyAvatar's skeleton to its PhysicsSimulation	2014-06-19 12:32:17 -07:00
Andrew Meadows	828c365b25	more dtor cleanup of back pointers	2014-06-19 11:57:32 -07:00
Andrew Meadows	9950c5b209	remove entities in PhysicsSimulation dtor	2014-06-19 11:52:44 -07:00
Andrew Meadows	fbafcb6fd8	Fix distance constraint lengths	2014-06-19 11:46:09 -07:00
Andrew Meadows	2453e9c36a	build ragdoll constraints again	2014-06-19 10:31:55 -07:00
Andrew Meadows	5e74ee8c05	VerletPoint has position, lastPosition, and mass	2014-06-19 09:54:32 -07:00
Andrew Meadows	d3a78c9fc2	simulation step stubbed out	2014-06-19 09:14:36 -07:00
Andrew Meadows	a8c2003fe6	namechange SimulationEngine --> PhysicsSimulation	2014-06-19 08:34:12 -07:00
Andrew Meadows	7cd1f75282	PhysicalEntity gets backpointer to SimulationEngine	2014-06-18 20:47:57 -07:00
Andrew Meadows	c98631f820	merge upstream/master into andrew/ragdoll	2014-06-18 17:23:24 -07:00
Andrew Meadows	d4b5550cda	Skeleton now creates VerletShape	2014-06-18 17:22:39 -07:00
ZappoMan	28c7c24399	Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel Conflicts: libraries/octree/src/AABox.h	2014-06-18 15:27:36 -07:00
ZappoMan	c54bdb3e8d	Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel	2014-06-18 15:20:08 -07:00
Andrew Meadows	3791b4712b	adding some documentation about the VerletShapes	2014-06-18 14:17:12 -07:00
Andrew Meadows	96eebec0fc	unit tests for VerletShapes	2014-06-18 14:06:00 -07:00
Stephen Birarda	5878b4af59	setup listener unattenuated zones for source ring buffers	2014-06-18 12:50:16 -07:00
Brad Hefta-Gaub	c49ff59725	Merge pull request #3037 from wangyix/edit_nack_pull Edit nack pull	2014-06-18 11:43:25 -07:00
Andrew Meadows	9e839f0980	Shape::getCenter() -> Shape::getTranslation()	2014-06-18 08:55:48 -07:00
ZappoMan	5a246fab26	Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel Conflicts: tests/octree/src/main.cpp	2014-06-17 17:45:06 -07:00
Andrew Meadows	b9d4545aef	merge upstream/master into andrew/ragdoll Conflicts: libraries/shared/src/Shape.h libraries/shared/src/ShapeCollider.h	2014-06-17 17:03:16 -07:00
Andrew Meadows	ecbf5043d7	code out of Model into base and derived classes PhysicalEntity (base class) gets some shape management stuff SkeletonModel (derived class) gets some boundary shape and joint-shape stuff	2014-06-17 16:22:18 -07:00
Andrew Meadows	b6cecf3cfd	Add SphereShape.cpp to project	2014-06-17 12:50:49 -07:00
Andrew Meadows	f18864bd72	Moved findRayIntersection() to the Shape classes	2014-06-17 12:36:36 -07:00
Andrew Meadows	018ba52b1c	merge upstream/master with andrew/inertia	2014-06-17 10:50:49 -07:00
Andrew Meadows	ab3d582d79	Add ray intersection tests against most shapes.	2014-06-17 10:49:14 -07:00
Andrew Meadows	e75340f8ce	Add PlaneShape::getNormal() method.	2014-06-17 10:48:29 -07:00
Andrew Meadows	118717d96a	Shapes moved from Model into PhysicalEntity	2014-06-16 14:51:58 -07:00
Kai Ludwig	d08b63b247	changed 2000 into a constant defined inline	2014-06-16 23:30:28 +02:00
Andrew Meadows	1496e6c8b2	add VirletSphereShape and VirletCapsuleShape	2014-06-16 12:29:41 -07:00
Andrew Meadows	3a2f322ca3	SphereShape, CapsuleShape support derived classes	2014-06-16 12:23:18 -07:00
wangyix	2b20720f51	added sendNackPackets() to OctreeInboundPacketProcessor added rollover handling in _missingSequenceNumbers pruning; added EditNack packet types; added getMyEditNackType() to OctreeServer subclasses; added code to randomly skip edit packet sequence numbers for testing in OctreeEditPacketSender	2014-06-16 09:57:05 -07:00
Andrew Meadows	3fd4ee02ff	Shape uses "center" instead of "position"	2014-06-16 08:55:08 -07:00
Andrew Meadows	92159a7ed5	Shape::get/setCenter() instead of get/setPosition()	2014-06-16 08:43:27 -07:00
Andrew Meadows	d7a28e1441	enable shape collisions for MyAvatar skeleton also some stubbery for main simulation loop	2014-06-15 18:07:47 -07:00
Andrew Meadows	6f4a4ace0d	add API stubs to RagDoll for SimulationEngine stepForward	2014-06-15 17:58:27 -07:00
Andrew Meadows	6d27987226	Add shape vs list-of-shapes collision method and list-of-shapes vs list-of-shapes	2014-06-15 17:56:02 -07:00
Kai Ludwig	3fbde70f96	Added functions to test usleep, msleep and sleep for accuracy.	2014-06-15 21:05:23 +02:00
Andrew Meadows	158c7de76e	Ragdoll not an Entity. SkeletonModel is a Ragdoll	2014-06-13 12:27:58 -07:00
Andrew Meadows	5bd37acdb8	Changed RagDoll to Ragdoll	2014-06-13 11:55:39 -07:00
Andrew Meadows	417a7def07	SimulationEngine::enforceConstraints() takes args ...for limiting simulation costs	2014-06-13 11:10:32 -07:00
Andrew Meadows	fb7f5707c8	add SimulationEngine, MyAvatar has one.	2014-06-12 18:15:20 -07:00
John Grosen	f0cb49ef5c	added space between expressions in ternary operator	2014-06-12 17:24:56 -07:00
John Grosen	8e74398ed7	Fixed command line args parsing bug	2014-06-12 17:06:59 -07:00
Andrew Meadows	5be470bcbc	add PhysicalEntity class Model and RagDoll derive from PhysicalEntity Shape gets back pointer to its Entity (shape sharing not possible) CollisionInfo gets backpointers the shapes involved	2014-06-12 13:13:00 -07:00
Andrew Meadows	5f5ffff23c	merge	2014-06-10 15:25:25 -07:00
Andrew Meadows	3c51ce76fc	Add simulationID to Model Shape and CollisionInfo	2014-06-10 15:24:17 -07:00
ZappoMan	c5647addf4	Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements	2014-06-09 14:10:47 -07:00
Andrew Meadows	5a76a9b4b1	RagDoll keeps a pointer to list of shapes	2014-06-09 11:04:20 -07:00
ZappoMan	8834da60b9	aded encoded length to property flags	2014-06-09 10:41:11 -07:00
ZappoMan	6943b3f763	remove debugging	2014-06-09 10:40:29 -07:00
Andrew Meadows	90c55ad06c	fix some comments	2014-06-06 16:09:21 -07:00
Andrew Meadows	131a2c27b8	move RagDoll to libraries/shared	2014-06-06 15:51:50 -07:00
Andrew Meadows	0addf3bae4	cleaup: remove some unused collision code remove CollisionInfo::_type remove unused Avatar collision response stuff comment out some code that works but will probably be replaced	2014-06-06 14:36:05 -07:00
Andrew Meadows	ca77eb9d1e	cleanup of avatar collisions, prep for more ragdoll collisions removal of paddle hands particles use general sphere collision path against avatars temp removal of skeleton self collision	2014-06-06 10:51:22 -07:00
Andrew Meadows	e8724b02f3	add CapsuleShape::setEndPoints()	2014-06-06 08:50:57 -07:00
ZappoMan	751c27041b	add additional assert to guard proper usage of ByteCountCoding	2014-06-05 16:01:58 -07:00
ZappoMan	2a73a91775	first cut at ByteCountCoding template, additional features in PropertyFlags template	2014-06-05 12:52:03 -07:00
Philip Rosedale	3cc67f5229	Merge pull request #2984 from ZappoMan/octreeWireformatImprovements Octree wireformat improvements checkpoint	2014-06-04 21:58:08 -07:00
ZappoMan	c7a502e2c9	removed empty file	2014-06-04 15:18:11 -07:00
ZappoMan	2066dbcec7	cleanup	2014-06-04 15:16:51 -07:00
wangyix	5251057ed6	MovingPercentile moved else to same line as }	2014-06-04 15:13:16 -07:00
ZappoMan	10f7eae7a0	implemented decode	2014-06-04 14:56:13 -07:00
wangyix	0da6374e19	MovingPercentile .size() consistency	2014-06-04 14:31:58 -07:00
wangyix	e2d3fcc518	changed MovingPercentile to use QList	2014-06-04 14:24:23 -07:00
ZappoMan	78d3f1454c	more operators	2014-06-04 14:19:35 -07:00
ZappoMan	2b85145325	added test suite for PropertyFlags, latest work on PropertyFlags	2014-06-04 11:41:09 -07:00
wangyix	25e2f28b02	more cleanup	2014-06-04 11:30:35 -07:00
wangyix	b452d08495	cleaned up debug statements also reorganized MovingPercentile a little bit	2014-06-04 11:20:29 -07:00
wangyix	12ac6105f1	changed MovingMedian to MovingPercentile	2014-06-04 10:59:32 -07:00
ZappoMan	b48c70a7f7	first cut at PropertyFlags template class	2014-06-04 10:23:50 -07:00
wangyix	c851edd0ef	added MovingMedian class, but not using it added packet type/time data collection to DatagramProcessor and post-execution prints of that info.	2014-06-03 16:18:40 -07:00
ZappoMan	e6966c2155	add improved detailed rendering and FPS debugging stats	2014-05-29 12:12:23 -07:00
barnold1953	5013c8c2fa	Fixed script editor crash when script calls Script.stop(). Also made the processEraseMessage wait until it can lock to ensure particles are deleted.	2014-05-22 12:45:36 -07:00
Stephen Birarda	981f9df6b3	add option to pass data server username and password to DS	2014-05-21 09:53:09 -07:00
Stephen Birarda	8e9defad3e	send an updated address to data-server with domain (when changed)	2014-05-15 12:18:24 -07:00
Brad Hefta-Gaub	e088c3d115	Merge pull request #2834 from AndrewMeadows/thermonuclear remove leap fingers	2014-05-13 08:04:40 -07:00
Andrew Meadows	49dedb72c9	remove FingerData class and related cleanup	2014-05-12 11:09:12 -07:00
Andrzej Kapolka	363f545f7c	After uploading, refresh the uploaded files so that they are immediately redownloaded.	2014-05-09 17:50:08 -07:00
Andrew Meadows	8ec493e85b	fix bad penetration depth for interior of cube	2014-05-07 12:39:20 -07:00
Andrew Meadows	9fc1c765d3	overhaul of CollisionInfo store Cube info for sphereAACube collisions	2014-05-07 11:40:00 -07:00
Andrzej Kapolka	2a32700a30	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-05-05 17:03:31 -07:00
Andrew Meadows	5ffd307926	Merge upstream/master into andrew/inertia Conflicts: interface/src/avatar/MyAvatar.h	2014-05-05 13:54:25 -07:00
Andrew Meadows	ddc9408a55	commit implementation of deleteLastCollision()	2014-05-05 12:32:23 -07:00
Andrew Meadows	f6b2b43376	forget collision for this failure case	2014-05-05 12:31:36 -07:00
Andrew Meadows	d2f858100e	add CollisionList::deleteLastCollision()	2014-05-05 12:30:38 -07:00
Andrew Meadows	0cecef6441	fix "nearly but not quite" edge/corner collisions	2014-05-05 10:01:31 -07:00
Andrew Meadows	b097eed1aa	fix sphere-cube collisions at edges (really)	2014-05-05 08:47:02 -07:00
Andrzej Kapolka	53a2760905	More attachment bits.	2014-05-04 16:24:23 -07:00
Andrew Meadows	0e3d66caf6	fix incorrect rescale of vec3	2014-05-02 22:27:52 -07:00
Andrew Meadows	c8e56a97cc	fix sphere-cube collisions, with tests	2014-05-02 21:47:27 -07:00
Andrew Meadows	9ceda573cc	sphere-cube: add the penetration don't subtract it	2014-05-02 10:39:27 -07:00
Andrzej Kapolka	322e12b9de	Allow users to clear the head URL and have no separate head model.	2014-05-01 17:55:16 -07:00
Andrew Meadows	4e34d0339d	set position in ctor that takes endpoints and some cleanup	2014-04-29 15:15:53 -07:00
Atlante45	6595b29a4f	More bug tracking	2014-04-29 10:55:30 -07:00
Andrew Meadows	b05a315b5a	merge upstream/master into andrew/inertia Conflicts: interface/src/avatar/MyAvatar.cpp	2014-04-25 14:52:44 -07:00
Atlante45	8b4a910040	Fix timestamp timer not fired	2014-04-25 12:19:18 -07:00
Andrew Meadows	73d0674565	expose MyAvatar.collisionGroups to JS	2014-04-24 11:19:08 -07:00
Andrzej Kapolka	4f8c1f9c65	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-23 16:09:23 -07:00
Clément Brisset	d441e6a453	Merge pull request #2717 from AndrewMeadows/inertia avatar bounding capsule collision against voxels	2014-04-23 16:06:14 -07:00
Andrzej Kapolka	d38d3db224	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-23 12:25:43 -07:00
Andrew Meadows	7464ca0879	non-rounded collision solution in comments	2014-04-23 08:38:58 -07:00
Andrew Meadows	1986ac6be3	collisions with cube get rounded normals at edges	2014-04-22 20:53:12 -07:00
Andrew Meadows	f3fd81ca59	use glm::modf() for less code	2014-04-22 14:26:52 -07:00
Atlante45	fea0a262a6	Put back missing windows header	2014-04-22 12:35:50 -07:00
Atlante45	3eeb3a539d	Fixed lack of resolution in usecTimestampNow()	2014-04-22 11:48:43 -07:00
Andrew Meadows	62121b1232	remove include of StreamUtils.h again	2014-04-22 11:46:15 -07:00
Andrew Meadows	65d3b4dc39	fix penetration direction for sphere-vs-AACube	2014-04-22 11:43:23 -07:00
Andrew Meadows	7537d240bb	toward working avatar-vs-voxel collisions again	2014-04-22 10:48:42 -07:00
Andrew Meadows	a45bc6c110	remove const from CollisionList subscript operator	2014-04-22 10:48:05 -07:00
Andrew Meadows	63c02f2b04	add subscript operator for CollisionList	2014-04-21 18:22:34 -07:00
Andrew Meadows	1782e803c9	remove include StreamUtils.h	2014-04-21 18:21:39 -07:00
Andrew Meadows	8d6fa8f904	fix sphere-vs-axis-aligned-cube logic	2014-04-21 18:19:59 -07:00
Atlante45	fd20686f0f	Removed Systime.h includes	2014-04-21 17:23:06 -07:00
Atlante45	be2db49e08	Last touch to removing gettimeofday	2014-04-21 16:44:21 -07:00
Atlante45	f7f30e118c	More gettimeofday cleanup	2014-04-21 15:17:11 -07:00
Andrew Meadows	06784aa960	move AABox back to octree lib Fleshing out ShapeCollider::collideShapeWithAACube()	2014-04-21 14:07:40 -07:00
Andrew Meadows	241df7a767	Move AABox from octree lib to shared lib Stubbed out Shape vs Octree collisions	2014-04-21 10:27:20 -07:00
Andrzej Kapolka	e2558bdac0	Experimenting with tweaking the Euler angles so that z, rather than y, is in [-pi/2, pi/2].	2014-04-18 17:16:20 -07:00
Andrzej Kapolka	58b063ee12	Make sure we call allReferencesCleared on the right thread.	2014-04-17 11:13:22 -07:00
Andrzej Kapolka	21fa833f19	Merge branch 'master' of https://github.com/highfidelity/hifi into animate Conflicts: interface/src/Application.cpp libraries/shared/src/SharedUtil.cpp libraries/shared/src/SharedUtil.h	2014-04-17 10:58:34 -07:00
ZappoMan	836913f1f0	Merge branch 'master' of https://github.com/worklist/hifi into moonshot	2014-04-16 15:21:15 -07:00
ZappoMan	bdf39186de	Merge branch 'master' of https://github.com/worklist/hifi into moonshot	2014-04-15 21:04:15 -07:00
ZappoMan	60c6b27ab2	cleanup code a bit, add support for diffusions even with no ray intersection	2014-04-15 11:38:11 -07:00
Stojce Slavkovski	1a3e6595c5	Allow users to set the destination of Snapshots	2014-04-15 19:36:02 +02:00
Andrzej Kapolka	a2dc58f7f9	Moved FBX code to its own library so that we can use it for bots.	2014-04-14 17:15:58 -07:00
Stephen Birarda	5904d19603	Merge pull request #2637 from birarda/authentication add optional DTLS option for domain-server to node communication	2014-04-14 10:24:17 -07:00
ZappoMan	7a993939bf	Merge branch 'master' of https://github.com/worklist/hifi into moonshot Conflicts: interface/interface_en.ts interface/src/Application.cpp interface/src/Application.h interface/src/Menu.h libraries/shared/src/SharedUtil.h	2014-04-14 09:43:29 -07:00
ZappoMan	a37921c1d5	move isNaN() to shared utils	2014-04-13 19:09:07 -07:00
Andrew Meadows	508d4f216d	fix #2656 avatar jumps very far away This was caused by a bad CapsuleShape::_radius when the default CapsuleShape was used to create a default bounding capsule. The penetration against such a shape could be arbitrarily large.	2014-04-11 15:55:18 -07:00
Andrzej Kapolka	873541dd7b	Trying out basic pushback for other avatars.	2014-04-10 11:56:17 -07:00
Stephen Birarda	cfc2431a59	don't be a dummy and include Systime header from implementation	2014-04-10 11:37:09 -07:00
Stephen Birarda	00a826330e	use GetSystemTimeAsFileTime with previous gettimeofday setup	2014-04-10 11:34:43 -07:00
Stephen Birarda	ea8f0df17d	use extern C in Systime header	2014-04-10 11:30:20 -07:00
Stephen Birarda	885cee28c5	guard Systime against being included on UNIX/OS X	2014-04-10 11:28:22 -07:00
Stephen Birarda	1daaf561de	don't include missing sys/time, declare gettimeofday in Systime header	2014-04-10 11:26:47 -07:00
Stephen Birarda	3651eff3d6	cleanup Systime to gettimeofday without lean and mean windows	2014-04-10 11:24:54 -07:00
Andrzej Kapolka	a12dd916fa	More plane intersection bits.	2014-04-10 11:24:45 -07:00
Stephen Birarda	7c9e0927ab	define WIN32_LEAN_AND_MEAN before include windows.h in Systime	2014-04-10 11:17:03 -07:00
Stephen Birarda	53aafd6897	rely on winsock2 for timeval declaration	2014-04-10 11:06:22 -07:00
Stephen Birarda	186c588d5a	remove doubled timeval definition from SharedUtil	2014-04-10 10:48:50 -07:00
Stephen Birarda	ba6f861ad8	fix unmatched #ifdef in Syssocket	2014-04-10 09:54:37 -07:00
Stephen Birarda	58298984d3	link GnuTLS to the assignment-client, fix timeval in SharedUtil	2014-04-10 09:48:47 -07:00
Stephen Birarda	1d5644a85f	link GnuTLS to octree library	2014-04-10 09:45:57 -07:00
Andrzej Kapolka	f61c746b4a	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-10 09:45:23 -07:00
Stephen Birarda	7e2b73906c	remove Syssocket include from SharedUtil	2014-04-10 09:35:25 -07:00
Stephen Birarda	d5d52f804f	add a networking library and link from appropriate targets	2014-04-10 09:32:17 -07:00
Andrew Meadows	4942e93daa	replace .f with .0f as per coding standard	2014-04-10 07:53:11 -07:00
Andrzej Kapolka	9f58264cb6	Working on plane collisions, pushing back camera from intersecting avatars.	2014-04-09 18:07:56 -07:00
Andrew Meadows	22d2f84cff	merge upstream/master into andrew/scripting	2014-04-09 15:38:56 -07:00
Stephen Birarda	1c861fbecb	resolve conflicts on merge with upstream master	2014-04-09 15:36:15 -07:00
Stephen Birarda	c208af2246	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-09 15:10:48 -07:00
Stephen Birarda	3fe5af1505	update boilerplate and include guards for other new files	2014-04-09 15:08:56 -07:00
Stephen Birarda	5a79079c09	fix boilerplates in new DTLS files	2014-04-09 15:03:56 -07:00
Stephen Birarda	d4f2c9e631	Merge branch 'master' of https://github.com/highfidelity/hifi into authentication	2014-04-09 14:40:14 -07:00
Andrew Meadows	635f832dfe	rename shapeShape() to be collideShapes() Also add collideShapesCoarse()	2014-04-09 13:04:17 -07:00
Stephen Birarda	ae4b8348a2	fix header include guards via regex	2014-04-09 12:03:17 -07:00
Stephen Birarda	ced5e72d39	add date to capsule shape	2014-04-09 10:46:36 -07:00
Stephen Birarda	2d755adfc0	repairs to good code blown away by regex	2014-04-09 10:46:20 -07:00
Stephen Birarda	11c235a29e	fixes to source files for code remove in regex replace	2014-04-09 10:16:56 -07:00
Stephen Birarda	684c6b5372	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00
Stephen Birarda	974d8c0427	prepare header files for regex run against cpp	2014-04-09 09:35:05 -07:00
Stephen Birarda	7ce91b3f96	fix headers who had their comments removed	2014-04-08 17:43:35 -07:00
Stephen Birarda	6a51df9e38	initial regex replacement of headers	2014-04-08 17:30:36 -07:00
Stephen Birarda	f3cbd120ce	header comment tweaks prior to regex match	2014-04-08 17:19:23 -07:00
Stephen Birarda	6681754994	Merge branch 'master' of https://github.com/highfidelity/hifi into authentication	2014-04-08 14:26:10 -07:00
Stephen Birarda	e417e7670b	cleanup DomainServer debug during config parsing	2014-04-08 14:07:31 -07:00
Atlante45	8ad7c3b239	Moved ModelUploader to interface + New error messages	2014-04-08 14:03:27 -07:00
Stephen Birarda	c2ff438182	add a CL + JSON settings reader	2014-04-08 13:37:07 -07:00
Atlante45	eaca699a6d	Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_work	2014-04-08 10:35:23 -07:00
Atlante45	e1a1ff3988	Code review	2014-04-08 10:32:49 -07:00
Stephen Birarda	080b0d7221	Merge branch 'master' of https://github.com/highfidelity/hifi into authentication	2014-04-08 10:28:14 -07:00
Brad Hefta-Gaub	881383a5f2	Merge pull request #2609 from AndrewMeadows/avatar-interaction More details in JS collision events	2014-04-08 06:52:04 -10:00
Atlante45	3be2319081	Removed all the temporaryDir junk	2014-04-07 16:18:23 -07:00
Atlante45	262c6d3206	Fixed double JSON callback when http error occurs	2014-04-07 14:35:13 -07:00
Atlante45	e85703d25b	Added feedback and a better success check	2014-04-07 13:48:28 -07:00
Atlante45	cec99caa47	Added upload progress tracking to AccountManager via JSON	2014-04-07 13:45:30 -07:00
Stephen Birarda	02e2135a2e	allow setting of expected DTLS cert hostname from AC	2014-04-07 12:52:26 -07:00
Stephen Birarda	86a0b715f3	verify DTLS certificate to ensure trust before handshaking	2014-04-07 11:36:32 -07:00
Stephen Birarda	0f92e02da7	add the hifi root CA trusted cert to source	2014-04-07 11:19:06 -07:00
Andrew Meadows	84d7e39d72	merge upstream/master into avatar-interaction	2014-04-07 10:05:25 -07:00
Andrew Meadows	d902580d6f	Add Collision metatype to JS script system	2014-04-07 10:03:10 -07:00
Stephen Birarda	69504b0a9d	proper cleanup of CA credentials on DTLSClientSession side	2014-04-07 09:47:51 -07:00
Stephen Birarda	efcf506383	resolve conflicts on merge with upstream master	2014-04-07 09:32:08 -07:00
Stephen Birarda	5adcf68752	sort nodes on DS page by their uptime	2014-04-07 09:08:51 -07:00
Stephen Birarda	45d796e8f3	allow re-handshake in NodeList after domain refresh	2014-04-04 15:56:02 -07:00
Andrzej Kapolka	1f3a5d09d9	Merge pull request #2593 from Atlante45/display_models_metadata Display models metadata	2014-04-04 15:18:18 -07:00
Stephen Birarda	c015fdd212	leverage a DummyDTLSSession to not require cleanup of DTLSSession for cookies	2014-04-04 11:42:14 -07:00
Stephen Birarda	b40dd6a31a	say bye and de-init DTLS session from DomainServer	2014-04-04 11:17:50 -07:00
Stephen Birarda	fd8e32190e	perform cleanup of GnuTLS structures across targets	2014-04-04 11:08:53 -07:00
Stephen Birarda	e2224e0f0c	cleanup node silence timing and use for DTLS timeouts	2014-04-04 10:56:04 -07:00
Stephen Birarda	c840904642	output a message when handshake has completed with a client	2014-04-04 10:44:15 -07:00
Stephen Birarda	efd176f93c	complete check in and heartbeat via DTLS	2014-04-04 09:56:57 -07:00
Stephen Birarda	7b6ce77690	add processing of DTLS datagrams to domain-server	2014-04-04 09:20:40 -07:00
Atlante45	ba4ccc22ef	Changed FstReader name to ModelUploader	2014-04-03 16:19:33 -07:00
Atlante45	3bb6d9b3b3	Added call back to model upload.	2014-04-03 16:07:25 -07:00
Atlante45	d15e12da77	Changed FstReader categories to place models in the right dirs	2014-04-03 12:25:50 -07:00
Stephen Birarda	1c4d44ba4a	attempt to complete handshake every 100ms instead of every 1s	2014-04-02 18:08:44 -07:00
Stephen Birarda	62de84315e	detect handshake completion in DS and client	2014-04-02 17:56:04 -07:00
Stephen Birarda	e1cae6d295	initial handshaking for DTLS sessions between DS and clients	2014-04-02 17:29:14 -07:00
Atlante45	52df77b4b5	Final work on models metadata support	2014-04-02 16:25:35 -07:00
Atlante45	b73598ae8a	Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata	2014-04-02 11:40:41 -07:00
Stephen Birarda	dc3a4d4957	remove some unneeded parenthesis	2014-04-02 09:07:34 -07:00
Stephen Birarda	fd1ed13de0	fix static x509CACredentials method	2014-04-01 16:53:17 -07:00
Stephen Birarda	632dc6b8e4	set GnuTLS credentials for DTLSClientSession	2014-04-01 16:51:05 -07:00
Stephen Birarda	b5b4edc999	add notion of server and client DTLSSessions	2014-04-01 16:47:45 -07:00
Stephen Birarda	ce6f845681	remove some gnutls handshake debugging	2014-04-01 14:47:30 -07:00
Stephen Birarda	94b29782eb	re-scaffold some client side DTLS in DTLSSession	2014-04-01 14:19:07 -07:00
Stephen Birarda	0be2eb57bf	repairs to NodeList and LimitedNodeList	2014-04-01 13:56:33 -07:00
Stephen Birarda	45c6ae44a6	use a LimitedNodeList in domain-server	2014-04-01 13:33:30 -07:00
Stephen Birarda	62041d91a8	rename NodeList DomainInfo to DomainHandler	2014-04-01 13:09:35 -07:00
Stephen Birarda	caf2473df8	add a DTLSSession object to handle GnuTLS DTLS sessions	2014-04-01 13:08:00 -07:00
Atlante45	bdd5c291b0	Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata	2014-04-01 12:03:45 -07:00
Atlante45	03958f2fa0	work on metadata in the model browser + real time updates	2014-04-01 12:02:47 -07:00
Atlante45	77f5a50738	Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_fixes	2014-03-31 17:19:45 -07:00
Atlante45	f027aac76b	Fix to model upload in account manager	2014-03-31 17:19:04 -07:00
Stephen Birarda	135d97d0a7	add a pretty important missing line for symmetric socket activation	2014-03-31 15:59:54 -07:00
Stephen Birarda	62da4d622d	don't require an MD5 hash in non-verified packets	2014-03-31 15:36:32 -07:00
Stephen Birarda	6c08e2a407	add option for domain-server to enforce DTLS	2014-03-31 15:06:58 -07:00
Stephen Birarda	da30d21f6e	complete inital DTLS setup in domain-server	2014-03-31 14:02:11 -07:00
Stephen Birarda	61711c7aaa	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-03-28 13:30:06 -07:00
Stephen Birarda	eb35b63651	use a shared pointer for more elegant cleanup at assignment conclusion	2014-03-28 10:48:44 -07:00
Stephen Birarda	7b840f760c	Merge pull request #2538 from AndrewMeadows/enforce-standard making some type casts abide by coding standard	2014-03-28 09:19:16 -07:00
Stephen Birarda	8b1b2d8d99	send a symmetric ping packet if appropriate when pinging nodes	2014-03-28 09:11:20 -07:00
Stephen Birarda	f80b415497	handle activation and setting of symmetric socket	2014-03-28 09:07:30 -07:00
Stephen Birarda	18a293c020	add a symmetric socket to the Node class	2014-03-28 08:58:49 -07:00
Stephen Birarda	1c47b8a3e1	Revert "hack the NodeList to take the socket on which pinged as active socket" This reverts commit `5c7ac6d3a1`.	2014-03-27 21:29:01 -07:00
Stephen Birarda	5c7ac6d3a1	hack the NodeList to take the socket on which pinged as active socket	2014-03-27 17:41:55 -07:00
ZappoMan	bda96ef935	added back use of nodeWithUUID() instead of sharedpointer	2014-03-27 13:35:22 -07:00
Atlante45	d9c48d63fe	Made _zipDir a children of _dataMultiPart so it gets deleted at the right time.	2014-03-27 11:18:32 -07:00
Atlante45	88e7b8e68f	Fixed "memory leak" in Account Manager.	2014-03-27 11:16:52 -07:00
Andrew Meadows	c383b69b61	merge upstream/master into enforce-standard Conflicts: interface/src/avatar/Hand.cpp	2014-03-27 10:53:54 -07:00
Atlante45	11f40258b3	Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_fixes	2014-03-27 10:12:34 -07:00
ZappoMan	55b9dd1aee	remove non-locking version of nodeWithUUID()	2014-03-27 02:32:19 -07:00
Andrzej Kapolka	f339a3c0d7	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-03-26 18:30:23 -07:00
Stephen Birarda	87cbe9a1f4	Merge pull request #2524 from AndrewMeadows/shapes avatar responds to hand-vs-head collisions again	2014-03-26 17:10:43 -07:00
Andrew Meadows	4c64c11144	making some type casts abide by coding standard	2014-03-26 16:58:47 -07:00
Andrzej Kapolka	52c8a865f1	Provide a means of tracking resource download progress. Until we have a user-friendly progress meter/throbber, put the download progress in the extended stats.	2014-03-26 15:53:19 -07:00
Atlante45	d32797b54c	Added bunch of feedback	2014-03-26 15:13:52 -07:00
Atlante45	fa2a60448b	Fixed double free crash	2014-03-26 15:09:44 -07:00
Atlante45	718b8f7eb9	Changed back to upload either head or skeleton	2014-03-26 15:07:19 -07:00
Brad Hefta-Gaub	d90ebfd29a	Merge pull request #2504 from Atlante45/upload_feedback Display warning popup when something went wrong with the fst upload	2014-03-26 13:31:49 -07:00
Atlante45	f95c43393c	Fixed uninitialized member	2014-03-26 13:10:56 -07:00
Philip Rosedale	b3b9a2f337	Merge pull request #2516 from birarda/master actually change NodeList send buffer size	2014-03-26 12:12:26 -07:00
Stephen Birarda	6e161e7c61	actually attempt to change send buffer size	2014-03-26 12:05:55 -07:00
Philip Rosedale	020f4b020e	Merge pull request #2503 from birarda/master increase NodeList send buffer size to 1MB	2014-03-26 12:00:43 -07:00
Stephen Birarda	cb617c9e17	add a button on DS admin page to kill all nodes	2014-03-26 11:37:30 -07:00
Stephen Birarda	e03e82a29b	ifdef to handle getsockopt format requirements on windows	2014-03-26 11:02:34 -07:00
Stephen Birarda	c4b8ff8952	cast setsocktopt and getsockopt calls to fix windows build	2014-03-26 10:53:43 -07:00
Stephen Birarda	ed9c805539	attempt to set send buffer size to 1MB	2014-03-25 17:29:35 -07:00
Stephen Birarda	46077a7fb0	output old size when notifying for send buffer size change	2014-03-25 17:24:17 -07:00
Stephen Birarda	db757e9e7b	increase NodeList send buffer size by default to 128KB	2014-03-25 17:18:45 -07:00
Atlante45	9f95ca8e7c	Display warning popup when something went wrong with the fst upload	2014-03-25 17:18:18 -07:00
Stephen Birarda	34634af975	add mutex header to NodeData	2014-03-25 16:05:51 -07:00
Andrew Meadows	fff7a36b54	merge upstream/master into physics project Conflicts: interface/src/avatar/Hand.cpp interface/src/avatar/Hand.h interface/src/avatar/SkeletonModel.cpp interface/src/avatar/SkeletonModel.h interface/src/renderer/Model.h	2014-03-25 15:55:26 -07:00
Stephen Birarda	c8b3ae0c40	add a mutex to NodeData and leverage in AvatarMixer threads	2014-03-25 15:49:47 -07:00
Andrew Meadows	06fbd49ffa	Adding StreamUtils for common debug output	2014-03-25 15:29:22 -07:00
Andrew Meadows	5934a17475	fix sphere-capsule collisions at the capsule caps	2014-03-25 15:27:28 -07:00
Stephen Birarda	d5be3f1c9f	output socket errors if they occur	2014-03-25 15:01:24 -07:00
Stephen Birarda	56869a769d	remove some extraneous domain-server check in debugging	2014-03-25 14:53:32 -07:00
Stephen Birarda	38ad75fc9e	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-debug	2014-03-25 14:52:28 -07:00
Stephen Birarda	7190ce9a88	remove loadRandomIdentifier for STUN requests, use UUID	2014-03-25 14:33:53 -07:00
Stephen Birarda	41e2ce2b19	remove DS check in debug	2014-03-25 14:29:59 -07:00
Stephen Birarda	4e77afb4b2	block and wait for bytes to be written during broadcastAvatarData loop	2014-03-25 13:38:02 -07:00
Stephen Birarda	68d55152b9	flush after each call to writeDatagram	2014-03-25 13:28:53 -07:00
Stephen Birarda	08bfc15b70	output more descriptive socket error	2014-03-25 13:20:45 -07:00
Stephen Birarda	6a8637230f	add socket error debugging	2014-03-25 13:17:37 -07:00
Stephen Birarda	ce169dd87d	add code return debug to DS check in packet	2014-03-25 13:06:44 -07:00
Stephen Birarda	08ed708ee6	add domain IP and packet size debugging	2014-03-25 13:05:58 -07:00
Stephen Birarda	f0b87bebc2	cleanup debug and inactive node pinging	2014-03-25 13:02:09 -07:00
Stephen Birarda	bc1b7045cb	output count of unreplied domain-server check ins	2014-03-25 12:30:06 -07:00
Stephen Birarda	a90cd7ed31	cast numerator to float before divide	2014-03-24 16:54:14 -07:00
Stephen Birarda	b01b2a3311	use explicit float casts where appropriate	2014-03-24 16:35:36 -07:00
Stephen Birarda	ba338cb7bc	at minimum send packet rate stats for ThreadedAssignment subclasses	2014-03-24 16:06:25 -07:00
Stephen Birarda	8dbe4dfdde	collect packet rate stats in NodeList	2014-03-24 15:06:53 -07:00
Stephen Birarda	5f93e44ff7	abstract stats packet sending to NodeList	2014-03-24 12:33:00 -07:00
Stephen Birarda	8f403609e7	hook JSON stats sending from domain-server	2014-03-24 11:56:16 -07:00
Stephen Birarda	949f7b2fc1	add a json stats packet type	2014-03-24 11:21:39 -07:00
ZappoMan	bde2146b1b	whitespace cleanup	2014-03-23 18:14:36 -07:00
ZappoMan	9c7ffffbae	fix some windows issues Conflicts: assignment-client/src/audio/AudioMixer.cpp	2014-03-23 18:10:22 -07:00
ZappoMan	2c8c43094f	CR feedback	2014-03-21 14:46:46 -07:00
ZappoMan	3cb3cb81c4	fixes to voxel server crashes on client shutdown	2014-03-21 14:15:02 -07:00
Stephen Birarda	acedc555d5	Merge pull request #2424 from birarda/audio-scaling move and remove some debugging for audio mixer	2014-03-21 10:26:41 -07:00
Stephen Birarda	c1cbc79807	move debug for no reply domain checkins to ThreadedAssignment	2014-03-21 10:26:09 -07:00
Philip Rosedale	b49058ea77	Merge pull request #2402 from Atlante45/inspect_js Inspect js	2014-03-20 17:21:21 -07:00
Atlante45	746d109025	Merge branch 'master' of https://github.com/highfidelity/hifi into inspect_js	2014-03-20 16:10:33 -07:00
Atlante45	65603b0631	Fixed typo	2014-03-20 15:30:28 -07:00
Atlante45	bf85f8d5e5	Changed model_type to model_categorie in FstReader	2014-03-20 14:00:27 -07:00
Atlante45	a908c23f61	Merge branch 'master' of https://github.com/highfidelity/hifi into fix_models_upload	2014-03-20 13:58:44 -07:00
Atlante45	947dde3715	Modified models uploader to diferrenciate heads and skeletons	2014-03-20 12:44:37 -07:00
Atlante45	4604f5333d	Merge branch 'master' of https://github.com/highfidelity/hifi into inspect_js	2014-03-20 12:15:55 -07:00
Andrzej Kapolka	20ae5c15f7	Added a "flat" mode for environments that makes them follow you around on the X/Z axes. The default environment is flat. Closes #2378.	2014-03-20 12:09:20 -07:00
Andrzej Kapolka	a761a4862b	Merge pull request #2398 from AndrewMeadows/emergency-fixes explicitly send neck angles in avatar data	2014-03-20 11:19:13 -07:00
AndrewMeadows	144f86b540	Merge pull request #2370 from Atlante45/model_browsing Model browsing	2014-03-20 11:15:35 -07:00
Andrew Meadows	6440dd1b5f	explicitly send neck angles in avatar data	2014-03-20 11:05:14 -07:00
Philip Rosedale	e14069c9e3	Merge pull request #2376 from ZappoMan/experimental_scaling Voxel Server Performance Improvements	2014-03-19 16:24:47 -07:00
Tony Hagale	7f2a92d759	#2386 trying a new static lookup table for numberOfOnes()	2014-03-19 16:28:12 -05:00
Tony Hagale	5f94e44cde	#2386 trying a new static lookup table for numberOfOnes()	2014-03-19 16:26:45 -05:00
Atlante45	d239aecbfb	Added names to signals argument	2014-03-19 10:17:28 -07:00
ZappoMan	584adfda08	cleanup headers	2014-03-19 00:32:38 -07:00
ZappoMan	499c4bd500	fix octree server crashes on various shutdown corner cases	2014-03-18 17:44:53 -07:00
Atlante45	93f66b074a	Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing	2014-03-18 17:37:07 -07:00
Stephen Birarda	f86b793c96	only output version mismatch once per sender per packet	2014-03-18 17:14:57 -07:00
Stephen Birarda	281f2c6614	return false in packetVersionAndHashMatch on version mismatch	2014-03-18 17:04:27 -07:00
Atlante45	a10a3f6f29	Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing	2014-03-18 14:49:00 -07:00
Andrzej Kapolka	500f9d1485	Merge pull request #2338 from AndrewMeadows/cleanup Don't send redundant avatar hand/head data, and cleanup.	2014-03-18 13:57:30 -07:00
Atlante45	6f50ea0faa	Improved FileDownloader	2014-03-18 13:55:14 -07:00
Andrew Meadows	4a1a7898ea	Merge branch 'cleanup' into 'shapes'	2014-03-18 12:53:45 -07:00
Andrew Meadows	a2fea49f58	bump version of PacketTypeAvatarData from 1 to 2	2014-03-18 12:36:48 -07:00
Stephen Birarda	b6a41eeaaa	resolve conflicts on merge with upstream master	2014-03-18 10:37:04 -07:00
Andrzej Kapolka	6aa1f286bb	Alpha is the new default.	2014-03-18 10:13:23 -07:00
Stephen Birarda	7ba595338e	guard around update to last heard for a NULL matching node	2014-03-17 17:39:08 -07:00
ZappoMan	9411519dc9	fix SimpleMovingAverage::reset()	2014-03-17 16:37:07 -07:00
Stephen Birarda	61594b9a1e	fixes to silent audio frame sending	2014-03-17 16:27:49 -07:00
Stephen Birarda	9f24bd9c47	have the AudioMixer handle silent audio, send silence from Interface when gate closed	2014-03-17 15:12:02 -07:00
ZappoMan	aab2ca826f	Merge branch 'master' of https://github.com/worklist/hifi into experimental_scaling	2014-03-17 11:01:25 -07:00
ZappoMan	96572d3752	fix some Q_OBJECT macros in class headers	2014-03-17 10:57:53 -07:00
ZappoMan	cbdd159213	fix constness	2014-03-17 10:55:43 -07:00
Brad Hefta-Gaub	c6f8d34ded	fix unix warning	2014-03-14 18:16:38 -07:00
Brad Hefta-Gaub	c0ee3fa1f0	fix unix warning	2014-03-14 18:14:54 -07:00
Brad Hefta-Gaub	0e7e337807	fixed uninitialized variable warning	2014-03-14 18:05:40 -07:00
Atlante45	f07725d017	Merge branch 'master' of https://github.com/highfidelity/hifi into model_browsing	2014-03-14 17:47:39 -07:00
Atlante45	a88872a21f	Simple class to download files (sync/async)	2014-03-14 17:41:22 -07:00
Andrew Meadows	d4c7e25f8e	Merge branch upstream/master into "hands" project	2014-03-14 14:28:50 -07:00
Andrew Meadows	a045a87cca	Remove arm stretching, add sixense calibration	2014-03-14 11:11:00 -07:00
Atlante45	423f26f669	Review comments	2014-03-13 15:26:02 -07:00
Atlante45	e5b5778caf	Upload FST	2014-03-13 15:04:22 -07:00
Atlante45	51585acd25	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader	2014-03-13 10:53:24 -07:00
Andrzej Kapolka	e249b29b45	Merge pull request #2268 from AndrewMeadows/radians prefer radians over degrees	2014-03-12 12:10:29 -07:00
AndrewMeadows	b1f4edb3a5	Merge pull request #2271 from ZappoMan/QWaitCondition Fix runaway JurisdictionListener thread and other improvements	2014-03-12 11:54:48 -07:00
Atlante45	3aa534d47c	Added the send method	2014-03-12 11:48:41 -07:00
ZappoMan	e72d3127bf	fix comment and remove dead code	2014-03-11 21:25:30 -07:00
ZappoMan	025da315c6	removed dontSleep from JurisdictionListener	2014-03-11 21:11:47 -07:00
ZappoMan	8befefb054	first cut at making PacketSender use QWaitCondition	2014-03-11 20:45:46 -07:00
ZappoMan	f5cdb98efb	switch ReceivedPacketProcessor to using QWaitCondition	2014-03-11 20:32:02 -07:00
Andrzej Kapolka	6c4223bcdf	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-03-11 18:12:12 -07:00
Andrew Meadows	793a760272	merge upstream master into "radians" project	2014-03-11 17:28:36 -07:00
Andrew Meadows	aa8c2fc8cb	use radians instead of degrees (almost) everywhere	2014-03-11 17:26:58 -07:00
Dimitar Dobrev	60bf473be7	Improved the adherence to code conventions after a code review.	2014-03-12 01:24:30 +02:00
Dimitar Dobrev	86643803cf	Moved the connection and configuration of XMPP to the log-in process.	2014-03-12 01:24:30 +02:00
Dimitar Dobrev	9eb217794c	Added time stamps to the chat. Enabled translations.	2014-03-12 01:24:30 +02:00
Dimitar Dobrev	437cadf360	Added a basic version of the chat window.	2014-03-12 01:24:30 +02:00
Dimitar Dobrev	1c2e752f3c	Integrated QXmpp in the build system.	2014-03-12 01:16:10 +02:00
Dimitar Dobrev	07d3eb886a	Added reading and storing of the XMPP password of the current user.	2014-03-12 01:16:10 +02:00
Andrzej Kapolka	7d1a44fbea	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-03-11 12:52:13 -07:00
Andrzej Kapolka	ae6a59ef78	Ray intersections for models, don't load resources if there's no network manager installed.	2014-03-10 17:53:20 -07:00
Andrzej Kapolka	34ddddae1b	Basic LRU cache. Closes #2234 .	2014-03-10 12:06:07 -07:00
Andrzej Kapolka	9731159b82	Merge branch 'master' of https://github.com/highfidelity/hifi into joints	2014-03-10 10:57:48 -07:00
Andrzej Kapolka	d2f947aee1	Working on LRU cache for resources.	2014-03-10 10:49:38 -07:00
ZappoMan	e2415642f0	temporary fix to OSX 10.8 problem by delaying creation of _networkAccessManager	2014-03-09 00:10:31 -08:00
ZappoMan	1ceb05bf09	click harder	2014-03-08 18:22:30 -08:00
Atlante45	8faaa28bc1	FST ploader base	2014-03-07 11:55:02 -08:00
Andrew Meadows	9d2758ee14	fix warning about malformed case statement	2014-03-07 09:32:12 -08:00
Andrzej Kapolka	c5ab32235f	Merge branch 'master' of https://github.com/highfidelity/hifi into joints	2014-03-06 17:09:24 -08:00
Andrzej Kapolka	3adea84b81	Basic joint data sending. Closes #2166 .	2014-03-06 17:07:29 -08:00
ZappoMan	c81bac2ac4	Merge pull request #2224 from birarda/resources cleanup switchToResourcesParentIfRequired hack	2014-03-06 16:51:31 -08:00
Stephen Birarda	0f22168e42	Merge pull request #2230 from ey6es/master Add a five second download timeout timer: if that much time passes witho...	2014-03-06 16:22:54 -08:00
Stephen Birarda	8cbdf5d94a	Merge branch 'master' of https://github.com/highfidelity/hifi into resources	2014-03-06 15:49:45 -08:00
Stephen Birarda	ac66f09157	Merge pull request #2194 from AndrewMeadows/cleanup g++ warnings	2014-03-06 15:49:22 -08:00
Andrzej Kapolka	8ec7a5e600	When we time out, report the last received/total counts.	2014-03-06 15:08:34 -08:00
Andrew Meadows	0b2c399713	memcmp() returns a signed int!	2014-03-06 14:33:59 -08:00
Andrzej Kapolka	1468bd1b49	Add a five second download timeout timer: if that much time passes without any progress, consider it an error.	2014-03-06 14:31:13 -08:00
Stephen Birarda	403f91c988	update resource references to use Qt resource system	2014-03-06 10:41:11 -08:00
Philip Rosedale	c2a63c4206	Merge pull request #2190 from AndrewMeadows/shapes Collision Shapes	2014-03-05 17:59:42 -08:00
Philip Rosedale	e4924cdca8	Merge pull request #2202 from birarda/authentication remove deprecated qt5 methods in CMakeList files	2014-03-04 18:30:22 -08:00
Stephen Birarda	231dc624ff	replace deprecated qt5 macros in cmake with target_link_libraries	2014-03-04 12:41:24 -08:00
Andrew Meadows	57e217c7fb	Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes	2014-03-04 12:10:12 -08:00
Andrew Meadows	d537b4118d	Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes	2014-03-04 11:40:59 -08:00
Andrew Meadows	427cf02d03	Merge branch 'cleanup' to 'cleanup2'	2014-03-04 11:20:42 -08:00
Andrew Meadows	1b2db1f7ab	fix for warnings about signed/unsigned comparison	2014-03-04 11:07:15 -08:00
Stephen Birarda	f5aaad1f33	remove if checks in cases where delete handles null	2014-03-04 10:05:43 -08:00
Andrew Meadows	e22e022252	Fixing warnings and out-of-range index.	2014-03-04 09:55:32 -08:00
Andrew Meadows	343998a4a8	Adding virtual destructor to Shape class	2014-03-04 09:55:08 -08:00
Andrew Meadows	7ba5bc71ea	Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes Conflicts: interface/src/renderer/FBXReader.cpp interface/src/renderer/Model.cpp interface/src/renderer/Model.h	2014-03-04 09:01:24 -08:00
ZappoMan	1a5b0ee02e	Merge pull request #2170 from birarda/cmake-quotes complete quoting of various cmake commands	2014-03-04 09:00:26 -08:00
Andrew Meadows	f23dda7317	Less math for the same effect.	2014-03-03 17:34:16 -08:00
Stephen Birarda	bb3a8677be	Merge branch 'master' of https://github.com/highfidelity/hifi into cmake-quotes	2014-03-03 16:31:25 -08:00
Andrzej Kapolka	7ecfeeaba3	Do the actual reading of the reply on the worker thread. Otherwise, when we read from the cache, we're reading synchronously from a file. Closes #2171.	2014-03-03 15:16:13 -08:00
Andrzej Kapolka	9759cd70c0	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-03-03 14:20:21 -08:00
Andrzej Kapolka	85083d74bc	Fix for annoying "QThreadStorage" warning.	2014-03-03 13:39:01 -08:00
Stephen Birarda	1b7d24a79c	keep known nodes alive when we receive a packet from them	2014-03-03 12:49:46 -08:00
Stephen Birarda	628f91cd73	complete quoting of varous Cmake commands, closes #1999	2014-03-03 12:15:05 -08:00
Stephen Birarda	60eb588e96	remove some unecessary null pointer checks	2014-03-03 11:36:01 -08:00
ZappoMan	ef87fbffac	Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling Conflicts: libraries/shared/src/ResourceCache.cpp	2014-02-28 16:58:43 -08:00
ZappoMan	c1c41ea2ca	handle some shutdown cases and reduce time of locking in octree server	2014-02-28 16:18:02 -08:00
ZappoMan	d2faca9767	fixed some warnings	2014-02-28 16:17:30 -08:00
Andrzej Kapolka	2f27d8ecd3	Process geometry/textures in worker threads (via QThreadPool). Closes #2137 .	2014-02-28 16:14:02 -08:00
Andrzej Kapolka	21a149348b	When switching models, retain old one until new one is loaded. Closes #2146 .	2014-02-28 13:57:25 -08:00
Andrzej Kapolka	73ec568b4b	Further work on request limiting.	2014-02-27 19:28:45 -08:00
Andrzej Kapolka	29f7954d20	Factored out bits common to resource caches, added global limit on number of resources being requested at any one time.	2014-02-27 18:13:40 -08:00
Andrew Meadows	b8c1bab4ae	Using pre-computed Model shapes for collisions ...instead of generating collision shapes on the fly	2014-02-27 17:52:35 -08:00
Andrew Meadows	25bdfd7677	Update to comment.	2014-02-26 15:38:33 -08:00
Andrew Meadows	5954bb91d4	ListShape now handled by ShapeCollider	2014-02-26 15:36:19 -08:00
Andrew Meadows	07eb366138	stubbed out collision handlers for ListShape	2014-02-26 14:32:46 -08:00
Philip Rosedale	0a1e840d10	Bot.js NPCs wander around and make sounds	2014-02-26 13:50:04 -08:00
Andrew Meadows	da0276ac7e	ShapeCollider takes CollisionList argument Also, adding first pass at ListShape	2014-02-26 12:10:16 -08:00
ZappoMan	d765e250d5	removed AbstractMenuInterface.h	2014-02-25 20:42:59 -08:00
ZappoMan	42ddc82ac4	possible fix to windows assert	2014-02-25 20:23:38 -08:00
ZappoMan	4b3911c5c1	Merge pull request #2101 from birarda/authentication fixes to login/logout flow when jumping domains	2014-02-25 18:25:17 -08:00
Stephen Birarda	bf3b5c07d5	Merge pull request #2093 from ZappoMan/menu_js Adds support for editing application Menus to JS	2014-02-25 17:40:39 -08:00
Stephen Birarda	d5fc1caaaf	fix wording for access token change signal	2014-02-25 16:12:25 -08:00
Stephen Birarda	2496c6252f	fix login/logout flow when jumping domains	2014-02-25 16:10:08 -08:00
Stephen Birarda	6d847f29fb	currently support system wide auth only via hifi data-web	2014-02-25 16:05:05 -08:00
Stephen Birarda	d0269761b6	remove unecessary qDebug include	2014-02-25 14:39:33 -08:00
Stephen Birarda	27be157d70	fix oauth early token expiry	2014-02-25 14:38:19 -08:00
Stephen Birarda	ce3d6d2fca	reset nodelist if domain-server stops talking to you, closes #2092	2014-02-25 13:07:39 -08:00
ZappoMan	263d682fb9	Merge branch 'master' of https://github.com/worklist/hifi into menu_js	2014-02-25 12:20:15 -08:00
Andrew Meadows	362708be60	fix another missing semicolon	2014-02-25 11:19:07 -08:00
Andrew Meadows	28d9fb9747	fix missing semicolon	2014-02-25 11:17:48 -08:00
Andrew Meadows	9a70a50bdb	capsuleCapsule() collision with preliminary tests	2014-02-25 10:59:12 -08:00
Stephen Birarda	1163cfd07e	if the domain-server provides no auth, assume default	2014-02-25 10:58:32 -08:00
Stephen Birarda	b09ed1dff1	present a login window on app start	2014-02-25 10:53:13 -08:00
ZappoMan	74d48ab239	added support for MenuItemProperties for addMenuItem, removed some cruft, beginning support for menu item placement	2014-02-25 10:23:59 -08:00
Stephen Birarda	45429fa1e1	fix default node auth URL	2014-02-25 09:38:22 -08:00
Stephen Birarda	6d56ab3a30	use toDouble instead of toInt for Qt 5.1 compatibility	2014-02-24 15:27:12 -08:00
Stephen Birarda	672c6a9ed1	fix complaint for incomplete type QStringList	2014-02-24 15:23:47 -08:00
Stephen Birarda	c1b45d7eaa	Merge branch 'master' of https://github.com/highfidelity/hifi into authentication	2014-02-24 15:18:21 -08:00
Stephen Birarda	f20808b47f	remove option to drive from transmitter	2014-02-24 15:11:02 -08:00
Stephen Birarda	050d223b3a	add domain connection reset to NodeList reset	2014-02-24 13:33:52 -08:00
Stephen Birarda	27c779666b	add auth to assignment-client, fix refresh of static assignments	2014-02-24 13:29:32 -08:00
Stephen Birarda	9771e1bb12	resolve conflicts on merge with upstream master	2014-02-24 12:06:10 -08:00
Stephen Birarda	9dc460bab4	make multiple instances of scripted assignment use diff UUID	2014-02-24 11:56:14 -08:00
Andrew Meadows	8a3640f016	Adding CapsuleSphere collisions with tests.	2014-02-24 11:38:27 -08:00
Stephen Birarda	a8493ecaa2	cleanup login/logout in menu, logout only when in	2014-02-24 11:11:36 -08:00
Andrew Meadows	0e28e0947c	Adding ShapeColliderTests.*	2014-02-22 13:20:47 -08:00
Stephen Birarda	6165ca658a	add a logout option to the menu	2014-02-21 17:13:22 -08:00
Stephen Birarda	0686539734	default to quieter HTTP request debugging	2014-02-21 17:07:14 -08:00
Stephen Birarda	52a21d4dfd	hook to request user's location from data-server	2014-02-21 16:55:20 -08:00
Andrew Meadows	8c1dc40d39	Adding basic physics shapes (unfinished)	2014-02-21 16:29:07 -08:00
Andrew Meadows	ef6d2a624b	helper methods to rotate/translate CollisionInfo	2014-02-21 16:24:40 -08:00
Stephen Birarda	6df317e8e6	update user's domain in data-server after connection to new one	2014-02-21 16:22:17 -08:00
Stephen Birarda	340248ac43	resolve conflicts on merge with upstream master	2014-02-21 15:16:15 -08:00
Stephen Birarda	a49893689e	store username in local settings so it doesn't need to be reloaded	2014-02-21 15:05:57 -08:00
Stephen Birarda	76e6c9342f	parse username returned from data-server	2014-02-21 14:41:43 -08:00
Stephen Birarda	9d2d9c5071	fix cross-thread calls to AccountManager, domain switch flow	2014-02-21 13:45:39 -08:00
Stephen Birarda	d56bafc9a5	default to no auth for domain-server, fix no auth flow	2014-02-21 13:16:24 -08:00
Andrzej Kapolka	8d01527d93	Merge branch 'master' of https://github.com/highfidelity/hifi into bilbo	2014-02-21 12:16:33 -08:00
ZappoMan	a12e1ef18f	Merge pull request #2043 from birarda/metavoxel-fix fixes for extra characters in logging target names	2014-02-21 10:24:29 -08:00
Andrzej Kapolka	495447fc0d	Merge branch 'master' of https://github.com/highfidelity/hifi into bilbo	2014-02-21 10:19:52 -08:00
Andrzej Kapolka	18ea1d6a85	More work on billboards.	2014-02-21 10:16:06 -08:00
Andrzej Kapolka	d8321bd419	Merge pull request #2034 from birarda/master fixes for scripted avatars	2014-02-21 10:14:41 -08:00
Stephen Birarda	c728463410	use connection secret to verify domain-server packets	2014-02-20 17:57:58 -08:00
Stephen Birarda	9cb8cbff2c	fix noAuth flow for domain-server	2014-02-20 16:47:00 -08:00
Stephen Birarda	a6c1e3e87f	tweaks to domain-server authentication flow	2014-02-20 16:31:50 -08:00
Stephen Birarda	ee90c25a41	add helpers for json responses from AccountManager	2014-02-20 14:22:08 -08:00
Stephen Birarda	3bace43aae	Merge branch 'master' of https://github.com/highfidelity/hifi into authentication	2014-02-20 12:08:47 -08:00
Stephen Birarda	cfec1e583e	fix logging target-name extra characters	2014-02-20 12:02:23 -08:00
Stephen Birarda	4022d9f4c4	fix metavoxel interest list, keep node alive with ping	2014-02-20 11:36:16 -08:00
Andrew Meadows	caba4f9b9b	Fix for crash when CollisionList gets full.	2014-02-20 07:58:30 -08:00
Stephen Birarda	cb165902fd	use existing constants for HTTP operations	2014-02-19 18:12:10 -08:00
Stephen Birarda	d3dd49a2e8	force DomainServer to wait for session UUID before setup with auth	2014-02-19 18:06:21 -08:00
Stephen Birarda	ee9f8937e3	fix a silly typo	2014-02-19 18:03:34 -08:00
Stephen Birarda	32ceccfeb6	have domain-server bail if username/password not provided for auth	2014-02-19 17:26:21 -08:00
Stephen Birarda	57538af8fd	give a separate QNetworkAccessManager to the AccountManager	2014-02-19 14:19:00 -08:00
Stephen Birarda	a4cabe91f8	use UUID setter to fire signal and debug on UUID change	2014-02-19 14:17:14 -08:00
Stephen Birarda	c5b8ff181e	indicate that both username or email can be passed for login	2014-02-19 14:14:17 -08:00
Stephen Birarda	5f130872af	repair usage of INI file for QSettings	2014-02-19 14:09:18 -08:00
Stephen Birarda	ff7a49d8c2	resolve conflicts on merge with upstream master	2014-02-19 13:07:26 -08:00
Stephen Birarda	c302042e83	store access tokens in QSettings	2014-02-18 18:12:27 -08:00
Stephen Birarda	3199f1a3e4	store access tokens in settings so re-log not required	2014-02-18 17:42:12 -08:00
Stephen Birarda	ca6dfa58a6	client ID need not be passed for password grant type	2014-02-18 17:16:25 -08:00
Stephen Birarda	b0895ea83a	store registration token in more compact form, begin parse on domain-server	2014-02-18 15:58:54 -08:00
Stephen Birarda	949f79e945	hook up request for domain registration information for Interface	2014-02-18 15:38:43 -08:00
Stephen Birarda	f4b0375b35	stub a method to ask for domain-server auth from NodeList	2014-02-18 14:48:17 -08:00
Stephen Birarda	582681738a	correctly set token expiration from json response	2014-02-18 14:37:46 -08:00
Stephen Birarda	72a877ca49	remove an extra space	2014-02-18 14:34:47 -08:00
Stephen Birarda	ce3cc7e5c9	require that client ID for authentication server be known to AccountManager	2014-02-18 14:34:32 -08:00
Stephen Birarda	b57a5cea6a	complete access token request flow after login window presentation	2014-02-18 14:27:52 -08:00
Stephen Birarda	b87d65df30	re-set domain auth info if hostname changes	2014-02-18 13:23:53 -08:00
Stephen Birarda	8a0136efe1	more work on authentication, show login window when domain asks	2014-02-18 13:21:32 -08:00
Stephen Birarda	c762b92e5a	replace DataServerClient and Profile with AccountManager	2014-02-18 11:27:37 -08:00
Stephen Birarda	7c69028dc5	hook up domain request for node to authenticate	2014-02-18 10:54:45 -08:00
Stephen Birarda	4c135dd3a7	more tweaks to domain check-ins to prepare for auth	2014-02-18 10:28:28 -08:00
Stephen Birarda	37f1f7ba4f	add a DomainInfo class to hold domain information	2014-02-18 09:59:22 -08:00
Stephen Birarda	c9ade0585b	add a node authentication hostname to the domain-server	2014-02-18 09:03:35 -08:00
stojce	c57cae6437	Merge branch 'master' of https://github.com/worklist/hifi into 19497	2014-02-17 21:20:42 +01:00
stojce	13485065a5	Merge branch 'master' of https://github.com/worklist/hifi into 19497	2014-02-17 18:59:44 +01:00
Andrew Meadows	4848aa1d16	Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction	2014-02-17 09:14:06 -08:00
Andrew Meadows	335141049c	Cleaning up collision check API's and re-enabling collisions with particles.	2014-02-14 16:33:19 -08:00
ZappoMan	20a6f4eea9	first cut at auto-LOD adjustment	2014-02-12 21:22:21 -08:00
stojce	68584c654b	Allow drag-and-drop of snapshots into Interface	2014-02-12 02:12:52 +01:00
Andrew Meadows	4edc6cd88b	Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction	2014-02-10 15:42:56 -08:00
Philip Rosedale	ac9e2732b9	Merge pull request #1963 from birarda/authentication default avatar head and body URLS	2014-02-10 15:42:53 -08:00
Philip Rosedale	64736fe290	Merge pull request #1961 from ZappoMan/silence_bad_edit_packet_warning clean up bad edit packet warnings to help reduce log clutter	2014-02-10 15:42:23 -08:00
Stephen Birarda	37d7872677	fix a bug in version mismatched packets	2014-02-10 12:06:08 -08:00
Stephen Birarda	988c98d4d7	remove an antequated comment	2014-02-10 12:04:52 -08:00
ZappoMan	a0789d3a29	clean up bad edit packet warnings to help reduce log clutter	2014-02-10 11:21:27 -08:00
Stephen Birarda	27305c7a43	change default domain to root, don't double load domains on startup	2014-02-10 10:23:06 -08:00
Andrew Meadows	be1aaee359	Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction	2014-02-10 09:05:08 -08:00
Andrew Meadows	10296577f4	More info when colliding with meshes + stubbery for poking avatar.	2014-02-10 09:02:29 -08:00
ZappoMan	235673b7fe	Merge branch 'master' of https://github.com/worklist/hifi into ray_cast_scripting	2014-02-07 16:27:52 -08:00
Stephen Birarda	cf05600d73	fix miss of pingType in timePingReply, closes #1934	2014-02-07 15:27:44 -08:00
Stephen Birarda	3e13608e19	switch back to proper data-server	2014-02-07 15:06:57 -08:00
ZappoMan	e162aa4a40	Merge branch 'master' of https://github.com/worklist/hifi into ray_cast_scripting	2014-02-07 14:47:25 -08:00
Stephen Birarda	f945aac5cd	bump version on unverified packets whose header format has changed	2014-02-07 14:32:09 -08:00
Stephen Birarda	a1a4a3db8a	HifiSockAddr to SharedNodePointer changes in MetavoxelServer	2014-02-07 14:27:10 -08:00
Stephen Birarda	3bf0ed719c	remove a comment in HifiSockAddr	2014-02-07 14:08:42 -08:00
Stephen Birarda	dd4d944dea	ping inactive nodes in conjunction with domain server check in	2014-02-07 14:06:42 -08:00
Stephen Birarda	94c449e10c	Merge branch 'mesh-through-mixer' into authentication	2014-02-07 13:50:39 -08:00
Stephen Birarda	72a3e6f22c	fix long column in NodeList	2014-02-07 13:49:59 -08:00
Stephen Birarda	05f086ae74	Merge branch 'master' of https://github.com/highfidelity/hifi into authentication	2014-02-07 13:48:28 -08:00
Stephen Birarda	7c6d3cd01f	fix broken build from NetworkPacket	2014-02-07 13:46:59 -08:00
Stephen Birarda	455442088c	Merge branch 'master' of https://github.com/highfidelity/hifi into mesh-through-mixer	2014-02-07 13:45:14 -08:00
Stephen Birarda	3ad8e7260e	fix an accidental DOS and remove getNodeActiveSocketOrPing API	2014-02-07 13:42:52 -08:00
Stephen Birarda	a5636d2dc0	make ThreadedAssignment subclasses handle QUdpSocket readyRead, closes #1895	2014-02-07 12:25:43 -08:00
ZappoMan	c64b934d33	first cut at ray cast scripting	2014-02-07 11:23:04 -08:00
Philip Rosedale	72de486671	Merge pull request #1920 from ZappoMan/scriptable_camera Scriptable camera	2014-02-07 11:21:12 -08:00
Stephen Birarda	66d4eeb805	enforce both a version and hash match for packets	2014-02-07 11:10:38 -08:00
Andrew Meadows	2e65592048	Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction	2014-02-07 10:50:36 -08:00
Stephen Birarda	d39cccde77	add a method to find a node and upate based on packet	2014-02-07 10:32:16 -08:00
Stephen Birarda	7ceacd2751	remove blank if and fix ping reply construction	2014-02-07 10:24:01 -08:00
Stephen Birarda	fa1825fa32	repairs to ping-reply, removal of deconstructPacketHeader to simply return UUID	2014-02-07 10:20:50 -08:00
Andrzej Kapolka	d3b005112e	Changes from Philip's code review.	2014-02-07 10:03:23 -08:00
Stephen Birarda	b988308a8d	leverage writeDatagram helper in NodeList, ping if no active socket	2014-02-07 09:49:54 -08:00
ZappoMan	2157349804	added Camera.computePickRay()	2014-02-07 09:40:52 -08:00
Stephen Birarda	97a7369c76	remove senderWithAddress from NodeList	2014-02-06 14:43:46 -08:00
Andrew Meadows	082b7cf1a9	Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction Conflicts: interface/src/avatar/Avatar.cpp interface/src/avatar/Avatar.h interface/src/avatar/MyAvatar.cpp	2014-02-06 14:37:19 -08:00
Stephen Birarda	a823722d27	add writeDatagram helper to NodeList to insert md5 hash	2014-02-06 14:28:58 -08:00
Andrew Meadows	b230f046a7	Minor formating fixes.	2014-02-06 14:11:11 -08:00
Stephen Birarda	e72f6d16cc	rename NodeList ownerUUID to sessionUUID	2014-02-06 11:43:23 -08:00
Stephen Birarda	3dca04aacb	have the domain-server generate connection secrets, closes #1837	2014-02-06 11:30:53 -08:00
Stephen Birarda	6f638fa62c	have domain-server create a UUID for unidentified nodes, closes #1840	2014-02-06 10:34:34 -08:00
Stephen Birarda	f92f9ec0c2	Merge branch 'master' of https://github.com/highfidelity/hifi into authentication	2014-02-06 09:28:03 -08:00
Brad Hefta-Gaub	a05e07460f	fix windows build errors and warnings	2014-02-05 13:54:17 -08:00
AndrewMeadows	42528be7ca	Merge pull request #1846 from ZappoMan/fixdebugoutput fix debug to properly work with outputBufferBits()	2014-02-05 10:03:09 -08:00
ZappoMan	13d9b710f1	bump packet version	2014-02-04 20:23:12 -08:00
Stephen Birarda	8bf3b7586b	initial movement of mesh/skeleton URLs out of data-server through avatar-mixer	2014-02-04 13:02:33 -08:00
ZappoMan	2cf2e693b9	fix debug to properly work with outputBufferBits()	2014-02-04 12:29:55 -08:00
Andrew Meadows	466a43c77f	Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction	2014-02-03 10:47:00 -08:00
AndrewMeadows	bed63513a9	Merge pull request #1745 from ZappoMan/scripting_work support for global collision callbacks in JS	2014-01-31 10:42:44 -08:00
Stephen Birarda	a07511ed2c	remove an unecessary line	2014-01-31 10:05:46 -08:00

... 14 15 16 17 18 ...

2455 commits