14992 commits

Author	SHA1	Message	Date
Seth Alves	f7041136ff	put new property in right place	2016-01-05 13:26:16 -08:00
Seth Alves	b222c12857	unmangle merge	2016-01-05 12:21:50 -08:00
Seth Alves	942e77166e	merge from upstream	2016-01-05 11:11:19 -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	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
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
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
Seth Alves	768934ae11	update entity timestamps when sending joint information	2016-01-04 11:29:15 -08:00
Seth Alves	9e49fcf0a4	include model-joints in debugging output	2016-01-04 11:29:01 -08:00
Seth Alves	8eef1624cb	Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints	2016-01-04 09:27:59 -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
Brad Hefta-Gaub	5b177404d5	Merge pull request #6749 from jherico/resource_override ... Allow a script to set a resource override.	2016-01-04 09:17:38 -08:00
Brad Hefta-Gaub	ec8a2ae093	Merge pull request #6739 from jherico/qml_window ... Support QML and Web content in overlay windows	2016-01-03 10:18:26 -10:00
Brad Hefta-Gaub	c17e8a6d9e	Merge pull request #6753 from jherico/sdl_fix ... Fix SDL breakage due to missing init	2016-01-03 10:11:19 -10:00
Brad Hefta-Gaub	02835fc960	Merge pull request #6702 from hyperlogic/tony/soft-attachments ... Soft Attachment Support	2016-01-03 08:46:16 -10:00
Seth Alves	63293d5838	remove commented code	2016-01-03 08:07:31 -08:00
Seth Alves	f5bc58f606	back out off-brand change	2016-01-03 08:00:31 -08:00
Seth Alves	40a25f859a	cleanups	2016-01-03 08:00:23 -08:00
Seth Alves	bfa8cc1969	merge from upstream	2016-01-03 06:47:25 -08:00
Brad Davis	a0196f0cde	Ensure we don't hang if the QML thread doesn't shutdown	2015-12-31 15:23:39 -08:00
Brad Davis	67e32cc1f0	Consolidating URL handling, exposing to all QML objects	2015-12-31 14:14:48 -08:00
Brad Davis	462cc325e5	Cleanup, moving some QML objects to OffscreenUI	2015-12-31 12:39:56 -08:00
Zach Pomerantz	c6e6aceb85	Optimize getVertexStream() by using a const&	2015-12-31 11:51:05 -08:00
Brad Davis	7d71a187d8	Fix SDL breakage due to missing init	2015-12-31 08:47:27 -08:00
Brad Davis	000130617e	Allow input devices to break up their mappings into multiple files	2015-12-30 22:28:10 -08:00
Brad Davis	c77b66f88c	Make navigation directions into axes	2015-12-30 22:28:08 -08:00
Brad Davis	3eddf8d4a4	Allow and conditionals to be initialized from simple pairs	2015-12-30 22:24:34 -08:00
Brad Davis	4c26627622	Add navigation actions and wire them up in the standard controller	2015-12-30 17:14:40 -08:00
Brad Davis	af132e267f	Support a 'nav focus' state to allow joystick / hydra navigation of UI	2015-12-30 17:13:20 -08:00
Brad Davis	e863d4edee	Fix SDL breakage due to missing init	2015-12-30 16:48:19 -08:00
Seth Alves	d35bbbb9f2	incorporate changes from #6732	2015-12-30 13:15:36 -08:00