overte-Armored-Dragon

mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00

Author	SHA1	Message	Date
Anthony J. Thibault	98ffea2fb9	Merge branch 'master' into out-of-body-experience	2016-09-22 18:08:23 -07:00
Zach Pomerantz	e2ff738fc3	strip unused audio settings - remove parameters on the jitter buffer algorithm, these are now static - remove parameters on the output starve detection algorithm, now static - move interface audio settings to the Developer menu	2016-09-21 17:35:27 -07:00
Seth Alves	4470338663	catagorize some qDebugs	2016-09-14 21:39:45 -07:00
samcake	11c6bb7d80	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-09-13 17:44:42 -07:00
Ryan Huffman	5e8c8f84b5	Handle edge cases of AVATAR_SELF_ID being used with entities	2016-09-13 16:34:05 -07:00
Ryan Huffman	23450e929b	Add special avatar id for attaching overlays	2016-09-13 16:33:58 -07:00
David Rowe	fe8b3b4d0d	Merge branch 'master' into 21040	2016-09-13 09:12:47 +12:00
Anthony J. Thibault	baee5180c1	Moved outOfBody detection into MyAvatar::FollowHelper in preparation for different follow behavior for in-body and out-of-body.	2016-09-12 11:52:27 -07:00
samcake	3bcea4310d	Fixing the vizualisation shader for world to cluster space	2016-09-10 10:41:18 -07:00
samcake	108910052a	Adding the reverse transformation	2016-09-09 19:00:54 -07:00
Brad Davis	ecfe56085d	GLM update and GLI integration	2016-09-09 10:18:15 -07:00
David Rowe	38c2efa22f	Implement Entities.findInFrustum() method	2016-09-09 18:57:48 +12:00
Brad Hefta-Gaub	3d54600843	Merge pull request #8513 from Atlante45/feat/network-port Add settings to change local port	2016-09-08 18:10:32 -07:00
samcake	61de063b29	Developping the Light Clusters, adding visualization	2016-09-08 18:02:35 -07:00
Atlante45	006780fe8e	Indentation	2016-09-08 14:29:43 -07:00
sam	248f172832	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-09-06 23:37:16 -07:00
SamGondelman	b048637c26	fix signal issue and qabstract::socket issue	2016-09-06 17:36:52 -07:00
Atlante45	fcf44911a3	Fix Windows warning	2016-09-06 10:18:42 -07:00
Atlante45	a8de6f0a57	Add settings to change local port	2016-09-06 10:18:42 -07:00
samcake	0c0109e427	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-09-01 15:20:34 -07:00
samcake	354cbbc927	Investigate why the disable depth Bclamp doesn't work	2016-08-31 19:14:35 -07:00
Stephen Birarda	85ba0f36cf	fix controllers/shared compile for android interface port	2016-08-31 16:34:31 -07:00
samcake	b563e280e4	Commuting the LIghtEntityItem changes correctly to the LightRenderItem	2016-08-31 13:55:41 -07:00
Anthony J. Thibault	e34aecde49	Bug fix for click events received by entity scripts PointerEvent.isLeftButton should be true even on left button release events. in a previous PR this behavior was changed. isLeftButton was used as a flag indicating the button state, which would be false on left button release events. Because we have scripts that rely on the old behavior, I've changed it back to the original and introduced isPrimaryHeld properties instead.	2016-08-29 16:21:39 -07:00
Andrew Meadows	af1be8ccd4	remove whitespace	2016-08-24 22:25:45 -07:00
Anthony J. Thibault	d015c5cfb5	Merge branch 'master' into feature/hand-controller-web-entity-integration	2016-08-22 14:13:17 -07:00
Seth Alves	87dbfa7e47	add -Wsuggest-override to compile flags and deal with fallout	2016-08-18 09:51:41 -07:00
Anthony J. Thibault	7b248b440a	Merge branch 'master' into feature/hand-controller-web-entity-integration	2016-08-17 13:55:12 -07:00
Anthony J. Thibault	7de8cc6422	Merge branch 'master' into feature/hand-controller-web-entity-integration	2016-08-16 16:49:57 -07:00
Seth Alves	7bc1235c54	local velocity and angular velocity in scripts is now handled the way local position and rotation are	2016-08-16 16:47:13 -07:00
Anthony J. Thibault	c407818d63	send pointer events from handControllerGrab.js to webEntities	2016-08-16 15:26:14 -07:00
Brad Davis	d548da02d9	Expose whether nsight is running to the app, disable some stuff under nsight	2016-08-12 22:28:50 -07:00
Brad Davis	42dcae72cb	Use ranges instead of stacks for nSight	2016-08-12 22:28:46 -07:00
Brad Davis	c2509e9492	Working on draw crash bug, adding render thread trash handling	2016-08-12 22:28:27 -07:00
Brad Davis	2340afc48e	Updating object transform code	2016-08-12 22:28:25 -07:00
Brad Davis	adcfd55cc0	Batch replay reprojection	2016-08-12 22:28:23 -07:00
Brad Davis	7e93747acf	Working on reprojection	2016-08-12 22:28:22 -07:00
Bradley Austin Davis	274321de8a	First pass at threaded rendering	2016-08-12 22:18:36 -07:00
Anthony J. Thibault	1be434342b	Work In Progress snapshot * Added new PointerEvent type. * Mouse events are still sent from Application to EntityTreeRenderer, however, EntityTreeRenderer converts them to PointerEvents * All outgoing signals from EntityTreeRenderer use PointerEvents instead of MouseEvents * Associated JavaScript entity methods will receive PointerEvents instead of MouseEvents * Events from handControllerGrab.js to entities are currently broken.	2016-08-12 17:11:59 -07:00
Seth Alves	15e2140cb2	Merge branch 'master' of github.com:highfidelity/hifi into overlay-children	2016-08-11 15:06:58 -07:00
SamGondelman	9b27f8bc0f	Merge remote-tracking branch 'upstream/master' into loadingFade	2016-08-09 14:55:14 -07:00
Andrew Meadows	85d87fe13f	Merge pull request #8218 from huffman/feat/load-improvements Speed up gamma correction in cube map processing	2016-08-09 11:10:36 -07:00
Seth Alves	607c168493	Merge branch 'master' of github.com:highfidelity/hifi into overlay-children	2016-08-09 09:01:55 -07:00
Ryan Huffman	43c1472b36	Move srgbToLinear lookup table to external cpp	2016-08-08 15:47:53 -07:00
Ryan Huffman	2ee511bae0	Fix syntax error	2016-08-08 12:30:11 -07:00
Ryan Huffman	28b3ff9bca	Update generation of srgb to linear lookup to include python script	2016-08-08 12:04:06 -07:00
SamGondelman	771e105fa2	Merge remote-tracking branch 'upstream/master' into loadingFade	2016-08-05 16:52:01 -07:00
Seth Alves	a2441ca84c	back out some uneeded chagnes	2016-08-04 14:09:12 -07:00
Seth Alves	981a8d76fa	code review	2016-08-04 13:47:43 -07:00
Seth Alves	45c21ca523	make UNSET_VALUE still work while still returning and empty string value for undefined keys	2016-08-04 13:37:08 -07:00
SamGondelman	b6e73e06a2	merge from master	2016-08-04 13:34:38 -07:00
Seth Alves	4c258b9568	fix bug which caused getValue for a non-existent key to return the integer 2	2016-08-04 10:16:08 -07:00
Seth Alves	1b571f3be3	Merge branch 'master' of github.com:highfidelity/hifi into overlay-children	2016-08-04 09:58:41 -07:00
SamGondelman	d63a0ef08f	working on making other entities transparent	2016-08-02 18:09:42 -07:00
Stephen Birarda	39e6ac0974	cleanup API for HifiConfigVariantMap after migration	2016-08-02 14:35:11 -07:00
Stephen Birarda	62af203d08	migrate the deprecated merged master/user config	2016-08-02 14:35:11 -07:00
Seth Alves	2c449320d0	when and ID of a SpatiallyNestable subclass is changed, update the parentID of any children	2016-08-02 08:20:48 -07:00
Seth Alves	28e0ca2e49	when a parent of a 3d overlay is deleted, delete the overlay	2016-08-01 10:55:34 -07:00
Seth Alves	2d88e74841	added operator!= for Transform class	2016-08-01 07:50:12 -07:00
Seth Alves	8102ea4b8e	don't call locationChanged or dimensionsChanged when they didn't	2016-08-01 07:48:44 -07:00
Seth Alves	e4e86c245e	3d overlays can be children of entities or avatars	2016-07-31 14:11:56 -07:00
samcake	2618741505	Merging with upstream master and updating my old PR	2016-07-21 17:59:00 -07:00
Andrew Meadows	207ddcea38	wrap hull about each mesh part	2016-07-09 22:25:28 -07:00
Ryan Huffman	611779b58b	Improve gamma correction implementation in cube map processing	2016-07-08 16:25:50 -07:00
Andrew Meadows	5659d57ac3	fix shape generation for SIMPLE_COMPOUND	2016-07-06 13:00:57 -07:00
Andrew Meadows	431043e195	declare new shape types	2016-07-06 10:50:51 -07:00
Brad Davis	5a9be817df	PR comments	2016-06-29 10:28:55 -07:00
Brad Davis	21d2c977a3	Remove roll from cursor in HMD	2016-06-28 18:30:07 -07:00
Zach Pomerantz	c62967a57b	add secs per hour	2016-06-28 12:38:00 -07:00
Brad Hefta-Gaub	da74114b32	Merge pull request #8070 from AndrewMeadows/triangle-soup-4 support btBvhTriangleMeshShape for static mesh entities	2016-06-23 12:17:32 -07:00
howard-stearns	67f76db7e4	Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui	2016-06-22 15:58:53 -07:00
Ryan Huffman	70be7b3273	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions	2016-06-21 16:39:25 -07:00
Andrew Meadows	937bd0c1be	SHAPE_TYPE_MESH --> SHAPE_TYPE_STATIC_MESH	2016-06-21 13:54:21 -07:00
Ryan Huffman	0ea9c5c26d	Fix getMemoryInfo not returning false on non-Windows	2016-06-21 13:32:17 -07:00
Andrew Meadows	2f6e5ab2ee	remove fall-through in switch/case logic	2016-06-20 17:29:20 -07:00
Andrew Meadows	a519b77ae7	add SHAPE_TYPE_MESH and build mesh shapes	2016-06-20 17:29:20 -07:00
Andrew Meadows	d64729372a	ShapeInfo name changes	2016-06-20 17:29:20 -07:00
Andrew Meadows	57760bca7d	sort ShapeInfo data members	2016-06-20 17:29:20 -07:00
Ryan Huffman	0393777b03	Add getMemoryInfo helper function	2016-06-20 16:01:44 -07:00
Ryan Huffman	1fa274a527	Fix GPUIdent name trailing whitespace	2016-06-20 16:01:03 -07:00
Bradley Austin Davis	0b0977f362	Support keyboard suppresion, control suppresion while in keyboard mode	2016-06-15 10:48:48 -07:00
Bradley Austin Davis	b1c472e82b	Fixing settings, even in release builds	2016-06-14 12:16:40 -07:00
Bradley Austin Davis	d52a1fe6f9	Fix persistence for global scope settings handles, clean up invalid variants in settings	2016-06-14 09:49:38 -07:00
Bradley Austin Davis	34c8d257d2	Fixing issues with unclosed groups in settings persistence	2016-06-14 09:49:38 -07:00
Seth Alves	f8f62a4ff1	remove unused function	2016-06-13 15:10:52 -07:00
Seth Alves	eba518cb65	try to make code that converts bullet-calculated values to parent-frame values more effecient	2016-06-13 14:26:41 -07:00
Seth Alves	99bfc76dd3	Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam	2016-06-13 11:14:26 -07:00
Seth Alves	4c45d081cd	merge from upstream	2016-06-10 19:57:46 -07:00
Seth Alves	96bf66d14a	Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam	2016-06-10 11:49:45 -07:00
Seth Alves	e1ae2a193f	EntityMotionState now uses parent-relative position and rotation and velocity when deciding if it needs to send an edit packet to the entity-server	2016-06-10 11:49:15 -07:00
Seth Alves	203ea5ddc7	Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid	2016-06-09 09:53:33 -07:00
Brad Davis	ff8d4883b1	Attempt to get better logging from pure virtual call crashes	2016-06-08 22:35:39 -07:00
Brad Hefta-Gaub	0df72548f8	Merge pull request #8024 from kencooke/audio-src-avx2 AVX2 optimized audio resampler	2016-06-08 12:43:52 -07:00
Ken Cooke	27d39eb1b0	Lightweight functions to detect SSE3, SSSE3, SSE4.1, SSS4.2, AVX and AVX2. These are cross platform, and return false on unsupported platforms.	2016-06-07 06:53:50 -07:00
Seth Alves	e16d1fdc23	Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid	2016-06-06 16:32:26 -07:00
Brad Hefta-Gaub	5190d8ab6b	Merge pull request #8023 from jherico/settings Eliminate extraneous writes for unchanged values	2016-06-06 12:22:11 -07:00
Seth Alves	d202a2bf11	better handling of missing settings keys	2016-06-06 11:59:39 -07:00
Brad Hefta-Gaub	f2bedc546f	Merge pull request #8019 from jherico/settings Eliminate file IO contentions for settings	2016-06-04 21:04:50 -07:00
Brad Davis	bc81f00dc7	Eliminate extraneous writes for unchanged values	2016-06-04 20:47:10 -07:00
Brad Davis	65d8f65ed7	Fix unix builds, make settings ACID	2016-06-04 18:39:46 -07:00
Brad Davis	39dcd1f9bd	Eliminate file IO contentions for the settings	2016-06-04 17:55:30 -07:00
Andrew Meadows	bce8879d7c	remove ShapeInfo::clearPoints() use getPoints() by ref and then clear	2016-06-03 10:47:54 -07:00
Andrew Meadows	9dc0fa7796	don't automatically clear ShapeInfo points	2016-06-03 10:47:54 -07:00
Andrew Meadows	211bbb88e6	purge SHAPE_TYPE_ELLIPSOID which wasn't used	2016-06-03 10:47:54 -07:00
Andrew Meadows	5d9e320dd7	purge SHAPE_TYPE_LINE	2016-06-03 10:47:54 -07:00
Andrew Meadows	d591561a88	remove RenderableModelEntityItem::_points use ShapeInfo::_points instead	2016-06-03 10:47:54 -07:00
Andrew Meadows	1132b4666a	Merge pull request #7975 from jherico/shared_shapes Moving shape definition to a shared location	2016-05-27 07:28:11 -07:00
Brad Davis	6a962d7aab	Unix build fix	2016-05-26 15:51:36 -07:00
Brad Davis	2c02c963d4	Moving shape definition to a shared location	2016-05-26 12:22:39 -07:00
Brad Hefta-Gaub	06cb625d09	Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision Improved Avatar Mixer Rotation Precision	2016-05-25 17:14:12 -07:00
Anthony J. Thibault	a1c32f8c44	Merge branch 'master' into tony/improved-avatar-mixer-precision	2016-05-23 10:24:52 -07:00
Seth Alves	40e862cf9e	quiet gcc 5 warnings	2016-05-21 16:53:01 -07:00
Andrew Meadows	83b8ef8131	clean up stream formatting of vec3 and friends	2016-05-20 09:41:26 -07:00
Andrew Meadows	f3fc00bc3a	add comment for why MAX_HULL_POINTS is 42	2016-05-20 09:41:26 -07:00
Andrew Meadows	5a826d696a	cleanup after code review	2016-05-20 09:41:26 -07:00
Andrew Meadows	7866fcf78c	trim high-point convex hulls	2016-05-20 09:41:26 -07:00
Anthony J. Thibault	b95ba8141c	AvatarData packet overhaul, uses a structure instead of raw memcpy	2016-05-19 20:26:00 -07:00
Brad Hefta-Gaub	d521cd82a0	Merge pull request #7908 from Atlante45/fix/settings fix settings getting reset	2016-05-19 17:53:15 -07:00
Brad Hefta-Gaub	cef4a49c35	Merge pull request #7867 from huffman/fix/query-octree-crash Fix crash in JurisdictionMap	2016-05-19 11:53:54 -07:00
Atlante45	10c412d8c7	Fix settings getting reset fixes bugzid:531 When a setting handle was created but never initialized/used, it would override the current value with the default value on destruction.	2016-05-18 11:36:14 -07:00
Zach Pomerantz	59e17c2d5f	Fix abs of unsigned warning	2016-05-17 22:57:29 -07:00
Anthony J. Thibault	2c6b0e5c95	Fix for linux warning.	2016-05-17 17:32:09 -07:00
Ryan Huffman	013d902376	Add vector include to OctalCode.h	2016-05-17 10:59:51 -07:00
Ryan Huffman	5fc18eafda	Rename OctalCodePtr related functions	2016-05-17 10:59:51 -07:00
Ryan Huffman	35f147f557	Cleanup use of OctalCodePtrList and add allocateOctalCodePtr	2016-05-17 10:59:51 -07:00
Ryan Huffman	e819ab8475	Add mutex protection around octal code getters	2016-05-17 10:59:51 -07:00
Ryan Huffman	ef6d758e7f	Fix JurisdictionMap multithreading issues Make octal code pointers use shared_ptr, add locks around access.	2016-05-17 10:59:51 -07:00
Anthony J. Thibault	818d1f4601	Added six byte quaternion compression routines & tests	2016-05-16 17:48:54 -07:00
samcake	c627a555bf	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2016-05-16 16:27:51 -07:00
Anthony Thibault	8fecb51dde	Merge pull request #7846 from hyperlogic/tony/improved-avatar-debug-draw Eye tracking bug fix and debug rendering improvements	2016-05-11 17:41:49 -07:00
samcake	c6a081fb46	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2016-05-11 16:56:37 -07:00
Brad Hefta-Gaub	e01681eb52	Merge pull request #7856 from ZappoMan/NUEtweaks don't show help or login on first run	2016-05-11 10:53:09 -07:00
Anthony J. Thibault	80a349c65b	Merge branch 'master' into tony/improved-avatar-debug-draw	2016-05-10 14:50:13 -07:00
Brad Hefta-Gaub	df34b49b41	fix white space	2016-05-10 11:34:11 -07:00
Brad Hefta-Gaub	33c5cb519a	cleanup firstRun with a common setting	2016-05-10 11:32:29 -07:00
Andrew Meadows	db9a4d6b8f	cleanup for code review	2016-05-10 07:49:11 -07:00
Anthony J. Thibault	9821c276ad	warning fix in release	2016-05-09 13:56:56 -07:00
Anthony J. Thibault	7f5296f566	Increased tolerance for near zero length vectors Also, replaced some magic numbers with constants.	2016-05-09 11:53:09 -07:00
Anthony Thibault	cb5c7a3559	compile fix for macosx	2016-05-08 17:14:14 -07:00
Anthony J. Thibault	641e152699	Eye tracking bug fix and debug rendering improvement * Bug fix for eye tracking in HMD, the "up" orientation of your eyes now match your head. * DebugDraw: added drawRay method. * Application: Renamed preRender to postUpdate * AvatarManager: added postUpdate method that iterates over all avatars. * MyAvatar: Renamed preRender to preDisplaySide * MyAvatar: split preRender code into postUpdate and preDisplaySide. * Removed "Show who is looking at me", "Render focus indicator" and "Render lookat target" debug draw. * Split "Show Look At Vectors" into "Show My Look At Vectors" and "Show Other Look At Vectors", to make it easier to debug eye tracking. * "Show Look at Vectors" now draws the right eye red and the left eye blue. * Removed Avatar and MyAvatar renderBody * Removed look at rendering from head. * GLMHelpers: Bugfix for generateBasisVectors when up primary and secondary axis were orthogonal	2016-05-08 16:20:32 -07:00
Andrew Meadows	eeb100b62f	use glm::isnan() instead of isnan() from math.h	2016-05-05 18:28:27 -07:00
Andrew Meadows	01950fba96	recover unused code that may prove useful someday	2016-05-05 18:28:27 -07:00
Andrew Meadows	64c2e2d175	remove warning about unused variable	2016-05-05 18:28:27 -07:00
Andrew Meadows	2cbc771eba	reorder data members, remove cruft, 744->616 bytes	2016-05-05 18:28:27 -07:00
Andrew Meadows	bcf2cc8074	use references not pointers for ViewFrustums also unravelling some spaghetti: (1) split Octree stuff out of ViewFrustum (2) moved ViewFrustum from octree to shared lib (3) removed some cruft	2016-05-05 18:28:27 -07:00
Andrew Meadows	60a72c6660	getViewFrustum() provides const pointer	2016-05-05 18:28:27 -07:00
Zach Pomerantz	1553f532ba	Specialize usleep for Win32	2016-05-04 15:40:53 -07:00
Zach Pomerantz	526143b097	Improve perf of Win32 usleep	2016-05-04 13:36:07 -07:00
Zach Pomerantz	0f6162d683	Use appropriate units for timing tests	2016-05-04 13:23:10 -07:00
Brad Hefta-Gaub	754ef071eb	Merge pull request #7786 from sethalves/web-scripts-use-local-libs allow scripts on the web to refer to local libraries with /~/	2016-05-03 11:10:48 -07:00
Geenz	85e0620261	Merge branch 'master' of https://github.com/highfidelity/hifi	2016-04-30 15:40:28 -04:00
Seth Alves	b28cfd27ec	fix problem where canonicalFilePath will strip a trailing slash	2016-04-29 13:17:59 -07:00
Andrew Meadows	b95c81d0ba	Merge pull request #7763 from huffman/fix/gpu-ident-debug Fix assert crash in GPUIdent	2016-04-28 08:02:11 -07:00
samcake	fa28286274	Merge with master and include fix to debus eception, still crashing on particular drawcalls when in stereo?	2016-04-26 15:26:56 -07:00
Geenz	ae5ef6d948	Remove toLinearVec3 from ColorUtils toGamma22Vec3 should probably stay since that is a valid conversion from linear to a gamma space of 2.2.	2016-04-26 17:00:59 -04:00
Anthony J. Thibault	d9063b199e	GeometryUtils: coneSphereAngle test	2016-04-26 13:31:06 -07:00
Ryan Huffman	e5f2658fd9	Update GPUIdent to take address of spInstance directly	2016-04-26 09:23:08 -07:00
Geenz	ba5fa70b83	Convert sRGB values for materials.	2016-04-25 13:31:50 -04:00
Geenz	97931d96b8	Move sRGB calcs to ColorUtils And start consolidating any conversions with calls into ColorUtils.	2016-04-25 12:59:16 -04:00
Brad Hefta-Gaub	04dab65b59	Merge pull request #7727 from ZappoMan/supportLargeClockSkew support for larger than 35 minute clock skew	2016-04-23 08:42:38 -07:00
Brad Hefta-Gaub	f1f9c6740d	Merge pull request #7745 from jherico/mac_texture_fix Fixing texture storage allocation on OSX/GL 4.1	2016-04-22 17:07:12 -07:00
Bradley Austin Davis	d87c92baee	Fixing memory detection on OSX	2016-04-22 16:30:36 -07:00
Chris Collins	9bd9de5710	Merge pull request #7636 from samcake/red Stereo drawcall amplification	2016-04-22 15:46:18 -07:00
Brad Hefta-Gaub	410bf3c95a	Merge pull request #7711 from AndrewMeadows/faster-kinematics faster hifi kinematic motion calculations take-4	2016-04-22 13:41:02 -07:00
Brad Hefta-Gaub	c410242fb2	Merge pull request #7688 from jherico/texture_derez Reducing GPU texture memory footprint	2016-04-22 13:20:54 -07:00
Seth Alves	e827a99222	Merge pull request #7732 from Atlante45/fix/settings-crash Fix crash on exit in Settings	2016-04-22 11:46:30 -07:00
Andrew Meadows	afcf6d68a7	move deactivation thresholds to shared header	2016-04-22 09:38:43 -07:00
Andrew Meadows	c8f0b0501a	avoid active object update cycles	2016-04-22 09:38:43 -07:00
Andrew Meadows	3639ffe53e	optimize kinematic motion math	2016-04-22 09:38:43 -07:00
Andrew Meadows	905c5398c4	add EntityItem::set/getTransformAndVelocities()	2016-04-22 09:38:43 -07:00
Brad Hefta-Gaub	72c81e2378	Merge branch 'master' of https://github.com/highfidelity/hifi into supportLargeClockSkew	2016-04-21 16:26:44 -07:00
Brad Hefta-Gaub	d87d631871	Merge pull request #7708 from zzmp/feat/render-rates Add renderRates.js to visualize rates over time	2016-04-21 15:59:58 -07:00
Brad Hefta-Gaub	2abcc454b0	CR feedback	2016-04-21 15:48:18 -07:00
Brad Davis	2689f2cc4a	Add MB/KB/Byte conversion macros	2016-04-21 14:46:11 -07:00
Howard Stearns	7f748153c5	Mac code for gpu memory.	2016-04-21 14:46:08 -07:00
Atlante45	0c32f47f50	Don't call virtual method from base dtor	2016-04-21 13:25:31 -07:00
Brad Hefta-Gaub	f9c4959578	remove some debugging, tweak formatting	2016-04-21 09:53:00 -07:00
Brad Hefta-Gaub	ddf5b0f316	some debugging	2016-04-21 10:32:22 -07:00
howard-stearns	c274df6066	uint64	2016-04-20 22:57:33 -07:00
howard-stearns	904e87313e	Match the gpu adapter names gainst the vendor and renderer names used by the ogl we're using, so that we pick the right GPU to get info from.	2016-04-20 22:57:32 -07:00
howard-stearns	b403dcb0d9	An experiment to see if dual-card Windows desktops can be made to answer the correct card.	2016-04-20 22:57:32 -07:00
howard-stearns	cb137635db	Fix stupid MSVC default indentation.	2016-04-20 22:57:31 -07:00
howard-stearns	c12772e4c6	GPU identification utilities	2016-04-20 22:57:30 -07:00
Brad Hefta-Gaub	31f9d592e0	support for larger than 35 minute clock skew	2016-04-20 18:42:00 -07:00
Zach Pomerantz	477d6f40e4	Avoid use of atomic copy ctor in RateCounter	2016-04-20 13:39:57 -07:00
samcake	474d667f27	One more uneeded change	2016-04-19 11:03:35 -07:00
samcake	28521aa66a	REmoving uneeded changes	2016-04-19 11:01:41 -07:00
samcake	265f6f1275	Updating & Merging with master	2016-04-19 10:05:44 -07:00
Brad Hefta-Gaub	b0f3b24caa	Merge pull request #7699 from OmegaHeron/gcc53 Gcc53	2016-04-19 07:34:24 -07:00
Brad Hefta-Gaub	8f19eba5c2	Merge pull request #7685 from zzmp/debug/sub Add sub to Debug Counter	2016-04-19 07:27:49 -07:00
Omega Hereon [J.L.]	64f6a59bb3	Merge remote-tracking branch 'upstream/master' into gcc53	2016-04-19 01:11:35 +00:00
Zach Pomerantz	6d7f8f4a6f	Make RateCounter rate atomic	2016-04-18 17:42:45 -07:00
Brad Hefta-Gaub	01907f181f	Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD	2016-04-18 16:01:42 -07:00
Seth Alves	4bf98a80b9	Merge pull request #7667 from AndrewMeadows/fix-entity-server-crash fix entity-server crash when entity moves out of bounds	2016-04-18 14:09:21 -07:00
Omega Hereon [J.L.]	b3b58b8176	Fix instances of error: isnan was not declared in this scope with GCC5.3/Ubuntu 16.04 In all but these 3 files isnan is glm::isnan	2016-04-18 18:45:15 +00:00
Brad Hefta-Gaub	8f3d48190a	switch to QRect instead of vec4	2016-04-16 16:59:47 -07:00
Joe Large [Omega Heron]	be208ba682	Revert "Correct references to isnan to glm::isnan for compat with Ubuntu 16.04/GCC 5.3" Moving this to a branch. This reverts commit `b88fc62b97`.	2016-04-16 18:24:50 -04:00
Brad Hefta-Gaub	54777c9cd5	Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD	2016-04-16 15:19:35 -07:00
Joe Large [Omega Heron]	b88fc62b97	Correct references to isnan to glm::isnan for compat with Ubuntu 16.04/GCC 5.3	2016-04-16 17:46:37 -04:00
samcake	d2cb017a04	Merge branch 'master' of https://github.com/highfidelity/hifi into red	2016-04-16 10:44:56 -07:00
Brad Hefta-Gaub	04df84974c	handle repositioning of qml windows	2016-04-15 19:50:12 -07:00
Zach Pomerantz	cf9d160602	Add sub to Debug Counter	2016-04-15 16:39:57 -07:00
Chris Collins	7b49552066	Merge pull request #7677 from howard-stearns/RateCounter-adjustment Don't truncate time when accumulating, and then divide by non-truncated.	2016-04-15 15:59:13 -07:00
samcake	298300e42f	Merge branch 'master' of https://github.com/highfidelity/hifi into red	2016-04-15 14:16:02 -07:00
Anthony J. Thibault	38418d0169	Moved isListOfStrings into shared/ScriptValueUtils Also fixed some single line ifs.	2016-04-15 13:47:30 -07:00
howard-stearns	089e7eb6b3	Don't truncate time when accumulating, and then divide by non-truncated.	2016-04-15 10:17:57 -07:00
Andrew Meadows	a263091c94	fix entity-server crash for out of bounds	2016-04-14 15:23:14 -07:00
Andrew Meadows	4d7efbc43f	faster isNaN() and friends	2016-04-14 11:18:10 -07:00
Andrew Meadows	bb59860cfe	update Aabb's of static objects when they move	2016-04-14 11:18:10 -07:00
Brad Hefta-Gaub	37dcfdad8a	Merge pull request #7652 from huffman/feat/crash-menu Move crash menu items to submenu and add new crash types	2016-04-14 09:32:36 -07:00
samcake	6c3e011b89	Expose cleanely the 3 different techniques	2016-04-14 02:43:28 -07:00
Zach Pomerantz	774eb1c45a	Make shared Debug header	2016-04-13 15:48:26 -07:00
Ryan Huffman	47c2a1722b	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/crash-menu	2016-04-13 14:40:46 -07:00
Ryan Huffman	9ee81a73c7	Fix clang warning in CrashHelpers::newFault	2016-04-13 13:41:45 -07:00
Brad Hefta-Gaub	4b3b917af6	add support for avatar licenses in FST files	2016-04-13 12:26:09 -07:00
Ryan Huffman	e563de9ef8	Fix 'array is too large' warning	2016-04-13 11:28:54 -07:00
Ryan Huffman	6cbd31fa51	Cleanup unnecessary scoping in pureVirtualCall	2016-04-13 11:28:37 -07:00
Ryan Huffman	7fbaa77c0b	Fix missing brace in namespace	2016-04-13 10:24:39 -07:00
Ryan Huffman	91da4229ac	Fix unused variable warning in CrashHelpers.h	2016-04-13 09:42:20 -07:00
Ryan Huffman	0c1277ae7a	Add CrashHelpers.h and add to separate submenu	2016-04-12 16:44:11 -07:00
samcake	ff1df0d45e	Merge branch 'master' of https://github.com/highfidelity/hifi into red	2016-04-12 15:29:58 -07:00
samcake	ab9f41f5eb	Trying something a bit more radical for timing	2016-04-12 15:29:31 -07:00
Brad Hefta-Gaub	88ca5520be	Merge pull request #7647 from jherico/rate_counter Fixing rate counter	2016-04-12 14:48:05 -07:00
Brad Davis	9f2eabe6ce	Fixing rate counter	2016-04-12 14:11:56 -07:00
Seth Alves	2b63c2a8ba	Merge pull request #7641 from hyperlogic/tony/macos-cpuid-fix Rename CPUID to CPUIdent to fix XCode 7.2 builds	2016-04-12 12:48:15 -07:00
Anthony J. Thibault	32ccc1d68e	Windows build fixes	2016-04-12 10:53:04 -07:00
Brad Hefta-Gaub	c5840f217a	Merge pull request #7630 from jherico/fps_fix Fix FPS counter	2016-04-12 08:31:58 -07:00
Anthony J. Thibault	470aac3acf	Rename CPUID to CPUIdent to fix XCode 7.2 builds	2016-04-11 11:54:17 -07:00
Brad Davis	df8ad57185	Fix FPS counter	2016-04-11 00:25:16 -07:00
Brad Hefta-Gaub	cc418c615f	Merge pull request #7631 from sethalves/parent-equipping-and-platform-hack treat children of avatars and children of entities differently until velocity handling is fixed	2016-04-10 14:55:03 -07:00
Seth Alves	43f735dd21	avoid loop where bullet moves an entity and then an entity tells bullet that it has moved.	2016-04-09 22:18:43 -07:00
Seth Alves	3890a71433	treat children of avatars and children of entities differently until this is fixed	2016-04-09 08:37:41 -07:00
Brad Hefta-Gaub	772e7b95f6	Merge pull request #7584 from zzmp/log/dep-is-set Avoid warning for expected unset PresentThread	2016-04-07 14:47:56 -07:00
Zach Pomerantz	37efeb7f29	Avoid warning for expected unset PresentThread	2016-04-05 14:59:59 -07:00
Seth Alves	d5136f011c	Merge branch 'master' of github.com:highfidelity/hifi into update-collision-hulls-of-avatar-children	2016-04-05 11:08:38 -07:00
Seth Alves	294bdcb18e	has-ancestor should test self	2016-04-04 17:41:01 -07:00
Seth Alves	cecb3a6ff1	unmangle merge	2016-04-04 17:07:08 -07:00
Seth Alves	d814d7b35d	merge from upstream	2016-04-04 16:32:49 -07:00
Seth Alves	69bb0ebd74	Revert "faster kinematic motion for entities"	2016-04-04 16:11:54 -07:00
Seth Alves	b8587e0711	update collision shapes of entities which are children of avatars	2016-04-04 16:06:53 -07:00
Seth Alves	c48a67b933	Merge pull request #7544 from AndrewMeadows/faster-kinematics faster kinematic motion for entities	2016-04-04 15:26:32 -07:00
Brad Davis	d98abbc7df	First pass at threaded texture transfers	2016-04-04 10:23:01 -07:00
Brad Davis	4f373937f9	Additional performance markers	2016-04-03 20:41:34 -07:00
Andrew Meadows	0830c55bcf	getLocalEverything->getLocalTransformAndVelocities	2016-04-01 17:48:56 -07:00
Andrew Meadows	de5fe705a3	optimize Bullet broadphase using collision groups	2016-04-01 13:14:03 -07:00
Andrew Meadows	e1602b57fa	faster isNaN checks	2016-04-01 13:14:03 -07:00
Andrew Meadows	442b52313f	faster kinematic motion calculations	2016-04-01 13:14:03 -07:00
Seth Alves	0f288247a7	include script in default script location	2016-04-01 10:50:22 -07:00
Brad Hefta-Gaub	5a665f9aef	Merge pull request #7482 from huffman/extra-logging Add system information to log file	2016-04-01 09:10:21 -07:00
Ryan Huffman	03f9a02857	Update env var logging to only include certain keys	2016-03-31 22:49:22 -07:00
Brad Hefta-Gaub	f0cc8c0dd3	Merge pull request #7491 from jherico/oculus_release Update to latest Oculus SDK, add input device support	2016-03-30 17:42:32 -07:00
Seth Alves	e8f26b675a	try to fix path to osx scripts	2016-03-30 15:04:29 -07:00
Seth Alves	62372415be	get this working on windows	2016-03-30 14:01:35 -07:00
Seth Alves	bb43347599	Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts	2016-03-30 13:33:59 -07:00
Seth Alves	26e01bbacd	rewrite a bunch of path/url mangling code	2016-03-30 13:33:49 -07:00
Brad Hefta-Gaub	699b3a9dd7	Merge pull request #7499 from birarda/udt-fixes fix an overflow in portable high resolution clock on windows	2016-03-30 10:54:00 -07:00
Brad Davis	f569cbf70e	Add debugging output, fix timewarp	2016-03-30 10:40:32 -07:00
Brad Hefta-Gaub	d99dcf5450	Merge pull request #7487 from hyperlogic/tony/animated-culling Improved render bounding boxes for animated models	2016-03-30 09:27:43 -07:00
Seth Alves	7c0bb72aff	started on making ~ mean the application directory in script paths	2016-03-29 18:32:46 -07:00
Ryan Huffman	fdbd58765c	Remove printSupported from printSystemInformation	2016-03-29 16:06:55 -07:00
Seth Alves	0c72ca1be3	works on windows now	2016-03-29 13:39:35 -07:00
Stephen Birarda	b9ce427344	use c-style casts to respect the coding standard	2016-03-29 13:25:03 -07:00
Stephen Birarda	37950e9931	use explicit double casts for win_high_resolution_clock	2016-03-29 13:13:22 -07:00
Seth Alves	3aa1090ced	working toward allowing local files in running-scripts window	2016-03-29 11:58:21 -07:00
Seth Alves	b88770228e	convert running-scripts window to use local script files	2016-03-29 10:40:56 -07:00
Stephen Birarda	b134f22cfa	fix an overflow in portable high resolution clock on windows	2016-03-28 18:51:34 -07:00
howard-stearns	b09b9a4a0a	snapshot after using tree from entity item.	2016-03-28 16:58:20 -07:00
Seth Alves	b273d5efd3	fix defaultScripts filename	2016-03-28 13:48:19 -07:00
howard-stearns	c6347eb92a	checkpoint for debugging/comparing edit.js	2016-03-28 13:39:43 -07:00
Seth Alves	de8153bd75	on windows and osx use default scripts bundled with interface	2016-03-28 12:23:23 -07:00
Ryan Huffman	3c9f26a7f2	Add CPUID::getAllFeatures	2016-03-28 10:48:51 -07:00
Anthony J. Thibault	bf433487fa	Dynamic bound update for skinned mesh * Use all cluster matrices to compute bound for skinned mesh. This is far less expensive then doing per-vertex work, but it's not free, for avatars especially. * Remove skinnedMeshBound, compute it instead. * Compute clusterMatrices in render update, because we need them to update bounds.	2016-03-26 12:22:02 -07:00
Anthony J. Thibault	b4e70d9101	WIP: checkpoint * bug fix in AABox::operator+= * added AABox::emiggen * Avatar now has a default bound for it's skinned mesh. * WIP: AABox tests; NEED MORE * Model: split collision and model mesh render items. Because ModelMeshRenderItems need special handling to update bounds for animated joints. * Model: dynamically update the bound for rigidly bound animated meshes * Rig: added access to geometryToRigTransform * RenderableModelEntityItem: try to update bounds for skinned mesh to be the entity dimentions (this doesn't seem to be working) * Geometry.cpp: removed unused bounds parameter in evalPartBounds * ModelMeshPartPayload: bounds updating * non-animated: use existing _localBound * rigid bound mesh: use _localBound transformed by clusterMatrix joint transform * fully skinned mesh: use _skinnedMeshBound provided by the application.	2016-03-25 21:29:20 -07:00
Ryan Huffman	b155a0534b	Fix brace placement in CPUID	2016-03-25 16:23:48 -07:00
Seth Alves	1532800a4e	Merge branch 'master' of github.com:highfidelity/hifi into fix-logging-crash	2016-03-25 16:17:58 -07:00
Ryan Huffman	f2a28efcd2	Fix CPUID::CPU_Rep being defined on non-Win	2016-03-25 16:02:52 -07:00
Ryan Huffman	8d7670a4e8	Move system information logging to SharedUtil	2016-03-25 16:00:04 -07:00
Ryan Huffman	c4a87925e2	Add system information to log file	2016-03-25 15:34:53 -07:00
Brad Hefta-Gaub	541c1e5c6f	Merge branch 'master' of https://github.com/highfidelity/hifi into reduceFalsePositiveDeadlocks	2016-03-25 13:03:31 -07:00
Seth Alves	13eddef312	fix locking in GenericQueueThread::process	2016-03-25 11:37:04 -07:00
Brad Hefta-Gaub	fb09ad51b3	CR feedback	2016-03-24 21:14:07 -07:00
Brad Hefta-Gaub	7de8a2267f	one more try	2016-03-24 18:09:14 -07:00
Brad Davis	0ac70049c7	Merge pull request #7431 from hyperlogic/tony/vive-rendering-work OpenVR rendering & Nsight instrumentation improvements	2016-03-24 17:44:30 -07:00
Brad Hefta-Gaub	06a6a8462f	more cleanup	2016-03-24 16:34:09 -07:00
Brad Hefta-Gaub	2b595fb329	break out thread safe moving average to get around unix build hell	2016-03-24 16:26:28 -07:00
Brad Hefta-Gaub	8691aa6905	fix unix build and CR feedback	2016-03-24 15:45:44 -07:00
Brad Hefta-Gaub	6eed8fb429	fix unix build	2016-03-24 13:30:20 -07:00
Brad Hefta-Gaub	208b594ef8	make the deadlock watchdog more generous and add some logging so we can see heatbeats on slow machines	2016-03-24 12:37:07 -07:00
Anthony J. Thibault	de3144cde5	Merge branch 'master' into tony/vive-rendering-work	2016-03-23 18:13:59 -07:00
Andrew Meadows	a52ac3cc50	remove excess whitespace	2016-03-23 14:39:49 -07:00
Brad Davis	84dc15aff6	Fix potential deadlock in QML	2016-03-23 12:59:17 -07:00
Anthony J. Thibault	9dd24f81d4	Fix for osx and linux	2016-03-22 18:24:48 -07:00
Anthony J. Thibault	c40b70688c	Made Nsight wrapper win32 only.	2016-03-22 17:43:36 -07:00
Anthony Thibault	225c462685	Improved NSIGHT instrumentation * Application::idle, physics and avatar processing are tracked * Application::paintGL frameNumber payload is tracked * OpenGLDisplayPlugin::present is profiled with corresponding frameNumber payload * Added color and payload support to Nsight ProfileRange class.	2016-03-21 21:47:59 -07:00
Atlante45	6d2498b4f2	Remove debug print	2016-03-21 14:50:18 -07:00
Seth Alves	cbfde2032c	fix bug which caused observers of a parenting grab to not see the entity in the grabber's hand	2016-03-17 17:09:32 -07:00
Seth Alves	db5c6d80d2	possibly fix a couple of crashes	2016-03-17 10:31:54 -07:00
Seth Alves	e8a03b725f	try again on queryAACube	2016-03-14 13:03:27 -07:00
Seth Alves	908481d5d4	merge from upstream	2016-03-14 11:15:16 -07:00
Seth Alves	01659cf93b	try, try again	2016-03-11 16:21:20 -08:00
Seth Alves	5f05d576cc	move checkAndAdjustQueryAACube into SpatiallyNestable	2016-03-11 15:55:42 -08:00
Anthony J. Thibault	5eeb4ca594	Fix one frame lag controller lag/jitter Move userInputMapper->update() after inputPlugin->pluginUpdate().	2016-03-11 09:28:25 -08:00
Howard Stearns	2b576e86f0	Merge pull request #7259 from jherico/crashes Crash fixes	2016-03-09 16:42:36 -08:00
Brad Davis	d428f3b96f	Working on crash bugs	2016-03-09 14:00:05 -08:00
Anthony J. Thibault	deb17e1f93	Merge branch 'master' into tony/hand-controller-move-improvements	2016-03-08 17:45:50 -08:00
Brad Hefta-Gaub	6d211dd4e5	first cut at fixing the scene not stable bug	2016-03-08 14:52:21 -08:00
Anthony J. Thibault	0d62b10a8f	Added Mat4 support to script Also, hooked up MyAvatar.sensorToWorldMatrix access to script.	2016-03-07 16:16:14 -08:00
Brad Davis	2f89253dc1	Make Overlays usable from QML	2016-03-04 11:35:54 -08:00
Philip Rosedale	3eabf0d451	Merge pull request #7209 from sethalves/auto-unhook-stuck-to-hand when trigger is squeezed, check for things stuck to hand and unhook them	2016-02-29 12:59:02 -08:00
Seth Alves	bb9d1556c6	when breaking a parenting loop, make an effort to keep the object near where it was when the loop was created	2016-02-29 11:07:02 -08:00
Seth Alves	5bf8670bc2	fix SpatiallyNestable::getChildren	2016-02-28 12:16:41 -08:00
Seth Alves	c0c5084149	handle parenting loops	2016-02-26 14:05:02 -08:00
Andrew Meadows	dfdf375853	use shapeInFrustum() names again but at the same time make the code more redable also: add some more efficient shape-touches-view methods and cleanup some whitespace	2016-02-25 18:09:35 -08:00
Anthony J. Thibault	b5b3a40233	LogHandler: add option to display milliseconds in timestamp	2016-02-25 10:03:12 -08:00
Brad Hefta-Gaub	2a18127a01	Merge pull request #7171 from jherico/avatar_qml_location Allow avatar positioning from QML	2016-02-24 11:37:12 -08:00
Brad Davis	2258a9cad9	Allow avatar positioning from QML	2016-02-23 12:16:41 -08:00
Zach Pomerantz	7804ee22d4	Consolidate stats for opaque/transparent/other	2016-02-23 12:14:00 -08:00
Andrew Meadows	6baf181453	Merge pull request #7093 from hyperlogic/tony/input-poses-in-avatar-space Controller Pose values are relative to Avatar.	2016-02-12 17:13:36 -08:00
samcake	ef92a52777	Merge pull request #7051 from zzmp/feat/graphics-dialog Move graphics settings to a new dialog	2016-02-12 10:46:00 -08:00
Anthony J. Thibault	111ed65bf8	Controller Pose values are relative to Avatar. Pass a InputCalibrationData to each inputPlugin and inputDevice. This contains the most up sensorToWorldMatrix, avatarMat and hmdSensorMatrix. Each input plugin can use this data to transform it's poses into Avatar space before sending it up the chain. This fixes a bug in the handControllerGrab.js script that relied on the hand controller rotation/positions being in the avatar frame.	2016-02-11 17:18:01 -08:00
Chris Collins	a4afa03fe5	Merge pull request #7077 from sethalves/clean-up-grab-signaling Clean up grab signaling + various fixes	2016-02-11 10:20:56 -08:00
Zach Pomerantz	a7778daed2	Change graphics dialog to persisted dropdowns	2016-02-11 10:15:13 -08:00
Zach Pomerantz	66e1d9668c	Add ComboBox preference	2016-02-11 10:00:44 -08:00
samcake	99e9b3ecdd	Merge pull request #7043 from zzmp/fix/render-ui Revamp the render engine ui	2016-02-11 09:57:51 -08:00
Zach Pomerantz	991d6328ef	Fix JSON integration for JobConfig	2016-02-11 08:47:58 -08:00
Seth Alves	3fe01ccf10	cleanups	2016-02-10 18:32:05 -08:00
Seth Alves	3f922240d0	clean up handling of success flag and some debugging prints	2016-02-10 16:42:13 -08:00
Anthony J. Thibault	727e289ecd	SpatiallyNestable: bug fixes for kinematic entities * Kinematic entities were being simulated with position in the local frame but velocity in the global frame. * Also, because getVelocity() was returning non-zero values when the parent was moving, kinematic objects were being simulated even if they should have been at rest. * Bug fix for calculating velocity direction was incorrect, if the parent frame was rotated.	2016-02-09 17:58:54 -08:00
Seth Alves	43592fd699	Merge pull request #7048 from hyperlogic/tony/avatar-on-moving-platform Better avatar animation when attached to a moving entity	2016-02-09 14:30:02 -08:00
Anthony J. Thibault	2b10fea006	SpatiallyNestable: warn on failure.	2016-02-09 14:03:39 -08:00
Anthony J. Thibault	6a82594a4f	SpatiallyNestable: more locks, less contention	2016-02-08 20:09:32 -08:00
Anthony J. Thibault	9a0e206843	SpatiallyNestable: made getParentPointer protected again.	2016-02-08 20:04:45 -08:00
Anthony J. Thibault	072172b1a2	SpatiallyNestable: now with velocity support! Moved velocity and angularVelocity into the SpatiallyNestable base class. Entity velocity and angularVelocity properties are now relative to their parent, similar to the way position and orientation work for entities. MyAvatar rig animations now use SpatiallyNestable to convert velocity into local frame to drive the animation state machine.	2016-02-08 19:43:23 -08:00
Anthony Thibault	c4f9a4805c	MyAvatar: moving platform support * pass sum of desired and parent velocity onto avatar's character controller. * pass local position and velocity to Rig for animation purposes.	2016-02-07 14:07:40 -08:00
Zach Pomerantz	8bf6c66327	Add (de)serializer for QObject->JSON	2016-02-05 13:03:46 -08:00
Zach Pomerantz	2da2bc60db	Tie shadow frustum to boom offset	2016-01-26 12:26:16 -08:00
Brad Davis	71ae36f5c0	Button prefs and conditionally enabled prefs	2016-01-22 19:06:30 -08:00
Brad Davis	27fdb523cb	Add directory & avatar browsing preferences	2016-01-22 17:30:10 -08:00
Brad Davis	2026821d9e	Moving preferences to dependency mananger	2016-01-22 17:30:08 -08:00
Brad Davis	205ab05506	First pass on preferences dialog Conflicts: tests/ui/qmlscratch.pro	2016-01-22 17:30:07 -08:00
Anthony J. Thibault	8bfa80d5fc	Merge remote-tracking branch 'upstream/master' into tony/hmd-recenter-on-rotation	2016-01-22 13:37:43 -08:00
Brad Hefta-Gaub	9ec2cf1ab9	Merge pull request #6902 from sethalves/no-nan check values in location updates for NaN before using them	2016-01-22 13:34:15 -08:00
Anthony J. Thibault	61b760038a	Address feedback from code review	2016-01-22 11:54:28 -08:00
Seth Alves	2633cb1f27	rename NaN functions for vec3 and quat	2016-01-22 11:54:24 -08:00
Seth Alves	7a3401a8d7	Merge pull request #6867 from AndrewMeadows/collision-group-prep cleanup in preparation for smarter collision grouping	2016-01-22 11:45:42 -08:00
Seth Alves	673182c091	formatting	2016-01-22 11:22:02 -08:00
Seth Alves	a9cf836cb0	added isVec3NaN and isQuatNaN functions	2016-01-22 11:13:55 -08:00
Seth Alves	6294939095	missed one	2016-01-22 10:37:11 -08:00
Seth Alves	6b15beb88a	use isNaN rather than a self-comparison	2016-01-22 10:36:21 -08:00
Seth Alves	451464cb47	check values in location updates for NaN before using them	2016-01-22 09:41:46 -08:00
Brad Hefta-Gaub	7bfe2730e8	Merge pull request #6849 from jherico/atmosphere Remove old atmosphere rendering	2016-01-21 17:58:59 -08:00
Brad Hefta-Gaub	094e41c993	Merge pull request #6888 from Atlante45/fix/wifi-ping-spikes Fix wifi ping spikes	2016-01-21 17:07:38 -08:00
Anthony J. Thibault	a91c181a89	MyAvatar: Recenter when the head turns away from the hips Compute HMD facing moving average. When the moving average diverges from the hips by more then 45 degrees, recenter the body. Also, the follow code has been changed, instead of a follow velocity being passed to the CharacterController a desired target is passed. The CharacterController homes toward it's target based on the time remaining. Any follow deltas applied to move the avatar's position closer to it's target is stored and re-applied to the bodySensorMatrix. This centralizes the moving/homing code to one place, the CharacterContoller. A new FollowHelper class was also introduced, it groups together the data and logic necessary to perform the re-centering/follow procedure. This "hopefully" makes it easier to maintain.	2016-01-21 16:38:42 -08:00
Brad Davis	47a1c16430	Resolving warnings	2016-01-21 15:15:18 -08:00
Brad Davis	f9f9ddd8bd	Yet more atmosphere removal	2016-01-21 15:15:17 -08:00
Atlante45	db18d188b8	Fix wifi ping spikes Moves the setting of Qt's bearer poll timeout earlier to be sure it's caught.	2016-01-21 15:05:32 -08:00
Leonardo Murillo	7e19110dd5	Merge pull request #6887 from birarda/migrate-ds-old-dev migrate domain-server config from single org name	2016-01-21 16:24:02 -06:00
Stephen Birarda	aa2e55a5a0	handle weird nested path on windows	2016-01-21 14:03:45 -08:00
Stephen Birarda	cddb8cd3f0	migrate domain-server config from single org name	2016-01-21 13:57:24 -08:00
Leonardo Murillo	098b7a4ff3	Merge pull request #6870 from birarda/console Your Stack Manager is now a Server Console	2016-01-21 14:31:34 -06:00
Andrew Meadows	58a7528b68	Merge pull request #6854 from sethalves/access-avatar-parent-id-from-js Access avatar parent information from js	2016-01-21 09:19:40 -08:00
samcake	0da4df93b8	Merge pull request #6860 from zzmp/refactor/cull-functor Refactor ShouldRenderFunctor to be out of RenderArgs Tested on windows, checking the values returned by the culling/visible/too small Looks good	2016-01-20 14:25:42 -08:00
Andrew Meadows	19d24293e1	Merge pull request #6855 from sethalves/clean-up-entities-with-bad-parent don't persist entites with invalid parentIDs	2016-01-20 10:38:26 -08:00
Andrew Meadows	a92c512c17	move collision group/mask calculus into EntityItem	2016-01-19 19:52:08 -08:00
Stephen Birarda	8bc063e758	Merge branch 'master' of https://github.com/highfidelity/hifi into console	2016-01-19 16:21:19 -08:00
Seth Alves	09dd3e2a56	merge from upstream, respond to code review	2016-01-19 14:38:22 -08:00
Stephen Birarda	74b2a44050	merge the master and user configs after a settings change	2016-01-19 13:08:34 -08:00
Stephen Birarda	4cbbd24c7e	complete handling of immediate temp name grab	2016-01-19 13:04:05 -08:00
Stephen Birarda	858adf383e	update comment for config migration	2016-01-19 11:38:31 -08:00
Stephen Birarda	483e0f419b	use mkpath to create new data directory	2016-01-19 11:37:49 -08:00
Stephen Birarda	74806d9d2b	migrate old DS config file to new path	2016-01-19 11:28:29 -08:00
Zach Pomerantz	568ae2e7bc	Move ShoudRenderFunctor to render::CullFunctor	2016-01-19 11:24:11 -08:00
Ryan Huffman	de36f3eeb2	Update ServerPathUtils::getDataDirectory to use custom path lookup	2016-01-19 10:54:38 -08:00
Brad Hefta-Gaub	e15c7f089e	Merge pull request #6850 from sethalves/various-fixes Various fixes	2016-01-19 10:15:46 -08:00
Seth Alves	e365d93ed9	don't save entites with invalid parentIDs (or with IDs that indicates an avatar) to the persist file	2016-01-18 16:50:26 -08:00
Seth Alves	3b3720781f	fix a place where parent's scale wasn't properly squashed	2016-01-18 11:15:53 -08:00
Ryan Huffman	0f2b9744d1	Merge branch 'console' of github.com:birarda/hifi into console-logging	2016-01-15 10:46:22 -08:00
Ryan Huffman	a43b9ba2c3	Add ServerPathUtils	2016-01-14 12:55:32 -08:00
Zach Pomerantz	2938829167	Add shadow items to stats	2016-01-13 17:49:37 -08:00
Andrew Meadows	c52c543ab8	use strings for JS collisionGroup API	2016-01-12 15:11:27 -08:00
Andrew Meadows	6c49d81475	collision mask bit reinterpretation also cache sessionID in static methods inside PhysicsEngine	2016-01-12 15:08:52 -08:00
Andrew Meadows	502921e877	more consistency for collision group values	2016-01-12 15:08:52 -08:00
Andrew Meadows	e1ba4ff0a8	add CollisionMask entity property	2016-01-12 15:08:52 -08:00
Zach Pomerantz	801dde7950	Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape	2016-01-11 16:38:04 -08:00
Anthony J. Thibault	e4e4cb0110	Bug fix for Transform.postMult() with non-uniform scale. Previously it would not flag the matrix as non-uniform, this would cause some operations (such as inverse) to be incorrect.	2016-01-11 12:03:44 -08:00
Zach Pomerantz	c8d3342aca	Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape	2016-01-08 17:04:02 -08:00
Philip Rosedale	d5c8689843	Merge pull request #6793 from sethalves/fix-get-query-aabox fix queryAABox bug	2016-01-08 09:49:27 -08:00
Seth Alves	31bed934fe	fix bug caused by accidental reuse of variable -- queryAABox was often of size 1 rather than the correct dimensions	2016-01-07 16:27:14 -08:00
Andrew Meadows	6a642bdcf8	fix misusage of smart-pointers	2016-01-07 10:19:46 -08:00
Andrew Meadows	6eb177091b	overhaul of MotionState cleanup Moved MotionState deletes out of PhysicsEngine. EntityMotionStates are deleted by the PhysicsEntitySimulation. AvatarMotionStates are deleted in the Avatar dtor.	2016-01-07 10:19:46 -08:00
Zach Pomerantz	59a354ea8c	Change payload interface to return ShapeKey, not MaterialKey	2016-01-05 17:20:08 -08:00
Seth Alves	b59934573a	Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints	2016-01-05 13:50:12 -08:00
Brad Hefta-Gaub	c2f2f950fb	Merge pull request #6673 from hyperlogic/tony/get-palm-thread-safe Make Avatar palm position/rotation accessors thread safe	2016-01-05 13:07:47 -08:00
Seth Alves	942e77166e	merge from upstream	2016-01-05 11:11:19 -08:00
Anthony J. Thibault	a21b604746	Simplified implementation of ThreadSafeValueCache	2016-01-05 11:08:08 -08:00
Anthony J. Thibault	9ea6079c64	Merge branch 'master' into tony/get-palm-thread-safe	2016-01-05 10:16:52 -08:00
Seth Alves	96f506a98d	code review	2016-01-05 07:27:27 -08:00
Seth Alves	ce1b8ae6f0	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2016-01-04 19:35:36 -08:00
Seth Alves	afc1757adf	Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints	2016-01-04 19:17:45 -08:00
Seth Alves	7f2e0cd103	expose a way to set translation and rotation of all model joints at once	2016-01-04 14:13:08 -08:00
Howard Stearns	9c8a04ce1e	Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits	2016-01-04 09:26:14 -08:00
Seth Alves	63293d5838	remove commented code	2016-01-03 08:07:31 -08:00
Seth Alves	bfa8cc1969	merge from upstream	2016-01-03 06:47:25 -08:00
Seth Alves	fe0a656d54	Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints	2015-12-30 12:45:32 -08:00
Andrew Meadows	ec27c75332	Merge pull request #6660 from hyperlogic/tony/anim-expressions AnimExpression: boolean expression parser and evaluator	2015-12-30 08:36:44 -08:00
Anthony J. Thibault	feb63772f3	ThreadSafeValueCache added class and method descriptions Also, changed callback prototype.	2015-12-29 17:08:17 -08:00
Anthony J. Thibault	17e6a04aa8	Renamed ThreadSafeValue to ThreadSafeValueCache Also bug fixes where I was incorrectly swapping left and right hands.	2015-12-29 16:35:31 -08:00
Anthony J. Thibault	e7f3f549a5	Avatar getPalm* methods are thread-safe and non-blocking Uses newly added ThreadSafeValue template class.	2015-12-29 15:10:38 -08:00
Zach Pomerantz	687eef37da	Move final blit into RenderDeferredTask - Also changes color buffer clearing, such that anything run through Blit will now clear BUFFER_COLOR0 to 0,0,1,0. - Blit will always be added to RenderDeferredTask, but will only run if renderArgs._blitFramebuffer is set.	2015-12-23 18:21:08 -08:00
Seth Alves	83f60d6e97	make entity properties for model-entity joint-states	2015-12-23 15:43:50 -08:00
Seth Alves	84bcfb7d71	hook up a way for scripts to set model-entity joint state	2015-12-22 17:43:01 -08:00
samcake	f9070ee989	Cleanup cruft in the shaders, glowIntensity and alphaThreshold not needed anymore	2015-12-22 12:41:31 -08:00
Seth Alves	c84fa5f821	cleanups	2015-12-21 14:45:18 -08:00
Seth Alves	68cfda1af9	try again on AACube::operator +=	2015-12-21 11:34:53 -08:00
Seth Alves	00e0b26f05	fix thinko and whitespace	2015-12-21 11:15:54 -08:00
Seth Alves	3c2dac5cf8	parent query-cube should encompass child query-cube not child max-aa-cube	2015-12-21 11:05:07 -08:00
Seth Alves	abaa329984	parents AACube should encompass all children's	2015-12-21 10:55:07 -08:00
Seth Alves	3782c21b45	when a parent moves, check children vs their queryAACubes	2015-12-18 16:06:51 -08:00
Seth Alves	69bba4a182	queryAABox wasn't centered on object	2015-12-18 14:46:24 -08:00
Seth Alves	1a534ff645	Merge branch 'hdr' of github.com:samcake/hifi into near-grab-via-parenting	2015-12-18 13:43:33 -08:00
Seth Alves	688448fe41	more queryAABox experimenting	2015-12-17 16:18:41 -08:00
Seth Alves	2dd2a49141	a non-set queryAACube is one with no volume	2015-12-17 15:02:07 -08:00
Seth Alves	473212e5b7	try to be more coherent about queryAABox meaning	2015-12-17 14:29:41 -08:00
Seth Alves	7693058e39	clear _queryAACubeSet flag in locationChanged	2015-12-17 10:49:24 -08:00
samcake	d8a71db929	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-17 10:11:03 -08:00
Seth Alves	d34e166b48	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-17 07:31:52 -08:00
Howard Stearns	da27cacdec	Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits	2015-12-16 20:56:33 -08:00
samcake	7bc815448e	The material colors for diffuse and emissive are now gamma corrected by default	2015-12-16 18:14:43 -08:00
howard-stearns	e058057e3d	fix logging	2015-12-16 15:41:23 -08:00
Atlante45	a541fdd2df	Move OctreeSendThread to the OctreeServer	2015-12-16 14:27:26 -08:00
Atlante45	562d9ac2de	Forward QThread's finished signal in GenericThread	2015-12-16 14:27:26 -08:00
Seth Alves	1c0231c416	quiet some debugging prints	2015-12-15 16:46:16 -08:00
Seth Alves	b9f0a87a25	if a server can't get the queryAACube but received one from an interface, use the received one	2015-12-15 14:43:14 -08:00
Anthony J. Thibault	2b0ed55077	Merge branch 'master' into tony/anim-expressions	2015-12-15 10:35:19 -08:00
Seth Alves	165c41d843	add a way to remember which entities couldn't be properly placed in octree due to missing parents	2015-12-14 14:19:19 -08:00
Seth Alves	008065ba38	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-14 09:15:56 -08:00
Seth Alves	c74f8bca49	location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent	2015-12-14 09:13:36 -08:00
Seth Alves	f3acec5177	whitespace	2015-12-13 06:44:15 -08:00
Seth Alves	1492fd6090	merge from upstream	2015-12-12 12:37:57 -08:00
Seth Alves	24fb43e8cd	first steps toward a puffed-out query-box for child entities	2015-12-12 12:33:14 -08:00
Atlante45	d3224bfde3	More warning fixes	2015-12-11 16:03:44 -08:00
Atlante45	ce51350b65	Fix warnings on windows 64bit	2015-12-11 15:42:15 -08:00
Seth Alves	6c033d9603	call locationChanged when receiving changing avatar joints over the network. RenderableModelEntityItem uses locationChanged to relay updates to _model	2015-12-11 11:35:42 -08:00
Bradley Austin Davis	ae1345bb13	Adding nsight instrumenting to the QML render thread	2015-12-11 11:00:33 -08:00
samcake	40bf721ac5	Fixing merging problem	2015-12-10 17:16:06 -08:00
samcake	3728a9c6f0	Merging with Master	2015-12-10 16:55:30 -08:00
Howard Stearns	f6cd04680d	Merge pull request #6618 from hyperlogic/tony/sixense-debug-draw-fix Fix for sixense debug draw after migration to plugin.	2015-12-10 16:14:43 -08:00
Anthony J. Thibault	1af780a664	Fix for sixense debug draw after move to plugin. static variables used to hold a Singleton cannot be shared across dll boundaries by default. This uses the globalInstance template to store the instance as a property on the QApplication.	2015-12-10 15:05:27 -08:00
samcake	5805cc8f2b	Adding the AABox transform features (from Extents) adn introducing a simple MeshPartPayload to render simple geometry	2015-12-10 14:59:04 -08:00
Atlante45	03ee07c8b7	Merge branch 'master' of https://github.com/highfidelity/hifi into particle	2015-12-10 13:37:20 -08:00
Seth Alves	8ca6c7acc3	Merge pull request #6611 from Atlante45/attachments Fix Attachments jitter	2015-12-10 11:46:19 -08:00
Atlante45	6f29d9e7b8	Use strongly typed enum instead of nested alias	2015-12-10 11:10:09 -08:00
Atlante45	1d513cfbba	Merge branch 'master' of https://github.com/highfidelity/hifi into particle	2015-12-09 15:09:19 -08:00
howard-stearns	32e4967ee0	cleanup	2015-12-08 16:38:05 -08:00
howard-stearns	7afc803fb5	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc	2015-12-08 15:30:48 -08:00
howard-stearns	9512c3f73d	Debugging. Please enter the commit message for your changes. Lines starting	2015-12-07 16:58:59 -08:00
howard-stearns	55cfd1c8b4	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc	2015-12-07 15:49:47 -08:00
Seth Alves	982e986f1a	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-12-07 14:31:18 -08:00
Seth Alves	f99812a903	adjust method names to fit convention	2015-12-07 14:31:08 -08:00
Howard Stearns	df413c0b14	Temporary debugging aids.	2015-12-07 09:31:06 -08:00
Seth Alves	96e9580473	change some more parameters back to being pass-by-reference, where it's safe	2015-12-07 05:30:19 -08:00
Seth Alves	fff4e3e831	make SpatiallyNestable setters take values by reference	2015-12-06 12:01:30 -08:00
Seth Alves	a948ae5f19	children of avatar joints might be right, now	2015-12-06 10:48:00 -08:00
Seth Alves	edc312199d	rename a method to match convention in https://docs.google.com/document/d/1LFCmkK26JMVs8Ci33L4Yrle6lL7UU7oxthsWfddzZXQ/edit#	2015-12-06 06:16:47 -08:00
Atlante45	1d498af76e	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-12-04 15:18:25 -08:00
Seth Alves	ea65ef964f	fix an AC race/crash	2015-12-04 11:13:36 -08:00
Brad Hefta-Gaub	d9a1563396	Merge pull request #6152 from sethalves/parents Parents	2015-12-04 10:26:57 -08:00
Brad Hefta-Gaub	f472b515c3	remove wantsColor support since its always true and required for entities	2015-12-03 21:03:32 -08:00
Brad Hefta-Gaub	5a75a17174	Revert "Cruft removal"	2015-12-03 17:40:41 -08:00
Clément Brisset	fa52b97f61	Merge pull request #6538 from ZappoMan/cruftRemoval Cruft removal	2015-12-03 17:03:04 -08:00
Atlante45	bd23a4137e	Move toGlm to GLMHelpers	2015-12-03 15:01:17 -08:00
Seth Alves	e5b1cfa920	fix windows build	2015-12-03 11:15:04 -08:00
Brad Hefta-Gaub	849a8707d2	remove wantsColor support since its always true and required for entities	2015-12-03 11:11:15 -08:00
Seth Alves	4e74c98ae7	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-12-03 11:00:13 -08:00
Seth Alves	6f79b381f9	working toward making children of avatar joints work	2015-12-03 11:00:06 -08:00
Anthony J. Thibault	710ce7e639	Merge branch 'master' into tony/anim-expressions	2015-12-03 09:56:28 -08:00
Seth Alves	2d804555de	minor cleanups	2015-12-03 08:59:15 -08:00
Anthony J. Thibault	b56cf58e33	Fix for mirrored transforms in FBX models extractScale will now return negative scale for left-handed matrices.	2015-12-02 16:55:04 -08:00
Anthony J. Thibault	9c0b4bc2a2	Fix for model entities with non-uniform scaled mesh Logic which extracted rotations from a non-uniformly scaled matrices was sometimes incorrect. This should fix the roads in Qbit as well as the blocks in toybox.	2015-12-02 14:09:47 -08:00
Atlante45	083205916f	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-30 18:25:53 -08:00
Seth Alves	b7ebe5b92b	merge from upstream	2015-11-30 16:59:52 -08:00
Seth Alves	9b54924524	edit.js can now manipulate children without flipping the table	2015-11-30 16:21:14 -08:00
Stephen Birarda	4573e5c59e	resolve conflicts on merge with upstream/master	2015-11-30 13:32:38 -08:00
Seth Alves	941dfe5bd2	initialize _parentJointIndex	2015-11-30 13:30:47 -08:00
Seth Alves	4b87e09848	clean up some unneeded consts. get edit.js closer to working on parented entities	2015-11-30 13:23:55 -08:00
Seth Alves	4add3e2e91	rework worldToLocal, start on allowing scripts entity position/rotation to always be in world space	2015-11-30 09:41:15 -08:00
Seth Alves	cf39cac7fc	attempt to make SpatiallyNestable data access thread-safe	2015-11-29 12:50:33 -08:00
Seth Alves	204c3d839e	added localToWorld calls, put locks around access to _children hashtable	2015-11-29 10:17:21 -08:00
Seth Alves	ca75802b9c	unmangle merge	2015-11-26 06:43:28 -08:00
Anthony J. Thibault	23def8d173	Merge branch 'master' into tony/remove-joint-states	2015-11-25 13:55:23 -08:00
Andrew Meadows	bc20b72645	Merge pull request #6453 from howard-stearns/avatar-render-controller2 Survive Flash Mobs Without Making Everyone Sick	2015-11-25 09:52:28 -08:00
Anthony J. Thibault	f120e10ff4	Merge branch 'master' into tony/remove-joint-states	2015-11-24 15:00:05 -08:00
Atlante45	40e802bae7	Get rid of global variable for sort Fix rhs/lhs	2015-11-24 11:51:56 -08:00
Atlante45	9320623ff5	Add AABox functionalities	2015-11-24 11:51:56 -08:00
Brad Davis	bc84265e99	Additional checking when serializing transforms to json	2015-11-23 22:35:12 -08:00
Anthony J. Thibault	14189ac909	Move Y_180 flip rotation out of Rig This Y_180 flip is defined in skeletonModel not in the rig. This is important if we wish to use the Rig for both Avatars (180 flip) and Entity models (no 180 flip). We can hide this 180 flip from script, if we wish, by including it in all the accessors to and from MyAvatar -> skeletalModel -> Rig. Added Quaternions::Y_180 to GLMHelpers.	2015-11-23 19:31:27 -08:00
Howard Stearns	c94a5389a0	comments	2015-11-23 10:31:37 -08:00
Anthony J. Thibault	821264a031	Merge branch 'master' of github.com:highfidelity/hifi into tony/remove-joint-states	2015-11-22 16:15:03 -08:00
Seth Alves	a0c1f9a1f9	progress toward having things be children of specific joints rather than just of other objects	2015-11-22 13:11:37 -08:00
Seth Alves	f013f95e9b	merge from upstream	2015-11-21 08:43:00 -08:00
Seth Alves	0b1fa4f60f	add interface for getters for specific joints	2015-11-21 08:21:10 -08:00
Anthony J. Thibault	54408a9c87	AnimVars are now in avatar/rig space This makes it much simpler for code out side of the rig to manipulate AnimVars * Removed mat4 type from AnimVars * AnimVariantMap now has a _rigToGeometryTransform matrix used to transform positions and rotations into the correct coordinate frame. * Moved AnimPose code to extract a quat from a scaled matrix into GLMHelpers	2015-11-20 18:29:17 -08:00
howard-stearns	1ddcc62db9	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-render-controller2	2015-11-20 14:05:40 -08:00
howard-stearns	6c784256cb	final(?) cleanup	2015-11-20 13:51:12 -08:00
Anthony J. Thibault	ad4b8e0001	Avatar transmission fixes, moved JointData into shared * Moved JointData into shared library * added methods to the rig to copy into and out of JointData * JointData translations must be in meters this is so the fixed point compression wont overflow, also, it's a consistent wire format.	2015-11-20 10:24:24 -08:00
Howard Stearns	0f6a37f0f7	remainder->fmod!	2015-11-20 09:49:14 -08:00
Howard Stearns	431a8c9584	cleanup	2015-11-19 17:12:50 -08:00
Howard Stearns	f6286201f4	cleanup	2015-11-19 11:55:22 -08:00
Howard Stearns	7d30cd0159	checkpoint: it works!	2015-11-19 09:18:40 -08:00
Brad Davis	98cc7408b1	Fixing issues found in AC playback test	2015-11-18 17:17:20 -08:00
howard-stearns	42a1ee353e	checkpoint	2015-11-18 14:09:33 -08:00
Howard Stearns	97898a1ad1	forgot new files	2015-11-17 20:43:40 -08:00
Brad Hefta-Gaub	e7a8df306c	fix warnings	2015-11-17 11:18:36 -08:00
Stephen Birarda	789290f540	Merge pull request #6370 from Atlante45/locker QTryRead/WriteLocker	2015-11-16 10:22:45 -08:00
Stephen Birarda	e263453acb	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-13 14:48:26 -08:00
Seth Alves	a78b1619be	Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug	2015-11-12 14:20:23 -08:00
Brad Hefta-Gaub	66a2b38f50	switch various status to use thread safe atomics	2015-11-12 13:09:51 -08:00
samcake	da8270d50b	Merge pull request #6377 from jherico/rec3 Cleaning up clip and transform	2015-11-12 11:50:10 -08:00
Brad Davis	ee1545f649	Cleaning up clip and transform	2015-11-12 11:48:47 -08:00
Stephen Birarda	ef778c554c	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-12 10:40:51 -08:00
Seth Alves	3519dd248b	Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug	2015-11-12 09:53:11 -08:00
James B. Pollack	39f44115be	Merge pull request #6373 from Atlante45/rotationBetween Rotation between	2015-11-12 09:25:56 -08:00
Brad Davis	f521be10fe	Avatar recording work in progress	2015-11-12 00:33:38 -08:00
Atlante45	118d05d824	Use a clearer function	2015-11-11 17:24:50 -08:00
Atlante45	115b63a117	Simplify rotationBetween	2015-11-11 15:54:48 -08:00
Atlante45	65e9dc4be5	Fixup return types	2015-11-10 18:39:59 -08:00
Atlante45	d5c44466c4	Take Callables with rvalue ref	2015-11-10 18:27:14 -08:00
Atlante45	4d8fa58dd3	Coding standard	2015-11-10 18:23:23 -08:00
Atlante45	7cf2ad2215	Remove lockFor... and expand ReadWriteLockable	2015-11-10 18:19:12 -08:00
Atlante45	3557eacbd0	Add QTryRead/WriteLocker classes	2015-11-10 18:18:29 -08:00
Seth Alves	b9ca509f07	Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup	2015-11-10 09:50:12 -08:00
Seth Alves	d535109caf	attempt to fix render-collision hull feature	2015-11-10 09:49:31 -08:00
Atlante45	6a53021818	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-09 13:23:31 -08:00
Brad Davis	6122fa145d	More PR feedback	2015-11-06 17:17:26 -08:00
Brad Davis	37a9538f10	PR feedback, ensure destruction of shared objects	2015-11-06 16:57:31 -08:00
Brad Davis	11733c039f	Allow shared libraries to access core global objects	2015-11-06 16:57:31 -08:00
Anthony J. Thibault	04d8a598da	First step toward evaluation * added OpCodes * added first parser rules * removed mat4 support from AnimVariantMap	2015-11-04 16:56:34 -08:00
Seth Alves	4ab727c47c	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-11-04 13:57:59 -08:00
Atlante45	d9cd986db2	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-04 11:26:16 -08:00
$U-GAPOS\andrew$ U-GAPOS\andrew	f260c6b12b	fix bad time measurment in AtRestDetector	2015-11-04 10:47:39 -08:00
Seth Alves	9b3708ea66	use parentChanged to recalculate entity bounding boxes	2015-11-04 09:27:57 -08:00
Seth Alves	60824a1fb0	back out some off-brand changes. add parentChanged call	2015-11-03 16:07:28 -08:00
Seth Alves	dba9eb7046	merge from upstream	2015-11-03 13:35:17 -08:00
Ryan Huffman	6151e6125a	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-02 13:39:08 -08:00
Ryan Huffman	f4531759be	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-02 12:27:08 -08:00
Anthony J. Thibault	2236573a9d	Merge branch 'master' into tony/anim-sync-blend	2015-11-02 12:18:11 -08:00
Andrew Meadows	9799693135	remove extra whitespace	2015-11-02 11:07:41 -08:00
Andrew Meadows	fd557c4e52	route HMD-following through the physics simulation	2015-11-02 11:07:40 -08:00
Anthony J. Thibault	e3e759248f	Merge branch 'master' into tony/anim-sync-blend	2015-11-02 08:37:10 -08:00
Seth Alves	3ac0fef1ea	merge from upstream	2015-11-01 15:22:57 -08:00
Anthony J. Thibault	2eb62f2fd8	LogHandler: fix for linux build	2015-10-30 17:44:06 -07:00
Anthony J. Thibault	f50e1a0977	Fix for rare crash in LogHandler::flushRepeatedMessages() This can happen when LogHandler::flushRepetedMessages is called on the main thread, while the application is printing messages on a separate thread. The access to the _lastRepeatedMessage QHash was not guarded. I've added two mutexes to guard access to both the repeatedMessage hashes/regexes and the onlyOnceMessages/regexes. This will unfortunately incur a performance hit for frequent debug logging, but that's better then crashing. Also, I've added the ability to print threadIDs as well as Process ids. This is helpful when debugging multi-threaded access to shared variables.	2015-10-30 17:18:37 -07:00
Atlante45	bc552c772b	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-10-30 14:05:40 -07:00
Clément Brisset	d2c17bfdd4	DO NOT MERGE	2015-10-30 12:51:30 -07:00
Brad Hefta-Gaub	1f53e425eb	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-10-29 12:28:28 -07:00
Anthony J. Thibault	f7b6fab0c3	Merge branch 'master' into tony/anim-sync-blend	2015-10-29 11:35:48 -07:00
Brad Davis	ccbae81dad	Merge branch 'master' into HEAD Conflicts: interface/src/avatar/SkeletonModel.cpp	2015-10-29 10:24:38 -07:00
samcake	e4aab4bd97	Merge branch 'master' of https://github.com/highfidelity/hifi into color	2015-10-28 15:32:13 -07:00
Brad Hefta-Gaub	61e35d7ada	Merge pull request #6203 from sethalves/fix-action-crash adjust locking in EntityItem::getActionDataInternal	2015-10-28 14:02:28 -07:00
Seth Alves	22d6b6df34	make withWriteLock and withTryWriteLock const	2015-10-28 13:49:52 -07:00
Brad Davis	3c1a0930da	Merge remote-tracking branch 'upstream/master' into HEAD Conflicts: interface/src/avatar/MyAvatar.h libraries/script-engine/src/ScriptEngine.cpp libraries/script-engine/src/ScriptEngine.h	2015-10-28 13:38:22 -07:00
Brad Hefta-Gaub	731fab6ffc	Merge pull request #6196 from jherico/gl Move GL utilities to their own library	2015-10-28 12:10:52 -07:00
Brad Davis	5cbb2562cd	Move GL utilities out to their own library	2015-10-27 15:53:42 -07:00
Atlante45	c8c9118d4d	Improve script engine error logging + some cleanup	2015-10-27 12:11:27 -07:00
samcake	990764d855	Really fixing the MovingAverage class...	2015-10-26 13:29:13 -07:00
samcake	8e2c269cc0	doing the correct conversion for byte to normalize float...	2015-10-26 12:24:20 -07:00
samcake	a8872d065b	MOve the movingAverage class to shared next to SimpleMovingAverage	2015-10-26 11:23:13 -07:00
samcake	ff57b73bd6	Creating the COlorUTils in shared to deal with all the standard color conversions	2015-10-26 10:53:21 -07:00
Seth Alves	f3c61a823e	try harder to get children flags right when something moves. added worldToLocal methods	2015-10-23 16:58:09 -07:00
Seth Alves	61269c3ce8	fix up entity constructors so that setProperties isn't called during the constructor	2015-10-23 13:52:50 -07:00
Seth Alves	22af5b27ab	avoid shared_from_this while constructing	2015-10-23 12:55:48 -07:00
Seth Alves	7f6ac0207d	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-10-22 19:35:27 -07:00
Seth Alves	7b08d047b1	when EntityTree::updateEntityWithElement is called on an entity, call it on all the children of that entity	2015-10-22 16:59:56 -07:00
Seth Alves	d86d69aeba	keep track of children. use local position and orientation on the wire.	2015-10-22 15:36:03 -07:00
Seth Alves	f6fe503c51	pass avatar parent information through avatar-mixer	2015-10-22 13:44:04 -07:00
Seth Alves	778dc8dc15	add parentID and parentJointIndex EntityItemProperties	2015-10-22 11:52:56 -07:00
Anthony J. Thibault	a9ed033b20	Merge branch 'master' into tony/anim-sync-blend	2015-10-22 11:18:30 -07:00
Seth Alves	264b658132	hook up entities and avatars to SpatialParentFinder	2015-10-22 11:05:48 -07:00
Brad Hefta-Gaub	856af8c764	fix EntityItemID dependency	2015-10-21 14:33:12 -07:00
Brad Hefta-Gaub	ffd277d4d5	fix EntityItemID dependency	2015-10-21 14:31:17 -07:00
Brad Davis	21a3079a39	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-21 10:05:32 -07:00
Seth Alves	7d8dca4edb	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-10-21 09:55:21 -07:00
Anthony J. Thibault	5cd2786c1d	First pass at Rig timeScaling and blending between slow, walk and run.	2015-10-20 16:37:05 -07:00
Brad Davis	eacd6af032	Get conditional routes working	2015-10-20 16:32:00 -07:00
ericrius1	0373a481f8	Using EntityItemIDs instead of QUuids	2015-10-20 09:22:16 -07:00
Seth Alves	37923e81bb	make SpatiallyNestable::_transform private	2015-10-18 08:18:10 -07:00
Seth Alves	7977f4640d	new class: SpatiallyNestable	2015-10-18 07:27:22 -07:00
Brad Davis	57be59935d	Move controller test to app	2015-10-17 19:13:38 -07:00
Brad Davis	5bac1aae2d	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-16 17:23:30 -07:00
David Rowe	8c22db17cc	Fix reading of QVector<float> from models files - polyline strokeWidths	2015-10-16 15:43:23 -07:00
ericrius1	47c3df7587	Cleaned up spacing	2015-10-12 17:38:52 -07:00
ericrius1	f93b1d3325	Correctly whitelisting entities for ray picking	2015-10-12 17:05:34 -07:00
Brad Davis	80c95cd8eb	Fixing access to second based timestamp	2015-10-10 16:07:26 -07:00
Brad Davis	9e4a7a6226	Working on controller refactoring	2015-10-10 03:05:42 -07:00
Anthony J. Thibault	b5ba621f78	Merge branch 'master' into tony/hmd-rest-detection	2015-10-09 14:36:18 -07:00
Andrew Meadows	7a918eb288	fix variable names in header	2015-10-07 15:25:07 -07:00
Andrew Meadows	464ef2293d	more descriptive variable names	2015-10-07 14:19:15 -07:00
Andrew Meadows	0680be0422	save sixense settings and some UI cleanup	2015-10-07 14:19:15 -07:00
Anthony J. Thibault	2dabe69341	When HMD is at rest, re-center the body under the avatar. This should help the case when a user avatar is stuck in an uncomfortable pose for a long period of time. If they stop moving their head, the body should recenter itself and appear more natural. Added an AtRestDetector class. That tracks the average and variance of both position and rotation (quaternion logarithms), then detects when the variance falls under a threshold. Also, renamed variables with the straighting prefix to straightening.	2015-10-06 20:37:51 -07:00
Thijs Wenker	f6afb4cb02	Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation Conflicts: interface/src/scripting/HMDScriptingInterface.h	2015-10-06 19:56:22 +02:00
Atlante45	598aab884e	Make log more readable	2015-10-05 14:59:28 -07:00
Anthony J. Thibault	fc7b6dee84	Merge branch 'master' into transmit-joint-translation	2015-10-02 11:40:33 -07:00
Andrew Meadows	50b2c8ae37	remove warnings in linux	2015-10-02 09:39:34 -07:00
Howard Stearns	53e7d5fd7c	Merge pull request #5975 from AndrewMeadows/cleanup-legacy-constraints remove cruft relating to old verlet avatar skeleton simulation	2015-10-01 16:48:33 -07:00
David Rowe	e56d2d9b43	Add asserts	2015-10-01 15:48:37 -07:00
Andrew Meadows	09ac01a5e7	remove cruft from old verlet avatar simulation	2015-10-01 13:44:50 -07:00
David Rowe	c56ac24602	Improve particle property interpolation Use Bezier interpolation instead of cubic so that values don't overshoot.	2015-09-30 11:37:22 -07:00
Seth Alves	d0a1e206ca	Merge branch 'master' of github.com:highfidelity/hifi into transmit-joint-translation	2015-09-29 13:55:13 -07:00
Seth Alves	ddeed8b4ee	code review	2015-09-29 06:51:24 -07:00
Brad Hefta-Gaub	3e758f3c6b	fix Triangle::getNormal, add normal display to rayPickExample	2015-09-28 09:05:39 -07:00
Brad Hefta-Gaub	ce3da099f6	normalize the surface normal from the triangle, coding standard fix, update example	2015-09-28 08:30:49 -07:00
Brad Hefta-Gaub	430cbcca7e	first cut at adding surface normals to ray intersection	2015-09-27 21:57:50 -07:00
Seth Alves	50dd8eba45	Relay joint translations across network. Apply animation's root-joint translation to avatar.	2015-09-26 11:40:39 -07:00
David Rowe	d063f3488d	Back out fromSpherical code addition	2015-09-24 19:14:26 -07:00
Brad Hefta-Gaub	ba73acf3b4	Merge pull request #5843 from ctrlaltdavid/20681 Replace point and vector particle emitter with spheroid emitter	2015-09-24 08:19:49 -07:00
Brad Hefta-Gaub	d14820d3ef	Merge pull request #5880 from thoys/20668 Worklist job #20668 - JS: Add option to listen audio from camera	2015-09-23 20:40:32 -07:00
Anthony J. Thibault	a9848cd157	Merge branch 'master' into tony/lean-threshold	2015-09-23 10:54:12 -07:00
David Rowe	eb01ba9812	Merge branch 'master' into 20681	2015-09-23 09:42:56 -07:00
Brad Hefta-Gaub	02e1de3ba3	more warnings fixes	2015-09-22 21:35:13 -07:00
Brad Hefta-Gaub	9436d2922f	more warnings fixes	2015-09-22 21:18:04 -07:00
Anthony J. Thibault	d04f4d4b2b	Added shared DebugDraw singleton.	2015-09-22 19:57:23 -07:00
Thijs Wenker	617f048883	Added JS interface to change audio listening position / orientation in Interface - MyAvatar.audioListenerMode change using: MyAvatar.FROM_HEAD , MyAvatar.FROM_CAMERA , MyAvatar.CUSTOM - MyAvatar.customListenPosition and MyAvatar.customListenOrientation are for manual listening positions	2015-09-22 13:40:33 +02:00
Brad Hefta-Gaub	dc9c774eb5	merge model part quads and triangles together to reduce the number of draw calls	2015-09-21 13:09:43 -07:00
David Rowe	812ab9b7c6	Merge branch 'master' into 20681 Conflicts: libraries/entities/src/EntityItemProperties.cpp	2015-09-18 16:44:04 -07:00
Brad Hefta-Gaub	4e2cb00ec3	first cut at only returning type specific properties in getEntityProperties	2015-09-17 17:33:53 -07:00
David Rowe	12e2cf3ce9	Emit in all directions from a point or the surface of a spheroid	2015-09-17 17:14:35 -07:00
Stephen Birarda	302fd923b8	Merge branch 'master' of https://github.com/highfidelity/hifi into phrc	2015-09-14 11:21:37 -07:00
Stephen Birarda	f7f54010f5	fixes for portable hrc class on win	2015-09-14 11:21:25 -07:00
Stephen Birarda	2737e74432	fix includes for portable hrc	2015-09-14 11:21:18 -07:00
Stephen Birarda	9b926f6f04	add an hrc with proper resolution for < VC2015	2015-09-14 11:21:08 -07:00
Seth Alves	93dc0714f7	quiet compiler	2015-09-12 10:10:53 -07:00
Seth Alves	e65ef93663	Merge pull request #5778 from jherico/homer Fixing some entity race condition crashes	2015-09-11 17:54:53 -07:00
Andrew Meadows	94b0074165	Merge pull request #5765 from ctrlaltdavid/20669-tidy Move cubic interpolation method to shared library	2015-09-11 16:58:22 -07:00
Brad Davis	9b81842850	Merge branch 'master' into homer Conflicts: assignment-client/src/octree/OctreeSendThread.cpp interface/src/Application.cpp libraries/entities-renderer/src/EntityTreeRenderer.cpp libraries/entities/src/EntityItem.cpp libraries/entities/src/EntityTree.cpp libraries/entities/src/EntityTreeElement.cpp libraries/entities/src/EntityTreeElement.h libraries/entities/src/EntityTreeHeadlessViewer.cpp libraries/entities/src/RecurseOctreeToMapOperator.cpp libraries/octree/src/Octree.h libraries/physics/src/EntityMotionState.cpp	2015-09-11 16:31:18 -07:00
Brad Davis	e458eb7ae9	Merge pull request #5734 from sethalves/octree-shared-pointers octree uses shared pointers	2015-09-11 16:00:04 -07:00
Brad Hefta-Gaub	5c6d8da97b	Revert "Make sure all entity script callbacks happen on the Entities script engine thread"	2015-09-11 11:55:36 -07:00
Brad Davis	244795b629	Merge branch 'homer' into temp Conflicts: interface/src/Application.cpp	2015-09-11 11:21:29 -07:00
Brad Davis	3bc9e8c98d	Fixing some entity race condition crashes	2015-09-10 20:43:41 -07:00
Brad Hefta-Gaub	8eacdbf1c4	first cut at making sure entity scripts are called on the entities script engine thread	2015-09-10 13:02:02 -07:00
David Rowe	016f3964ed	Fix typo	2015-09-10 10:03:27 -07:00
David Rowe	fa959c4554	Move cubic interpolation method to shared library	2015-09-10 08:53:16 -07:00
Howard Stearns	3f5744712f	Remove optional "parent" argument. GenericThread used to accept an optional "parent" argument, defaulting to nullptr. This was odd, because the moveToThread() in GenericThread::initialize() would become a no-op if the instance ever inits QObject(someNonNullParentQObject). (The only clue would be a log message "QObject::moveToThread: Cannot move objects with a parent", and things would end up in the same thread that created the instance.) As it turns out, all the subclasses of GenericThread do not init GenericThread(parent), so things worked as expected.	2015-09-09 11:04:17 -07:00
Seth Alves	9c4fdfd653	merge from upstream	2015-09-08 18:01:07 -07:00
Seth Alves	31fcd55d47	octree uses shared pointers	2015-09-08 11:59:48 -07:00
Stephen Birarda	ed19987b7d	resolve conflicts on merge with upstream/master	2015-09-04 12:31:46 -06:00
Anthony J. Thibault	df28c7bf1a	Merge branch 'master' into ajt/new-anim-system	2015-09-04 09:27:02 -07:00
Anthony J. Thibault	3716d5612b	Merge branch 'master' into ajt/new-anim-system	2015-09-03 19:20:06 -07:00
Brad Hefta-Gaub	063320771c	fix a bug in entity script includes and file based includes on windows	2015-09-03 16:37:24 -07:00
Brad Davis	8dc3905767	Add common vector constants to JS, add some missing quaternion functionality	2015-09-03 11:51:35 -07:00
Brad Davis	1f83d04423	Fix oculus crash on switching display plugin to something else	2015-09-02 18:28:43 -07:00
Brad Davis	54b7a063e2	Support HTML colors in overlays	2015-09-02 15:56:37 -07:00
Anthony J. Thibault	d151474446	Merge branch 'master' into ajt/new-anim-system	2015-09-02 10:00:36 -07:00
Stephen Birarda	33f6933544	Merge branch 'master' of https://github.com/highfidelity/hifi into protocol	2015-09-01 14:36:16 -06:00
Stephen Birarda	4824b38465	move UUID back to shared	2015-09-01 10:17:07 -06:00
Stephen Birarda	de2bfd0d0d	some QThread cleanup and fix in Socket	2015-08-31 11:30:31 -07:00
Stephen Birarda	fa0abe2972	resolve conflicts on merge with upstream/master	2015-08-31 10:51:12 -07:00
Anthony J. Thibault	54aa0677f6	Merge branch 'master' into ajt/new-anim-system	2015-08-31 10:47:50 -07:00
Brad Davis	08e4fe2dc2	Revert "Add common vector constants to JS"	2015-08-28 16:26:56 -07:00
Brad Hefta-Gaub	1e2374da87	Merge pull request #5677 from jherico/bart Add common vector constants to JS	2015-08-28 13:43:13 -07:00
Brad Davis	2aa1976b5d	Add common vector constants to JS, add some missing quaternionin functionality	2015-08-28 13:05:39 -07:00
Andrew Meadows	614fad0811	remove warnings from linux build	2015-08-27 19:12:25 -07:00
Stephen Birarda	1d6f43e0d0	cleaned up some warnings	2015-08-27 18:26:55 -07:00
Stephen Birarda	80cf7b6c76	resolve conflicts on merge with upstream/master	2015-08-27 14:50:04 -07:00
Brad Hefta-Gaub	79a9694d4a	Merge pull request #5648 from ctrlaltdavid/20663 Clean Interface.ini after a crash	2015-08-27 10:52:25 -07:00
Anthony J. Thibault	a04f356857	Merge branch 'master' into ajt/new-anim-system	2015-08-27 09:32:53 -07:00
Anthony J. Thibault	b7a9b54628	Better AnimDebugDraw rendering	2015-08-26 16:42:08 -07:00
Brad Davis	270f2f7a3b	Fixing framerate limit, moving vsync to 2d plugin	2015-08-26 15:47:45 -07:00
Anthony J. Thibault	c1333e16ed	Merge branch 'master' into ajt/new-anim-system	2015-08-26 11:59:03 -07:00
Andrew Meadows	f857ccfe16	fix Vectors::MIN	2015-08-26 11:46:50 -07:00
Anthony J. Thibault	46c1e008bc	Merge branch 'master' into ajt/new-anim-system	2015-08-26 10:37:39 -07:00
Atlante45	179ee73e26	Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol	2015-08-26 16:50:33 +02:00
Brad Davis	d311e4f2ea	Fixing problems reported by static analysis tool	2015-08-25 19:18:55 -07:00
David Rowe	a98a867b06	Delete Interface.ini.lock before accessing to check crash option	2015-08-25 11:07:20 -07:00
Brad Davis	380b0cb23c	Removing tabs from our javascript and C++	2015-08-24 15:26:46 -07:00
Anthony J. Thibault	fa5256eefd	Merge branch 'master' into ajt/new-anim-system	2015-08-24 14:32:28 -07:00
David Rowe	f6cf77ae68	Add Developer > Display Crash Options menu item Is enabled by default. Disabling it stops the display of the crash handling options dialog at start-up.	2015-08-24 13:24:31 -07:00
Stephen Birarda	fd43c48eac	resolve conflicts on merge with birarda/protocol	2015-08-18 11:48:36 -07:00
Andrew Meadows	9ee49c3e1e	Merge pull request #5551 from sethalves/quiet-compiler Quiet compiler	2015-08-18 09:54:29 -07:00
Stephen Birarda	47d1710208	remove msecTimestampNow that is not used	2015-08-17 16:39:29 -07:00
Brad Hefta-Gaub	b726769f15	Merge pull request #5402 from highfidelity/plugins New plugins architecture	2015-08-11 11:11:27 -07:00
Seth Alves	b25f6df7af	quiet compiler	2015-08-11 10:22:56 -07:00
Howard Stearns	295d655eec	Merge pull request #5545 from AndrewMeadows/chlorine rotation constraints in preparation for inverse kinematics	2015-08-11 09:19:16 -07:00
Andrew Meadows	4655bd21dd	added some comments to clarify algorithm	2015-08-10 23:08:10 -07:00
Brad Davis	19d31938d3	Merge remote-tracking branch 'upstream/master' into plugins	2015-08-10 21:25:35 -07:00
Andrew Meadows	f9a4b82edd	add swing-twist decomposition util with unit-tests	2015-08-10 14:47:15 -07:00
Brad Davis	ccc4a59992	Cleanup and PR comments	2015-08-08 13:54:37 -07:00
ericrius1	205a2d53b6	no longer returning early on NaN	2015-08-07 16:15:51 -07:00
ericrius1	3910cb0d69	Merge branch 'master' into polyLineInProgress	2015-08-07 10:12:02 -07:00
Bradley Austin Davis	7e60aee1bf	Merge branch 'master' into plugins Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/avatar/Head.cpp interface/src/avatar/MyAvatar.cpp interface/src/avatar/MyAvatar.h interface/src/avatar/SkeletonModel.cpp interface/src/avatar/SkeletonModel.h interface/src/devices/3DConnexionClient.cpp interface/src/ui/overlays/Overlays.cpp	2015-08-06 11:03:37 -07:00
Sam Gondelman	513c652ab3	merge from master and attempt to fix connexion conflicts	2015-08-05 12:42:39 -07:00
Stephen Birarda	0fe3213d38	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2015-08-05 11:16:34 -07:00
Andrew Meadows	5be8583b7d	Merge pull request #5494 from sethalves/gzip-json-entity-persist-files gzip json entity persist files	2015-08-05 10:56:03 -07:00
Atlante45	dfaa16d15c	Merge branch 'master' of https://github.com/highfidelity/hifi into protocol	2015-08-05 10:39:02 -07:00
Seth Alves	eb87023416	code review	2015-08-05 10:16:45 -07:00
Anthony J. Thibault	b8bae7cc3f	Debug rendering of MyAvatar’s skeletonModel skeleton	2015-08-04 18:14:47 -07:00
Anthony J. Thibault	f5dee717a1	Added fbx loading via animation cache. * added AnimPose::copyFromNetworkAnim() which should, re-map bone ids to match the current skeleton, and fill in missing bones with bind pose frames. * added ability to set a skeleton on a node. I might need to add a recursive version of this. * it compiles! * tests run!	2015-08-04 18:14:46 -07:00
Anthony J. Thibault	da809efcd6	WIP commit, DOES NOT BUILD. * Added AnimSkeleton class * Attempt to copy animation frames when _networkAnimation has finished loading. Fill in the holes with bind pose.	2015-08-04 18:14:46 -07:00
samcake	59b69be251	Merge pull request #5501 from jherico/lisa CORE PROFILE: Working on HMD crash on mac	2015-08-04 16:27:37 -07:00
Bradley Austin Davis	241ee00ca5	Working on HMD crash on mac	2015-08-04 15:18:01 -07:00
Seth Alves	fb9fa76018	adjust comments	2015-08-04 08:26:28 -07:00
Seth Alves	adcd91e3ff	Added an option to domain-server settings to persist entities as gzipped json. With this setting enabled, persist files take much less space on disk than with the other two options.	2015-08-04 07:23:24 -07:00
ericrius1	47bc8f50ab	cleaning	2015-08-03 08:45:14 -07:00
Stephen Birarda	d340515ab3	complete the initial version of UDTTest	2015-07-30 17:09:25 -07:00
Andrew Meadows	0a5ada3c09	remove legacy shapes	2015-07-29 09:02:24 -07:00
Andrew Meadows	ef5e7e9ccc	remove PlaneShape dependency from GeometryUtils also add unit tests for indRayRectangleIntersection()	2015-07-28 15:45:48 -07:00
Atlante45	82545df266	Added msecTimestampNow as usecTimestampNow narrowing	2015-07-23 15:01:46 -07:00
Bradley Austin Davis	1db4162371	Merge branch 'master' into plugins	2015-07-23 13:42:03 -04:00
Sam Gateau	7ac2030862	Preparing for first pr	2015-07-22 10:43:50 -07:00
Bradley Austin Davis	114ab9e47f	Merge branch 'master' into plugins	2015-07-22 11:47:56 -04:00
Brad Davis	5744200f64	Merge remote-tracking branch 'upstream/master' into plugins Conflicts: interface/CMakeLists.txt interface/src/Application.cpp interface/src/Application.h interface/src/avatar/MyAvatar.h	2015-07-20 19:21:02 -07:00
SamGondelman	a4cbb7f412	const references in glmhelpers	2015-07-20 17:30:23 -07:00
Anthony J. Thibault	80dea6831c	Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers Conflicts: interface/src/Application.cpp libraries/input-plugins/src/input-plugins/SixenseManager.cpp	2015-07-20 15:18:23 -07:00
Atlante45	8d6ff2d9f9	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 14:50:44 -07:00
Atlante45	59acfc9f47	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 13:51:51 -07:00
Stephen Birarda	0177513285	resolve conflicts on merge with upstream/master	2015-07-20 12:29:38 -07:00
Brad Davis	5159452335	Fixing invalid vector usage and strange picking crash	2015-07-19 23:03:46 -07:00
Brad Davis	c446bb307d	Adding convenience return *this to many transform methods	2015-07-18 16:56:32 -07:00
Brad Davis	d68618e206	Removing GL headers from most files, and some naked GL from application.cpp	2015-07-18 00:46:09 -07:00
Atlante45	256c786e28	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-17 17:59:19 -07:00
Stephen Birarda	f8c832e50b	resolve conflicts on merge with upstream master	2015-07-17 16:48:46 -07:00
ericrius1	a44e5f949c	Merge branch 'master' into polyLineInProgress	2015-07-17 15:01:40 -07:00
Stephen Birarda	7d2495e289	set the generic thread priority once it's actually started	2015-07-17 09:24:00 -07:00
Anthony J. Thibault	e8da4b9586	merge with plugins, needs testing	2015-07-16 18:47:39 -07:00
Brad Davis	89faf85ad9	Working on text rendering overlays	2015-07-16 15:56:01 -07:00
Atlante45	b4121eb464	Remove unnecessary move	2015-07-16 13:14:17 -07:00
Stephen Birarda	61f23f6a5e	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2015-07-16 11:56:26 -07:00
ZappoMan	5165210e11	fix Sams comment about comments	2015-07-15 16:35:20 -07:00
Stephen Birarda	05dde9d8f5	resolve conflicts on merge with upstream/master	2015-07-15 16:18:47 -07:00
ZappoMan	d1e511efcb	more naked gl cleanup, deleting dead code, tweaking comments so they don't give false positives in searching for more naked gl	2015-07-15 15:52:12 -07:00
samcake	9df26c8488	removing naked glViewport from DeferredLightingEffect by adding the current viewport in renderArgs	2015-07-15 00:24:43 -07:00
Anthony J. Thibault	dbc18ce51f	merge with plugins	2015-07-14 12:30:47 -07:00
Stephen Birarda	821c16cbc4	resolve conflicts on merge with uptream/master	2015-07-14 09:52:20 -07:00
ericrius1	0ce6737b34	merged and normals flipping	2015-07-13 09:43:15 -07:00
Seth Alves	c17c9f1818	quiet compiler	2015-07-12 10:29:43 -07:00
Atlante45	80fe090a94	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-10 20:20:03 -07:00
Brad Davis	c1b72db18d	Still trying to get jenkins builds to work	2015-07-10 16:00:51 -07:00
Brad Davis	2ce8dba819	Removing heap allocation from property flag parsing, adding some manual tests	2015-07-10 15:08:10 -07:00
Stephen Birarda	1b4e333c49	Merge pull request #3 from birarda/atp initial networking API changes for new protocol	2015-07-09 16:51:37 -04:00
Stephen Birarda	2417981c9d	resolve conflicts on merge with clement/protocol	2015-07-09 13:27:59 -07:00
Stephen Birarda	893e1864fd	cleanup _newestEntryAtIndex calc in RBH insert	2015-07-09 13:22:41 -07:00
Atlante45	c0b8f83ca0	Better ring index compute	2015-07-09 13:22:09 -07:00
Stephen Birarda	14b73ae00f	remove qtimespan that isn't used anymore	2015-07-09 12:45:32 -07:00
Brad Hefta-Gaub	489a8b4b3d	Merge pull request #5285 from jherico/homer Move log file writing to a separate thread	2015-07-09 12:22:13 -07:00
Brad Hefta-Gaub	fb07956689	Merge pull request #5284 from hyperlogic/ajt/mirror-view-fix fix for mirror rendering on windows	2015-07-09 08:38:55 -07:00
Stephen Birarda	19c5f0b67c	resolve conflicts on merge with upstream/master	2015-07-08 22:54:36 -07:00
Brad Davis	63dfd570f1	Adding priority support to GenericThread	2015-07-08 22:54:31 -07:00
Brad Davis	08d1364f81	Move file log persistence to a separate thread	2015-07-08 22:35:23 -07:00
Anthony J. Thibault	1be0e7ebc3	fix for mirror rendering on windows * added preScale to Transform class. * preScale by -1 about the xAxis instead of post scale. I think this was working on Mac due to the different code paths in GLBackendTransform::updateTransform for core vs legacy gl profile.	2015-07-08 21:33:27 -07:00
Brad Davis	f2beb79d23	Updating buffer parser to use new heapless API	2015-07-08 18:54:38 -07:00
Stephen Birarda	da3502eb6c	resolve conflicts on merge with upstream/master	2015-07-08 18:41:48 -07:00
Brad Davis	49a14e3446	Merge remote-tracking branch 'upstream/master' into entity_parsing	2015-07-08 18:37:41 -07:00
Brad Davis	625cc86f83	Merge pull request #5283 from ZappoMan/optimizeByteCountCoded Optimize ByteCountCoded<> to not do extra heap allocations	2015-07-08 18:35:02 -07:00
ZappoMan	7790e35d24	added bytes consumed result to decode, and exit early after bytes consumed	2015-07-08 18:19:12 -07:00
Brad Davis	600e9cbf52	Fixing template specialization compilation error on gcc/clang	2015-07-08 18:17:03 -07:00
ZappoMan	c0cdf3256c	comment and dead code	2015-07-08 17:34:36 -07:00
ZappoMan	e885ac1821	improved performance of ByteCountCoding<> decode	2015-07-08 17:32:51 -07:00
Brad Davis	98e0688e98	Reducing heap allocation in network packet parsing	2015-07-08 17:21:38 -07:00
ZappoMan	6a9344a3f6	fix bug in old version of decode	2015-07-08 15:14:24 -07:00
Atlante45	6bf05fbf1f	Pointer fixes	2015-07-08 10:50:51 -07:00
Atlante45	737d85c597	Compile fixes	2015-07-07 18:22:06 -07:00
Andrew Meadows	e9df8cacc7	make some arguments const, cleanup some #includes	2015-07-07 17:50:08 -07:00
Atlante45	fa43c62722	RingBufferHistory handles unique_ptr	2015-07-07 16:45:43 -07:00
Howard Stearns	1c2972bd7c	Expose avatar collisions to scripts, and include velocityChange in exposed collision data.	2015-07-07 11:49:55 -07:00
Anthony J. Thibault	5293effc2e	more work in progress vive room tracking Found and disabled torso twist use an old copy of the hmd pose before physics, and the most up to date one after physics.	2015-07-07 00:12:48 -07:00
Anthony J. Thibault	834b75f4c4	work in progress room scale tracking work. sensor to world matrix stored in MyAvatar override setPosition and setOrientation to move sensor to world matrix.	2015-07-06 18:25:42 -07:00
Brad Hefta-Gaub	2a03f62bf2	Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership Actions over wire and improved simulation ownership	2015-07-02 14:57:27 -07:00
ericrius1	ad97b28734	fixed merge conflicts	2015-07-02 11:01:40 -07:00
ericrius1	feeba2a029	testing for serialization	2015-07-01 23:03:03 -07:00
Atlante45	7b5a5a339a	Use make_shared/create to make shared pointers	2015-07-01 19:46:06 -07:00
Brad Davis	59027959b8	CR comments and fixing the average calculation	2015-07-01 16:30:42 -07:00
Clément Brisset	93d51717ce	Merge pull request #5201 from ctrlaltdavid/20590 QA for #20590 - Delete Interface.ini.lock file at start-up if it exists	2015-07-01 13:54:02 -07:00
Seth Alves	5e2f7204b4	responses to code review	2015-07-01 10:29:42 -07:00
Seth Alves	6e7973f5b9	coding-standard / code-review	2015-06-30 19:28:22 -07:00
ericrius1	ff77c3e0d8	added stroke width entity	2015-06-30 18:38:40 -07:00
Seth Alves	1d122060a6	merge andrew's sim-ownership branch	2015-06-29 09:50:38 -07:00
Seth Alves	0970f010a4	provide a way for scripts to get information about what actions an entity has and what the arguments of those actions are	2015-06-27 13:31:00 -07:00
Andrew Meadows	b6d5adaef8	move global into function that uses it	2015-06-26 21:57:04 -07:00
Andrew Meadows	c87e7c99ce	bid for ownership on script-change phys properties	2015-06-26 21:57:04 -07:00
Seth Alves	0f3ac976c3	don't try to convert a vec3 containing NaN to a script value	2015-06-26 17:53:28 -07:00
Stephen Birarda	c6df573933	fix some OS X warnings, add description to tooltip	2015-06-26 10:50:31 -07:00
Atlante45	85b2771c4a	Extend Extents	2015-06-24 15:44:48 -07:00
David Rowe	33b48947a5	Delete Interface.ini.lock file at start-up if it exists Otherwise Interface freezes.	2015-06-23 17:36:19 -07:00
Seth Alves	4bf4e9f5da	Merge pull request #5164 from ericrius1/lineBounds Line bounds	2015-06-23 10:47:38 -07:00
ericrius1	0e177a3e31	deleted unnessary line break	2015-06-18 18:23:09 -07:00
Brad Davis	48b27acc79	Merge remote-tracking branch 'upstream/master' into overlay Conflicts: interface/src/Application.cpp interface/src/ui/ApplicationOverlay.cpp	2015-06-18 18:17:59 -07:00
ericrius1	7293330ced	fixed indentation and lines delete when user exits to help with large model.svo/json file size	2015-06-18 18:17:02 -07:00
ericrius1	6a5deaaef1	returning true from set line points	2015-06-18 16:54:39 -07:00
ericrius1	2b4146125f	adding logic to check points of line are inside bounds	2015-06-18 16:27:06 -07:00
Seth Alves	021dc64789	merge from upstream	2015-06-18 15:03:09 -07:00
Brad Hefta-Gaub	b008b810e1	Merge pull request #5145 from Atlante45/text Bring back display names	2015-06-18 11:25:45 -07:00
Seth Alves	b258aeaa3d	merge from master	2015-06-18 10:04:14 -07:00
ZappoMan	673e1ee0cc	first cut and removing openGl dependency in shared	2015-06-18 09:30:34 -07:00
Atlante45	1cab853f18	Better guard Transform scale	2015-06-18 15:23:50 +02:00
Atlante45	254f05072f	Fix inverted if	2015-06-18 15:23:49 +02:00
Brad Davis	d9452cfd2e	Merge branch 'gpu-error-tweak' into overlay	2015-06-18 00:54:48 -07:00
Brad Davis	a83a4fb0a1	Merge remote-tracking branch 'upstream/master' into overlay Conflicts: interface/src/Application.cpp interface/src/devices/OculusManager.cpp interface/src/ui/ApplicationOverlay.cpp	2015-06-17 19:53:31 -07:00
Seth Alves	eb89835d42	Merge branch 'master' of github.com:highfidelity/hifi into fix-line-data-handling	2015-06-17 18:35:00 -07:00
Seth Alves	8735fa1eac	have variantMapToScriptValue handle lists.	2015-06-17 18:33:43 -07:00
Brad Hefta-Gaub	4501fb1d61	Merge pull request #5073 from jherico/ovr6 Support Oculus SDK version 0.6 on windows only	2015-06-17 18:17:34 -07:00
Bradley Austin Davis	4633cabcec	Merge remote-tracking branch 'upstream/master' into ovr6	2015-06-17 17:07:43 -07:00
Brad Davis	ae1c9603b9	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-17 15:13:04 -07:00
Seth Alves	68df6b662d	fix ifdefs around asserts	2015-06-17 15:03:09 -07:00
Seth Alves	44bb220130	fix debug build	2015-06-17 14:54:13 -07:00
Seth Alves	9a51a4c5b1	fix debug build	2015-06-17 14:48:37 -07:00
ZappoMan	58ee5217e3	fix some warnings	2015-06-17 14:08:02 -07:00
Bradley Austin Davis	2172445db7	Merge remote-tracking branch 'upstream/master' into ovr6	2015-06-17 12:56:41 -07:00
Brad Davis	5ded9e7eb9	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-17 10:50:01 -07:00
Sam Gateau	5c547037f2	Migrating the overaly 3d rendering in their own job and their own shader	2015-06-17 15:54:20 +02:00
Seth Alves	508ae276c6	enable -Wdouble-promotion	2015-06-16 18:23:10 -07:00
Brad Davis	4f8ea3f624	Merge remote-tracking branch 'upstream/master' into ovr6	2015-06-16 09:58:20 -07:00
Brad Davis	ba13b7820c	Working on overlay refactor	2015-06-16 09:58:03 -07:00
Andrew Meadows	0e12cdc39e	woops, forgot to include this in last commit	2015-06-10 12:41:15 -07:00
Brad Davis	5680d58a19	Removing oglplus requirement for linux and mac	2015-06-09 03:09:10 -07:00
Brad Davis	6147844f93	Merge branch 'master' into ovr6 Conflicts: interface/src/Application.cpp interface/src/avatar/SkeletonModel.cpp interface/src/devices/OculusManager.h	2015-06-09 00:44:06 -07:00
ZappoMan	24c8e7d0e6	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-08 13:50:50 -07:00
Stephen Birarda	666830c04d	add a sound once first AM packet received	2015-06-08 11:30:12 -07:00
Bradley Austin Davis	5a52a389be	Working on SDK 0.6	2015-06-07 23:23:21 -07:00
Bradley Austin Davis	b56fbd4744	Working on SDK 0.6	2015-06-07 13:56:06 -07:00
Brad Davis	f614268667	Moving windows to SDK 0.6 Working on SDK 0.6 for windows Working on SDK 0.6 for windows	2015-06-07 01:40:44 -07:00
ZappoMan	f8a2fff5a7	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-05 11:06:10 -07:00
Seth Alves	edb3622c85	Merge pull request #5037 from AndrewMeadows/inertia collision groups for physical objects	2015-06-05 10:26:28 -07:00
ZappoMan	807cc3db24	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-05 09:37:39 -07:00
Clément Brisset	f19c0d8eec	Some renaming for windows compiler	2015-06-05 13:23:58 +01:00
Atlante45	93b44e6846	Collect stats on translucent/opaque mesh parts	2015-06-04 18:46:47 +02:00
Atlante45	a4340b17e9	Remove deprecated render stats	2015-06-04 14:47:04 +02:00
Andrew Meadows	ec0b4a956a	move collision group consts to shared lib	2015-06-03 14:13:51 -07:00
Andrew Meadows	a989998816	fix typo in comment	2015-06-03 14:13:30 -07:00
Atlante45	7654533888	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod	2015-06-03 19:47:51 +02:00
Howard Stearns	c036b5fd4b	Actually commit the changes this time!	2015-06-03 10:19:28 -07:00
ZappoMan	7c40b666e8	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api	2015-06-03 09:52:40 -07:00
Atlante45	9df1b05184	Introduce outsideEngineDetails	2015-06-03 18:08:43 +02:00
Atlante45	bbf1837796	Introduced RenderDetails/Stats don't pull details - Regrouped everything stat in a struct - Details are set into the stats	2015-06-03 16:14:23 +02:00
ZappoMan	647d132d57	store part boxes in model space and translate to world space on request	2015-06-02 21:50:33 -07:00
Sam Gateau	3c7eb4de6d	merging with upstream	2015-06-02 14:48:53 -07:00
Andrew Meadows	2702e07863	Merge pull request #5015 from sethalves/polyvox PolyVox improvements -- depends on #5008	2015-06-02 14:34:49 -07:00
Eric Levin	55ffb7f1c0	code style changes	2015-06-02 12:51:45 -07:00
Seth Alves	11eb073bcf	fix comment	2015-06-02 10:04:39 -07:00
Seth Alves	d201f7791e	oops	2015-06-02 10:01:43 -07:00
Seth Alves	20d3814c1b	code review	2015-06-02 10:00:07 -07:00
Atlante45	9d4ded1fb3	Add shouldRender functor to render args	2015-06-02 16:09:05 +02:00
Sam Gateau	cd7914ad9d	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk	2015-06-01 17:31:39 -07:00
Sam Gateau	bd7c22e715	Trying to transfer the rnedering from displaySide to RenderDeferredTask	2015-06-01 17:31:00 -07:00
ZappoMan	d4af454834	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-01 14:42:35 -07:00
Eric Levin	5cce4edec8	fix merge conflicts attemp 1	2015-06-01 11:18:33 -07:00
Eric Levin	7b08537574	code standards fixes	2015-06-01 09:51:24 -07:00
Seth Alves	d04b61d6a8	oops	2015-06-01 07:16:16 -07:00
Seth Alves	00af0a4376	trying to make thing behave when voxel-space is resized	2015-06-01 07:15:37 -07:00
Eric Levin	cb72b620cf	printing bytes out correctly	2015-05-29 19:42:07 -07:00
Seth Alves	96a40bd673	basic collisions with cubic polyvoxes	2015-05-29 18:50:26 -07:00
Brad Davis	77b45e2b4a	Adding missing files	2015-05-29 12:59:55 -07:00
Atlante45	75788a3c51	Reactivate Transform asserts	2015-05-29 17:05:56 +02:00
Eric Levin	2d66696675	line working from array of points	2015-05-28 14:18:57 -07:00
ZappoMan	a0e51469d3	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-05-28 12:36:34 -07:00
Eric Levin	8886e93d5f	changed qVector to qVectorVec3	2015-05-28 11:26:41 -07:00
Eric Levin	72af4e4e67	latest pointer	2015-05-28 10:44:44 -07:00
ZappoMan	20ceb72d92	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-05-26 15:01:26 -07:00
Seth Alves	d71921fd03	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-26 10:46:02 -07:00
Seth Alves	9735174036	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-25 15:37:23 -07:00
Brad Hefta-Gaub	910c8549fc	Merge pull request #4951 from huffman/ctx Team Teaching - Add gpu::context to RenderArgs and use RenderArgs in more render() methods	2015-05-22 22:20:45 -07:00
Ryan Huffman	43317bc829	Temporarily remove isValidScale assert	2015-05-22 17:00:39 -07:00
Ryan Huffman	7be646d62e	Make gpu::context the first RenderArgs ctor parameter	2015-05-22 16:02:10 -07:00
Ryan Huffman	d1a5662ca7	Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx Conflicts: libraries/entities-renderer/src/EntityTreeRenderer.cpp	2015-05-22 15:33:40 -07:00
ZappoMan	160898ce96	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-05-22 14:55:29 -07:00
Andrew Meadows	461d08c0a9	merge upstream/master into andrew/bispinor	2015-05-22 11:35:02 -07:00
Clément Brisset	e276926608	Add include/remove duplicate type	2015-05-22 18:23:42 +01:00
Atlante45	c6ce5e7680	PerformanceTimer deactivated when not in use	2015-05-22 18:54:40 +02:00
Ryan Huffman	4a4c9c75fc	Add gpu::context to RenderArgs and start using RenderArgs in place of the flags	2015-05-22 09:50:51 -07:00
Atlante45	314486ab88	Ignore scale in Transform when 0.0f Also cleaned up some coding standard	2015-05-22 16:21:12 +02:00
Andrew Meadows	466af03fa9	support for ShapeInfo::offset	2015-05-21 16:25:05 -07:00
Andrew Meadows	67f5d0773d	some list management of AvatarMotionStates	2015-05-21 14:40:47 -07:00
ZappoMan	c7fb8fab85	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api	2015-05-21 10:36:22 -07:00
Seth Alves	72e227eefe	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-21 09:55:14 -07:00
Seth Alves	52ce26d80d	Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux	2015-05-21 09:20:56 -07:00
Stephen Birarda	6306b69ec8	add a version and handle remapping for restricted access	2015-05-20 16:27:53 -07:00
Seth Alves	4b263cf5c8	derieve PolyVox Entity from Model Entity	2015-05-19 21:40:05 -07:00
Seth Alves	f9d46b0cb5	interface decides on entityIDs rather than bouncing a temporary id through the entity server	2015-05-19 14:25:23 -07:00
Atlante45	4725d5e676	Merge branch 'primitives_batch' into remove_gl_transform	2015-05-16 05:22:12 +02:00
Atlante45	7185589407	Add optional Batch to RenderArgs	2015-05-16 04:42:15 +02:00
Atlante45	92d4b08c38	Init _transform with correct values	2015-05-15 17:52:06 +02:00
Seth Alves	baf4157da0	Merge pull request #4859 from ZappoMan/typeSafePropertyCleanup Clean up Entity Properties and Macros to be more type-safe friendly and consistent	2015-05-13 20:52:03 -07:00
Brad Hefta-Gaub	77019eafa7	Merge pull request #4831 from jherico/plugins_pt2 Display plugins part 2	2015-05-13 20:40:33 -07:00
ZappoMan	095b7701d8	Merge branch 'master' of https://github.com/highfidelity/hifi into typeSafePropertyCleanup	2015-05-13 12:12:12 -07:00
Philip Rosedale	349886c146	Merge pull request #4847 from birarda/domain-paths add initial support for local paths in domain	2015-05-12 17:09:13 -07:00
ZappoMan	67df6e3c62	make READ_ENTITY_PROPERTY_TO_PROPERTIES() type safe	2015-05-12 16:24:16 -07:00
Stephen Birarda	0562fee82a	Merge branch 'master' of https://github.com/highfidelity/hifi into domain-paths	2015-05-12 12:39:05 -07:00
Stephen Birarda	c66bd9b1aa	complete addition of paths to DS settings	2015-05-12 11:58:55 -07:00
Seth Alves	f647db3bf0	Merge branch 'master' of github.com:highfidelity/hifi into line-entity	2015-05-12 11:36:56 -07:00
Clément Brisset	9bf4cf1262	Merge pull request #4830 from ZappoMan/moreZoneProperties New Zone Features	2015-05-12 14:28:01 +02:00
Seth Alves	4881b0c53c	copy box to make a new type of line entity item	2015-05-11 19:25:14 -07:00
ZappoMan	73428ec12d	add support to not displace very large clipboards on import	2015-05-11 14:21:58 -07:00
Brad Davis	332d2091e5	Fixing license	2015-05-11 13:22:43 -07:00
Brad Davis	abab54aed8	Working on display plugins	2015-05-11 13:08:53 -07:00
Stephen Birarda	8c6715e4fc	resolve conflicts on merge with upstream/master	2015-05-11 11:10:22 -07:00
Stephen Birarda	ebeba81233	make sure an ACM asks for PID in log	2015-05-08 17:37:48 -07:00
Stephen Birarda	acac2f5a22	don't init if Settings not init	2015-05-08 16:51:27 -07:00
Stephen Birarda	ddb52348bc	don't force use of Settings to all QCoreApplication	2015-05-08 16:24:39 -07:00
Brad Hefta-Gaub	bfb2b278ee	Merge pull request #4791 from jherico/scale Fixing scale resolution issues	2015-05-08 15:54:24 -07:00
Stephen Birarda	78942b0a87	let QSettings destructor call Setting::Manager sync	2015-05-08 15:49:28 -07:00
Bradley Austin Davis	0751443a01	Merge branch 'master' into scale	2015-05-08 15:03:24 -07:00
Stephen Birarda	0a295bada1	add debugging to catch AC kill hang	2015-05-08 14:32:16 -07:00
Stephen Birarda	3d06a86670	drop packets on floor when shutting down	2015-05-08 11:57:25 -07:00
Bradley Austin Davis	c31d36be59	Fixing scale resolution issues	2015-05-07 12:01:56 -07:00
Seth Alves	d52a45b57e	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-07 11:30:46 -07:00
Atlante45	faabf29e84	Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones	2015-05-07 19:58:26 +02:00
Atlante45	00571dad00	Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones	2015-05-07 10:13:59 +02:00
ZappoMan	496da6fcd5	wire up the skybox color property to the new skybox renderer	2015-05-06 20:36:06 -07:00
Seth Alves	fe06ce2931	pull from upstream	2015-05-06 14:31:22 -07:00
Bradley Austin Davis	fc73676b4d	Merge branch 'master' into plugins_pt1	2015-05-06 11:43:25 -07:00
Andrew Meadows	aa5a59c3dc	merge upstream/master into andrew/nova Conflicts: libraries/entities/src/EntityItem.cpp libraries/physics/src/PhysicsEngine.cpp	2015-05-05 10:24:17 -07:00
Atlante45	6fdb594dfd	Forgot member initialisation	2015-05-05 16:40:16 +02:00
Atlante45	aa10dc3991	Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones	2015-05-05 15:04:11 +02:00
Andrew Meadows	96acf96b76	entity-entity collision events emit signals again	2015-05-04 13:32:57 -07:00
Stephen Birarda	87e586dfe6	remove a stray space	2015-05-04 10:42:58 -07:00
Atlante45	12fcb35717	Made RenderArgs a default ctor	2015-05-04 17:22:46 +02:00
Brad Davis	302aa9db47	Removing access to the gl widget and display managers	2015-05-02 00:49:52 -07:00
Stephen Birarda	475861c4be	move KILO_PER_MEGA to numerical constants	2015-05-01 16:30:25 -07:00
Stephen Birarda	edade7baba	resolve conflicts on merge with upstream master	2015-05-01 16:24:16 -07:00
Stephen Birarda	94739cf8d3	move number constants out of SharedUtil to NumericalConstants	2015-05-01 10:26:53 -07:00
Seth Alves	f75b599288	don't save default values in json file	2015-04-30 11:28:27 -07:00
Stephen Birarda	85919972e3	resolve conflicts on merge with upstream/master	2015-04-29 10:45:25 -07:00
Stephen Birarda	1995fa6a5e	fix return value comment in SimpleMovingAverage	2015-04-28 18:28:12 -07:00
Stephen Birarda	c52426385d	code review comments for #4713	2015-04-28 18:28:05 -07:00
Stephen Birarda	f2dcacffd0	show avatar data receive rate by default with display name	2015-04-28 18:27:42 -07:00
Stephen Birarda	4e6979cac8	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-mixer-throttling	2015-04-28 16:50:07 -07:00
Stephen Birarda	b917afa3cc	show avatar data receive rate by default with display name	2015-04-28 09:47:19 -07:00
Brad Davis	897e47e8e6	Removing debug hack to load resources from source folder	2015-04-27 23:17:56 -07:00
Seth Alves	bdc6bb3c2d	Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic	2015-04-27 12:20:58 -07:00
Brad Davis	a12bfd95f4	Merge remote-tracking branch 'upstream/master' into ui-refactor Conflicts: libraries/render-utils/src/MatrixStack.h	2015-04-27 10:59:57 -07:00
Seth Alves	2cdbe8bf7b	merge from upstream	2015-04-27 09:57:36 -07:00
Seth Alves	e007617112	hook up menu-items to control debug rendering of collision hulls and owned simulations	2015-04-27 09:56:24 -07:00
Seth Alves	0fb1a83e3b	quiet compiler, remove some trailing control-Ms	2015-04-25 09:20:00 -07:00
Brad Davis	99a6e1f86c	Breaking up offscreen UI work	2015-04-24 13:21:21 -07:00
Atlante45	0b1d4fb1d6	Merge branch 'master' of https://github.com/highfidelity/hifi into zones	2015-04-23 21:16:11 +02:00
Atlante45	b340cd06bf	Fix volume formula for capsules	2015-04-23 19:14:07 +02:00
Atlante45	83490051d9	Move shape related contains() to ShapeInfo	2015-04-23 18:55:20 +02:00
Atlante45	6be0910966	Fix contain for collision hulls	2015-04-23 15:58:18 +02:00
Brad Davis	c4d2bd2cda	More coding standard fixes	2015-04-22 19:18:09 -07:00
Atlante45	955723acf1	RenderableEntityItem uses collision hull in contains	2015-04-22 21:03:55 +02:00
Brad Davis	ce6b7e7aec	Merge branch 'master' into offscreen Conflicts: interface/src/Menu.cpp	2015-04-16 14:02:40 -07:00
Bradley Austin Davis	36ca9132cc	More build failure fixes	2015-04-16 01:02:13 -07:00
Brad Davis	d14d5f3d29	Working on new-UI implementations of address bar and login	2015-04-15 00:36:04 -07:00
Andrew Meadows	da9091a99d	remove SHAPE_TYPE_CONVEX_HULL from libs and tests	2015-04-14 14:54:43 -07:00
Seth Alves	3cfafea5ca	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-04-07 15:09:50 -07:00
Andrew Meadows	a47170b02c	Merge pull request #4601 from samcake/temp1 Introducing gpu::State and using it in the Model rendering path and more...	2015-04-07 12:48:42 -07:00
Seth Alves	bc9e818b95	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-04-07 11:12:16 -07:00
Seth Alves	ef5dffecf6	fix filenames in comments	2015-04-07 10:03:14 -07:00
Seth Alves	9014397167	try again without macro	2015-04-07 09:59:04 -07:00
Seth Alves	fb607e2b26	logging groups for library/shared and interface	2015-04-06 18:45:06 -07:00
Sam Gateau	00817ab64f	MErging with origin/orange, brinign the fix for shadows	2015-04-05 18:36:39 -07:00
Seth Alves	9ef9452cf6	make filename extension checking less wrong	2015-04-03 16:39:45 -07:00

... 17 18 19 20 21 ...

3728 commits