14979 commits

Author	SHA1	Message	Date
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
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	cd82383d33	Merge branch 'master' of github.com:highfidelity/hifi into improve-grab-action-reliability	2016-01-05 11:13:38 -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
David Rowe	16d4234d55	Get rid of a couple of multiplies	2016-01-05 15:23:25 +13: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
Andrew Meadows	164c649a33	Merge pull request #6681 from howard-stearns/pid-render-limits ... Pid render limits	2016-01-04 14:47:31 -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
David Rowe	f04222b5ac	Merge branch 'master' into 20760	2016-01-05 10:29:04 +13: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	2c21092808	be more careful about locking	2016-01-03 07:59:49 -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
Brad Davis	f4bd2afc8e	Make script launched windows invisible at creation time	2015-12-30 11:38:34 -08:00
Anthony J. Thibault	8f71a5fda5	ModelEntityItem: Fix for missing pre-rotations for animated models. ... This should fix the issue with the Kaya and Claire models, while also not breaking the windmill model in demo.	2015-12-30 10:17:18 -08:00
Brad Davis	0901e3aae1	Support QML and Web content in overlay windows	2015-12-30 09:14:49 -08:00
Brad Davis	07531353e4	Allow a script to set a resource override.	2015-12-30 09:06:04 -08:00
Andrew Meadows	a5c19c04e5	Merge pull request #6672 from ctrlaltdavid/fix-nodelist-shutdown ... Don't send a domain-server check in when shutting down	2015-12-30 08:43:19 -08:00
Brad Davis	76eba89f7d	Merge pull request #6745 from hyperlogic/tony/neuron-plugin ... Support for Perception Neuron	2015-12-30 11:39:32 -05: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