15022 commits

Author	SHA1	Message	Date
Seth Alves	cf9af462b5	replace some logging with an assert	2016-01-07 10:21:39 -08:00
Seth Alves	b873d92469	try harder to ensure that a held object is active in bullet	2016-01-06 14:12:58 -08:00
Seth Alves	096ab44311	fix network version number	2016-01-06 11:01:31 -08:00
Anthony Thibault	95f821d61a	Merge pull request #6732 from sethalves/set-model-entity-joints ... hook up a way for scripts to set model-entity joint state	2016-01-05 17:31:18 -08:00
Brad Davis	e4913a56ab	Merge pull request #6775 from sethalves/fix-polyvox-rendering ... update polyvox shader to track changes in packDeferredFragment	2016-01-05 20:24:33 -05:00
Brad Davis	4a9c558809	Merge pull request #6776 from Atlante45/fix/lambda-crash ... Cleanup web entity connections	2016-01-05 20:23:51 -05:00
Seth Alves	722fe46a27	Merge pull request #6777 from AndrewMeadows/whitespace ... nothing but whitespace	2016-01-05 17:14:19 -08:00
Clément Brisset	a2135dfdd2	Merge pull request #6720 from ctrlaltdavid/20760 ... Fix particle radius and rgba start, middle, finish interpolation	2016-01-05 16:48:13 -08:00
Andrew Meadows	9ab5ef358a	remove dangling whitespace	2016-01-05 16:44:36 -08:00
David Rowe	4d7ed6b68f	Whitespace	2016-01-06 13:20:44 +13:00
Atlante45	981c6c7af5	Cleanup web entity connections	2016-01-05 16:08:25 -08:00
Seth Alves	1e69f695b4	update polyvox shader to track changes in packDeferredFragment	2016-01-05 16:06:59 -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
Seth Alves	f7041136ff	put new property in right place	2016-01-05 13:26:16 -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
Brad Davis	908c1072ce	Merge pull request #6763 from ZappoMan/scriptMessageBoxesOffscreen ... move alert and confirm to use offscreen ui	2016-01-05 15:26:48 -05:00
Seth Alves	b222c12857	unmangle merge	2016-01-05 12:21:50 -08:00
Seth Alves	cd82383d33	Merge branch 'master' of github.com:highfidelity/hifi into improve-grab-action-reliability	2016-01-05 11:13:38 -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
Seth Alves	212d2d9e8f	merge from upstream	2016-01-05 10:27:45 -08:00
Brad Hefta-Gaub	927fe97359	migrate callers of QMessageBox::warning() to OffscreenUi::warning()	2016-01-05 10:17:16 -08:00
Anthony J. Thibault	9ea6079c64	Merge branch 'master' into tony/get-palm-thread-safe	2016-01-05 10:16:52 -08:00
Brad Hefta-Gaub	d98c2d1413	migrate callers of QMessageBox::question() to OffscreenUi::question()	2016-01-05 09:39:39 -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
David Rowe	16d4234d55	Get rid of a couple of multiplies	2016-01-05 15:23:25 +13:00
Seth Alves	3db68e3151	add model joints to debugging	2016-01-04 18:16:20 -08:00
Seth Alves	2d246a840f	better packing for qvector of bools	2016-01-04 18:14:29 -08:00
David Rowe	a265ffb631	Get rid of a couple of if statements and duplicate calls ... Courtesy of Clement	2016-01-05 15:13:22 +13:00
Seth Alves	0b9f92e50f	fix quat (un)packing	2016-01-04 18:01:48 -08:00
Seth Alves	69839b4b16	better packing of qvector of quats	2016-01-04 17:50:25 -08:00
Seth Alves	3026415f03	add some missing property handling boilerplate	2016-01-04 16:17:00 -08:00
Seth Alves	202a6ae294	debugging	2016-01-04 15:56:08 -08:00
Seth Alves	ccf29e3772	debugging	2016-01-04 15:52:58 -08:00
Seth Alves	9304477233	split out calls for rotation and translation	2016-01-04 15:29:06 -08:00
Seth Alves	5beba58e5f	debugging	2016-01-04 15:05:08 -08:00
Seth Alves	bd35532c5d	debugging	2016-01-04 15:02:45 -08:00
Seth Alves	ef8673610f	debugging	2016-01-04 14:58:13 -08:00
Seth Alves	cd92a9fa1a	adjust timestamps	2016-01-04 14:51:43 -08:00
Seth Alves	9a708f2e74	try splitting edit into 2 packets	2016-01-04 14:48:49 -08:00
Andrew Meadows	164c649a33	Merge pull request #6681 from howard-stearns/pid-render-limits ... Pid render limits	2016-01-04 14:47:31 -08:00
Seth Alves	6c8eb90ee0	debugging	2016-01-04 14:42:37 -08:00
Andrew Meadows	d2b757d6ad	Merge pull request #6755 from zzmp/fix/optimize-gpu-stream-copy ... Optimize getVertexStream() by using a const&	2016-01-04 14:31:21 -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
David Rowe	f04222b5ac	Merge branch 'master' into 20760	2016-01-05 10:29:04 +13:00
Seth Alves	2147b0d78e	fix locking	2016-01-04 12:31:58 -08:00
Seth Alves	c9ed36f9a6	include joint data in script properties	2016-01-04 12:31:45 -08:00
Seth Alves	ef7438958b	better debugging prints for model joints	2016-01-04 12:30:55 -08:00