12834 commits

Author	SHA1	Message	Date
Stephen Birarda	789235b8c7	make NodeList deleter be deleteLater	2015-07-14 15:28:38 -07:00
Stephen Birarda	e2188415fe	fix ref to qApp, connection to audioIO	2015-07-14 14:45:26 -07:00
Stephen Birarda	4dd3dd6386	swap m for comma in Menu	2015-07-14 14:44:04 -07:00
Stephen Birarda	23548a99bc	move NACK packet disabling to EntityEditPacketSender	2015-07-14 14:43:01 -07:00
Stephen Birarda	8d4c945874	cleanup audioIO connections in Application	2015-07-14 14:34:39 -07:00
Stephen Birarda	1f4ac0f17c	emit mutedByMixer signal for a noisy mute	2015-07-14 14:30:46 -07:00
Stephen Birarda	d617b71232	remove SharedNodePointer from some packet callbacks	2015-07-14 14:27:26 -07:00
Stephen Birarda	0637f589b5	add PacketListener to help unregister for packets	2015-07-14 13:52:38 -07:00
Stephen Birarda	34f9b1881e	fix registration of OctreePacketProcessor for set of types	2015-07-13 15:40:55 -07:00
Stephen Birarda	ca1ff9b0f5	fix a couple of compile errors for avatar changes	2015-07-13 13:34:36 -07:00
Stephen Birarda	859122db5d	update signature of callbacks for avatar packets	2015-07-13 13:32:46 -07:00
Stephen Birarda	d990420565	repairs to octree packet receiving in interface	2015-07-13 13:10:57 -07:00
Stephen Birarda	264f39fa59	resolve conflicts on merge with upstream/master	2015-07-13 11:25:24 -07:00
Stephen Birarda	f3d5b8f7c6	add a missing semicolon	2015-07-13 11:18:20 -07:00
Stephen Birarda	3d62162812	cleanup octree networking code to use new API	2015-07-13 09:40:26 -07:00
Seth Alves	fb23eb0faf	Merge pull request #5301 from samcake/yellow ... Rename gpu::Batch::setUniformTexture into gpu::Batch::setResourceTexture	2015-07-12 11:36:03 -07:00
Andrew Meadows	9ce9c541de	fix activation of object when action changes	2015-07-10 18:45:40 -07:00
Stephen Birarda	ffcd8e1613	update connection for packet version mismatch	2015-07-10 17:54:51 -07:00
Stephen Birarda	9ee62a8a38	fix for connection denied packet in Application	2015-07-10 17:52:51 -07:00
Sam Gateau	98f10e72ec	fix the wrong function name that happened missing a merge	2015-07-10 15:20:49 -07:00
Ryan Huffman	dee117500b	Remove process() from OctreePacketProcessor	2015-07-10 15:00:46 -07:00
Ryan Huffman	99aaefbd03	Fix and update signature of Application::handleDomainConnectionDeniedPacket	2015-07-10 15:00:29 -07:00
Ryan Huffman	6e53a5ad97	Update OctreePacketProcessor to use SharedNodePointer	2015-07-10 14:23:09 -07:00
Andrew Meadows	9cb7e86877	cleanup of AvatarActionHold deserialization	2015-07-10 12:34:12 -07:00
Sam Gateau	2c05349b06	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-10 11:10:07 -07:00
Sam Gateau	7fc9fd97ff	Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers.	2015-07-10 11:03:12 -07:00
Andrew Meadows	1759f0553d	Merge pull request #5290 from BingShearer/CrashFixes ... Crash fixes	2015-07-10 10:42:47 -07:00
Ryan Huffman	78ff6477bd	Update OctreePacketProcessor to use QSharedPointer<NLPacket>	2015-07-10 08:45:21 -07:00
Brad Hefta-Gaub	33016e2797	Merge pull request #5293 from jherico/bart ... More profiling ranges and updated performance testing scripts	2015-07-09 19:10:45 -07:00
Brad Hefta-Gaub	af20969eb9	Merge pull request #5298 from jherico/lisa ... Restore audio scope	2015-07-09 19:03:29 -07:00
Brad Hefta-Gaub	74ef91550c	Merge pull request #5296 from venkatn93/master ... Entities are now added/removed from rendering based on Scene.shouldRenderEntities	2015-07-09 18:54:06 -07:00
Brad Davis	a92a7980d7	Restore audio scope	2015-07-09 17:49:25 -07:00
Andrew Meadows	270ea7af9e	Merge pull request #5292 from sethalves/palm-rotation ... action changes to allow "hold" action to track palm rotation	2015-07-09 17:44:28 -07:00
Niraj Venkat	007d662db1	Re-added for shouldRenderEntities	2015-07-09 17:40:14 -07:00
Niraj Venkat	706f85e4ce	Fixes to comply with coding standard	2015-07-09 17:31:38 -07:00
Seth Alves	d0d0b2a143	Merge pull request #5295 from birarda/master ... potential fix for windows domain connect cycling	2015-07-09 17:04:06 -07:00
Niraj Venkat	adf5b95835	Changing formatting	2015-07-09 16:25:29 -07:00
Niraj Venkat	52095fd38d	Fixing merge	2015-07-09 16:23:40 -07:00
Niraj Venkat	1dce5f80cc	Entities are now added/removed from rendering based on Scene.shouldRenderEntities	2015-07-09 16:17:58 -07:00
Brad Davis	214405a0e5	Fixing typo	2015-07-09 16:06:27 -07:00
Ryan Huffman	2380fb23c3	Update OctreePacketProcessor to use NLPacket&	2015-07-09 16:05:52 -07:00
Stephen Birarda	efb89c281f	fix creation of QTimer parented by NodeList	2015-07-09 16:02:29 -07:00
Stephen Birarda	a4f1145f06	fix QTimer connection to nodeList	2015-07-09 16:01:41 -07:00
Stephen Birarda	408ecb9735	move domain server check in timer to node thread	2015-07-09 15:59:32 -07:00
Brad Davis	446f800aee	More profiling ranges and updated performance testing scripts	2015-07-09 15:43:30 -07:00
Ryan Huffman	6f9907a22d	Stub in process() for OctreePacketProcessor	2015-07-09 15:31:45 -07:00
Ryan Huffman	8da50d342c	Remove DatagramProcessor.h from Application	2015-07-09 15:31:01 -07:00
Ryan Huffman	5e65f422fa	Move mute environment handling to Application	2015-07-09 15:30:25 -07:00
Bing Shearer	99c563602f	Fixed Else case where _renderImage is true but the texture has 0 size, else case did not previously exist.	2015-07-09 15:25:37 -07:00
Seth Alves	2dc4922da3	bring over code from entity-level-locking branch	2015-07-09 15:23:05 -07:00