937 commits

Author	SHA1	Message	Date
James B. Pollack	b4c272aaa1	sam just left	2015-12-09 17:28:45 -08:00
Brad Hefta-Gaub	1356fb15aa	Merge pull request #6591 from jherico/zaan ... Add sphere and cube triangle counts to displayed stats	2015-12-08 13:27:37 -08:00
Bradley Austin Davis	011a43d5f2	Add sphere and cube triangle counts to displayed stats	2015-12-08 11:08:22 -08:00
Seth Alves	f99812a903	adjust method names to fit convention	2015-12-07 14:31:08 -08:00
Clément Brisset	390836b64e	Merge pull request #6431 from huffman/proto-received-message ... Combine Packet and PacketList into ReceivedMessage on receiving end	2015-12-07 09:58:52 -08:00
Atlante45	18198cb6fb	Fix missing override	2015-12-07 08:36:49 -08:00
Seth Alves	96e9580473	change some more parameters back to being pass-by-reference, where it's safe	2015-12-07 05:30:19 -08:00
Seth Alves	a948ae5f19	children of avatar joints might be right, now	2015-12-06 10:48:00 -08:00
Ryan Huffman	89c412c324	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-12-04 11:38:28 -08:00
Brad Hefta-Gaub	d07629489c	Merge pull request #6543 from Atlante45/pointer ... gpu::Shader::create* return shared_ptr	2015-12-04 11:17:02 -08:00
Brad Hefta-Gaub	d9a1563396	Merge pull request #6152 from sethalves/parents ... Parents	2015-12-04 10:26:57 -08:00
Atlante45	cb758ca6b4	Fix override warnings on XCode 7	2015-12-04 08:55:43 -08:00
Atlante45	3da80f5861	gpu::Shader::create* return shared_ptr	2015-12-03 14:56:07 -08:00
Seth Alves	b7ebe5b92b	merge from upstream	2015-11-30 16:59:52 -08:00
Ryan Huffman	99dd9646bc	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-11-30 10:20:13 -08:00
Seth Alves	cf39cac7fc	attempt to make SpatiallyNestable data access thread-safe	2015-11-29 12:50:33 -08:00
Seth Alves	ca75802b9c	unmangle merge	2015-11-26 06:43:28 -08:00
Anthony J. Thibault	23def8d173	Merge branch 'master' into tony/remove-joint-states	2015-11-25 13:55:23 -08:00
Clément Brisset	5ff482071e	Merge pull request #6465 from ericrius1/polyLineFix ... moved logic to build vertex buffer to renderable polyline class, recalculati…	2015-11-25 11:02:02 -08:00
Anthony J. Thibault	f120e10ff4	Merge branch 'master' into tony/remove-joint-states	2015-11-24 15:00:05 -08:00
Brad Hefta-Gaub	fd7a704753	Merge pull request #6471 from birarda/url-cmp ... fix unnecessary model URL updating thanks to URL encoding	2015-11-24 10:56:21 -08:00
Ryan Huffman	dac491ef41	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-11-24 09:59:22 -08:00
Stephen Birarda	5a7b0dd1ad	put the parsed model URL in ModelEntityItem	2015-11-24 11:46:51 -06:00
Stephen Birarda	0d6b919448	cleanup printing of updated model URL	2015-11-24 11:22:30 -06:00
Stephen Birarda	0e19e50047	cleaner handling for QString/QUrl conversion/comparison	2015-11-24 11:17:46 -06:00
Brad Hefta-Gaub	ce46c30647	change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete	2015-11-23 16:27:06 -08:00
Stephen Birarda	6339c2c48f	fix for unnecessary model URL updating	2015-11-23 17:25:31 -06:00
Seth Alves	ba30e01664	include global position in avatar-mixer protocol so server knows where avatars are in world-space	2015-11-23 14:12:49 -08:00
Seth Alves	a08bad8cbd	for models, relay getJointRotation and getJointTranslation to the model	2015-11-23 13:46:32 -08:00
ericrius1	1409ed2d18	moved logic to build vertices buffer to renderable class, recalculating vertices anytime any of the normals, point, or strokeWidths data changes	2015-11-23 12:28:44 -08:00
Anthony J. Thibault	821264a031	Merge branch 'master' of github.com:highfidelity/hifi into tony/remove-joint-states	2015-11-22 16:15:03 -08:00
Seth Alves	4646c0c103	unmangle merge	2015-11-21 10:49:31 -08:00
Seth Alves	f013f95e9b	merge from upstream	2015-11-21 08:43:00 -08:00
Anthony J. Thibault	cb89f09635	Removed EntityRig and AvatarRig. One Rig to rule them all.	2015-11-20 14:27:01 -08:00
Anthony J. Thibault	a77ea8da43	Removed JointStates! You won't be missed.	2015-11-20 14:15:37 -08:00
Ryan Huffman	2a416ebc61	Merge branch 'master' of https://github.com/highfidelity/hifi into received-message	2015-11-18 16:52:23 -08:00
Ryan Huffman	2fe9af54d4	Add textures property to polyline	2015-11-18 13:59:32 -08:00
Seth Alves	715a46ee82	show actions in status icons	2015-11-11 16:35:04 -08:00
Seth Alves	f07d5d9d3f	show network and physics status on boxes and spheres	2015-11-11 11:32:12 -08:00
Seth Alves	c2b0ccd6b3	show simulation ownership with status icons	2015-11-11 08:30:04 -08:00
Seth Alves	4cf84a4e5b	use makeEntityItemStatusGetters from more entity types	2015-11-10 17:14:09 -08:00
Seth Alves	7b4dd9a908	Merge branch 'rework-visual-physics-debug' of github.com:sethalves/hifi into rework-visual-physics-debug	2015-11-10 17:06:16 -08:00
Seth Alves	39b92d2b52	terse log when ownership changes	2015-11-10 17:06:12 -08:00
Seth Alves	66387c4530	use icons to show network and physics status	2015-11-10 17:02:57 -08:00
Seth Alves	b9ca509f07	Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup	2015-11-10 09:50:12 -08:00
Seth Alves	d535109caf	attempt to fix render-collision hull feature	2015-11-10 09:49:31 -08:00
Brad Hefta-Gaub	0ea901fd72	fix various warnings	2015-11-10 08:34:58 -08:00
Seth Alves	bc516c0b86	use render-item status getters to display physics debugging information	2015-11-06 11:32:56 -08:00
ericrius1	af0c0e6a1b	spacing fix	2015-11-03 17:32:22 -08:00
ericrius1	31fe5fa953	Bump version num, use different shader for additive blending effect	2015-11-03 17:15:10 -08:00