952 commits

Author	SHA1	Message	Date
Seth Alves	2dd40beed5	formatting	2015-12-10 10:42:25 -08:00
Seth Alves	a59af2c1b2	Merge branch 'master' of github.com:highfidelity/hifi into no-physics-until-ready	2015-12-10 09:03:57 -08:00
Seth Alves	d09f70239c	make entity-tree a global. change how network-requests to load model geometry are triggered	2015-12-10 09:03:53 -08:00
James B. Pollack	4e93f3ae81	respect visibility yay	2015-12-09 18:26:13 -08:00
James B. Pollack	b4c272aaa1	sam just left	2015-12-09 17:28:45 -08:00
Seth Alves	47df744552	Merge branch 'update-model-during-simulate' of github.com:sethalves/hifi into no-physics-until-ready	2015-12-09 12:40:18 -08:00
Seth Alves	4d60c7bbc0	update model location with SpatiallyNestable's locationChanged call	2015-12-09 10:42:32 -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	4b5fec4b00	clean up, minimize diff	2015-11-26 08:36:41 -08:00
Seth Alves	4ab2bfa854	clean up, minimize diff	2015-11-26 08:35:28 -08:00
Seth Alves	c96a09976e	Merge branch 'master' of github.com:highfidelity/hifi into update-model-during-simulate	2015-11-26 08:32:17 -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
Seth Alves	09f14bc9a5	guard against nullptr deferenece	2015-11-23 16:51:17 -08:00
Seth Alves	5cd047da15	move some more code over	2015-11-23 16:49:36 -08:00
Seth Alves	cfcff42004	missed a line	2015-11-23 16:41:16 -08:00
Seth Alves	283ad7ffd9	try, try again	2015-11-23 16:39:19 -08: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
Seth Alves	89e5b11f9e	do this from update rather than simulate	2015-11-23 16:17:22 -08:00
Seth Alves	7b70562a1b	update RenderableModelEntityItem::_model during simulate rather than during render	2015-11-23 15:51:43 -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