31455 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ryan Huffman	a7cae75efc	Merge pull request #47 from Atlante45/protocol ... Win build fixes	2015-09-01 11:56:23 -07:00
Seth Alves	3d7aa6f4d6	Merge pull request #5676 from AndrewMeadows/dubnium ... remove a few warnings from linux build	2015-09-01 11:45:06 -07:00
Seth Alves	5c0cdfe049	Merge pull request #5651 from AndrewMeadows/copernicium ... fix hand IK rotation for all models	2015-09-01 11:21:13 -07:00
Andrew Meadows	fe2d03fd37	merge ... Conflicts: libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp libraries/display-plugins/src/display-plugins/stereo/StereoDisplayPlugin.cpp libraries/shared/src/GLMHelpers.cpp	2015-09-01 11:17:08 -07:00
Seth Alves	930c5cefc9	fix setSphere to create a world-space sphere rather than a voxel-space one	2015-09-01 11:10:21 -07:00
Stephen Birarda	56d6d95df9	only process cp tail if in the right spot	2015-09-01 12:09:58 -06:00
Seth Alves	ca1602e443	if avatar is already standing on a terrain-polyvox, try creating a new one where they are facing	2015-09-01 11:09:46 -07:00
Andrew Meadows	7410baedf0	merge highfidelity/master into andrew/copernicium ... Conflicts: interface/src/avatar/SkeletonModel.cpp libraries/animation/src/Rig.cpp libraries/animation/src/Rig.h	2015-09-01 11:08:01 -07:00
Anthony J. Thibault	2401e6cc4b	Merge branch 'master' into ajt/new-anim-system	2015-09-01 10:58:38 -07:00
David Rowe	2b17eafef4	Only render display names in front of camera	2015-09-01 10:24:50 -07:00
Clément Brisset	0733ba54c7	Win build fixes	2015-09-01 18:23:44 +01:00
Stephen Birarda	6c9021c288	only send second packet of pair when required	2015-09-01 11:10:19 -06:00
Stephen Birarda	2a8250ced5	Merge branch 'protocol' of github.com:birarda/hifi into control-pair-probe	2015-09-01 11:10:06 -06:00
Seth Alves	320338a13f	Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again	2015-09-01 10:07:02 -07:00
Seth Alves	7b6d267c06	Merge pull request #5675 from AndrewMeadows/darmstadtium ... remove PhysicsEntity class	2015-09-01 10:06:01 -07:00
Clément Brisset	1e8ab09cd4	Merge pull request #46 from huffman/win-fixes ... Windows build fixes	2015-09-01 18:52:55 +02:00
Andrew Meadows	47c18fa18a	reduced gravity effect in IK	2015-09-01 09:51:14 -07:00
Andrew Meadows	0e5b357362	revert unintended change to "gravity" term in IK	2015-09-01 09:51:14 -07:00
Andrew Meadows	bdcc68ce36	fix bug: allow IK to iterate more than once ... also changed name of parentTransform to be rootTransform for more correctness	2015-09-01 09:51:14 -07:00
Andrew Meadows	fba7478c52	remove menu items for legacy IK options	2015-09-01 09:51:14 -07:00
Andrew Meadows	617e210fc6	fix for vive controller to place hand for IK	2015-09-01 09:51:14 -07:00
Andrew Meadows	bb63267e30	fix hand IK rotations or all models	2015-09-01 09:45:14 -07:00
Andrew Meadows	802b3a88c3	more corret cmake file for sixense	2015-09-01 09:45:14 -07:00
Ryan Huffman	899b94eab3	Add cstdint include to Asset* files	2015-09-01 09:41:19 -07:00
Ryan Huffman	db92e3155c	Update AssetServerError enum to be camelcase	2015-09-01 09:39:30 -07:00
Seth Alves	05957cdb6b	Merge branch 'darmstadtium' of github.com:AndrewMeadows/hifi into polyvox-again	2015-09-01 09:23:27 -07:00
Stephen Birarda	be78d7f3aa	fix headers for move of UUID to shared	2015-09-01 10:20:06 -06:00
Stephen Birarda	4824b38465	move UUID back to shared	2015-09-01 10:17:07 -06:00
Seth Alves	0dfe6e8054	Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again	2015-09-01 09:13:43 -07:00
Seth Alves	4cbfe96b70	allow a sphere set/clear to affect more than one polyvox at a time	2015-08-31 18:16:32 -07:00
Seth Alves	7369ca19e9	allow setting cuboid voxel spaces. clean up some locking	2015-08-31 18:01:15 -07:00
Seth Alves	6096c20db0	allow adding and deleting spheres	2015-08-31 18:00:31 -07:00
Stephen Birarda	251203caf1	Merge pull request #44 from huffman/protocol-fixes ... Fix friend declaration in Socket from udt::UDTTest to UDTTest	2015-08-31 18:36:10 -06:00
Stephen Birarda	8d6dd9b051	Merge pull request #43 from huffman/protocol-fixes ... Build fixes	2015-08-31 18:33:13 -06:00
Ryan Huffman	791652557e	Fix friend declaration in Socket from udt::UDTTest to UDTTest	2015-08-31 17:32:00 -07:00
Ryan Huffman	12a1085530	Fix friend declaration in Socket from udt::UDTTest to UDTTest	2015-08-31 17:30:02 -07:00
Anthony J. Thibault	0d98ab3365	Normalize scale on AnimSkeleton bind pose.	2015-08-31 17:27:23 -07:00
Ryan Huffman	e36c2b8567	Remove extra curly brace	2015-08-31 16:55:35 -07:00
Stephen Birarda	8d3788c2b6	Merge branch 'protocol' of github.com:birarda/hifi into control-pair-probe	2015-08-31 17:33:53 -06:00
Howard Stearns	d003ec9c58	Delete collision sounds (and their threads) after use. ... This has been broken ever since I added avatar collision sounds around https://github.com/highfidelity/hifi/pull/5159 or so.	2015-08-31 15:49:17 -07:00
Ryan Huffman	9d780b39a5	Merge pull request #40 from birarda/atp ... handle connection timeout and cleanup mutexes	2015-08-31 15:48:23 -07:00
Seth Alves	54ddcf2841	fix normals in shader	2015-08-31 15:24:30 -07:00
Seth Alves	4d06890d90	lock/unlock less	2015-08-31 15:24:15 -07:00
Stephen Birarda	adad752860	Merge branch 'protocol' of github.com:birarda/hifi into control-pair-probe	2015-08-31 16:07:27 -06:00
Stephen Birarda	33f1302d1f	Merge branch 'atp' of github.com:birarda/hifi into atp	2015-08-31 16:04:58 -06:00
Stephen Birarda	4255220a69	Merge branch 'protocol' of github.com:birarda/hifi into atp	2015-08-31 16:04:44 -06:00
Ryan Huffman	423370dccb	Merge pull request #37 from birarda/upload-task ... add a task for upload in asset-server	2015-08-31 14:55:37 -07:00
Ryan Huffman	d829e973fc	Merge pull request #38 from Atlante45/popup ... Fix Asset Upload popup	2015-08-31 14:47:48 -07:00
Clément Brisset	745f8dfa1b	Merge pull request #39 from huffman/ordered-insertion ... Update message handling to use insertion sort	2015-08-31 23:46:06 +02:00
Stephen Birarda	cb903a8d06	fix the new send asset task	2015-08-31 15:30:18 -06:00