13359 commits

Author	SHA1	Message	Date
Andrew Meadows	7fa069cf30	fix line endings grumble gruble	2015-10-20 09:38:25 -07:00
Andrew Meadows	341bc3666f	Merge pull request #6093 from sethalves/hold-action-changes ... Hold action changes	2015-10-20 09:19:48 -07:00
Philip Rosedale	282485d412	Merge pull request #6116 from AndrewMeadows/reduced-hips-shift-from-hand-targets ... hack to reduce hand influence of hips in HMD mode	2015-10-19 22:31:50 -07:00
samcake	b977a094d3	Merge pull request #6115 from ZappoMan/fixLOD ... fix model LOD behavior	2015-10-19 16:16:48 -07:00
Seth Alves	bddbe89c86	don't accept incoming location edits if an entity is being controlled by a shouldSuppressLocationEdits action	2015-10-19 16:13:53 -07:00
Seth Alves	9e24542c0b	don't accept incoming location edits if an entity is being controlled by a shouldSuppressLocationEdits action	2015-10-19 16:05:56 -07:00
Seth Alves	00594f0cce	don't accept incoming location edits if an entity is being controlled by a shouldSuppressLocationEdits action	2015-10-19 16:05:10 -07:00
Andrew Meadows	97b41957f7	Merge pull request #6113 from hyperlogic/tony/blender-fbx-fix ... Joint rotation fix for FBX files exported from Blender.	2015-10-19 15:59:51 -07:00
Seth Alves	a1cfebc173	don't accept incoming location edits if an entity is being controlled by a shouldSuppressLocationEdits action	2015-10-19 15:57:15 -07:00
Brad Hefta-Gaub	0b2bf8bda8	remove some dead code	2015-10-19 15:23:45 -07:00
Brad Hefta-Gaub	110adc5c22	fix model LOD behavior	2015-10-19 15:21:25 -07:00
Andrew Meadows	917bfbf64e	hack to reduce hand influence of hips in HMD mode	2015-10-19 15:19:32 -07:00
Seth Alves	6f30a3c178	new method -- ObjectMotionState::getBodyLinearVelocityGTSigma	2015-10-19 13:56:30 -07:00
Anthony J. Thibault	62c89eaf7d	Joint rotation fix for FBX files exported from Blender. ... This isn't a great fix. But it will at least allow people to export avatars from Blender.	2015-10-19 13:49:13 -07:00
Seth Alves	113321184d	if model RegistrationPoint doesn't match entityItem's, update it	2015-10-19 12:21:26 -07:00
Seth Alves	ac99005602	reverting a change to try to see sticking problem again	2015-10-19 12:13:08 -07:00
Seth Alves	f96e9eb1e8	fuck you, const!	2015-10-19 12:04:55 -07:00
Seth Alves	46e5bf0435	take entity-server clock-skew into account when handling action expiration times	2015-10-19 11:59:03 -07:00
Seth Alves	5c031a38c7	try another way of fixing held object snagging at slow velocity	2015-10-19 10:29:30 -07:00
Seth Alves	c5a5f26e6a	try another way of fixing held object snagging at slow velocity	2015-10-19 10:27:35 -07:00
Seth Alves	2bdcb256d8	try another way of fixing held object snagging at slow velocity	2015-10-19 10:26:37 -07:00
Seth Alves	26dcaeb056	try another way of fixing held object snagging at slow velocity	2015-10-19 10:10:43 -07:00
Seth Alves	fbe3cb9511	try another way of fixing held object snagging at slow velocity	2015-10-19 09:56:51 -07:00
Seth Alves	742e48b0c8	try another way of fixing held object snagging at slow velocity	2015-10-19 09:48:34 -07:00
Brad Hefta-Gaub	bddb0e1e7b	ifdef out buggy texture map code	2015-10-19 09:43:08 -07:00
Brad Davis	282cdadf63	Fixing line endings	2015-10-18 22:55:14 -07:00
Seth Alves	1f3b92577d	update _model's location anytime it doesn't match the entity's location	2015-10-17 20:08:25 -07:00
Seth Alves	353f92f1ba	Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes	2015-10-17 13:09:52 -07:00
Atlante45	1da68e0214	Fix particle bug by having lifetimes increase	2015-10-16 18:11:22 -07:00
David Rowe	8c22db17cc	Fix reading of QVector<float> from models files - polyline strokeWidths	2015-10-16 15:43:23 -07:00
Seth Alves	937959c1c1	cleanups	2015-10-16 09:57:27 -07:00
Seth Alves	d2b7e5c4eb	Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes	2015-10-16 09:54:26 -07:00
Seth Alves	8338491c3b	Merge pull request #6095 from Atlante45/master ... Fix export bug	2015-10-16 07:32:56 -07:00
Seth Alves	b18bb1e076	Merge pull request #6084 from AndrewMeadows/physics-cleanup ... move DIRTY_FLAGS out of EntityItem namespace	2015-10-16 07:22:40 -07:00
Seth Alves	359a318568	fold kinematic hold into normal hold (disabled by default, an argument enables)	2015-10-15 20:23:06 -07:00
Atlante45	a84fdecec9	Fix export bug	2015-10-15 18:43:32 -07:00
Brad Hefta-Gaub	26f82e899e	Merge pull request #6079 from ericrius1/whiteboard ... Entity whitelist for raypicking and whiteboard painting example	2015-10-15 17:50:35 -07:00
Stephen Birarda	e5825daa57	Merge pull request #6090 from ZappoMan/fixStat ... Add some additional stats for debugging edit lags	2015-10-15 16:00:29 -07:00
Seth Alves	462918ffcf	cleanups	2015-10-15 14:55:17 -07:00
Seth Alves	36a523478f	Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes	2015-10-15 14:21:30 -07:00
Seth Alves	4903db45b1	give other avatars an anim-skeleton	2015-10-15 14:21:06 -07:00
Andrew Meadows	3d17c57910	Merge pull request #6083 from sethalves/groundwork-for-hold-action-changes ... Groundwork for hold action changes	2015-10-15 13:30:02 -07:00
Brad Hefta-Gaub	93113af2d2	improve server error message for failed edit	2015-10-15 11:55:20 -07:00
Seth Alves	a70ba4cd5a	add some accessors	2015-10-15 11:42:53 -07:00
Brad Hefta-Gaub	b7c40c2df1	fix Queue OUT stat	2015-10-15 11:41:04 -07:00
ericrius1	3b59bffb79	Deleting only strokes from the whiteboard where the erase button was clicked on	2015-10-15 11:38:18 -07:00
Seth Alves	64c5cde2d2	further unmangle branch split	2015-10-15 10:33:58 -07:00
Seth Alves	e571cb7ca4	more lock adjustments	2015-10-15 10:22:25 -07:00
ericrius1	55c68e0509	Merge branch 'master' into whiteboard	2015-10-15 10:08:32 -07:00
Andrew Meadows	fa17b77d70	move DIRTY_FLAGS out of EntityItem namespace	2015-10-15 09:34:09 -07:00