14504 commits

Author	SHA1	Message	Date
Ryan Huffman	b5e3dce376	Add keyhole radius to OctreeQuery	2015-12-10 14:34:28 -08:00
Howard Stearns	d964032572	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc	2015-12-09 15:23:00 -08:00
Philip Rosedale	a580442b92	Merge pull request #6597 from jherico/scorpius ... Fix occasional crashes switching from the Oculus plugin	2015-12-09 10:33:48 -08:00
Philip Rosedale	c93252b134	Merge pull request #6596 from AndrewMeadows/fix-bad-ownership ... fix bad simulation ownership when using edit.js	2015-12-08 17:49:38 -08:00
howard-stearns	32e4967ee0	cleanup	2015-12-08 16:38:05 -08:00
Bradley Austin Davis	2604b49650	Fix occasional crashes switching from the Oculus plugin	2015-12-08 15:41:30 -08:00
howard-stearns	7afc803fb5	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc	2015-12-08 15:30:48 -08:00
howard-stearns	5b41d4da1c	Snapshot of "working" version.	2015-12-08 15:30:23 -08:00
Philip Rosedale	bda4e41958	Merge pull request #6581 from kencooke/audio-reverb ... New reverb parameters	2015-12-08 14:59:58 -08:00
Andrew Meadows	987b8d3334	fix bad simulation ownership when using edit.js	2015-12-08 14:34:25 -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
Brad Davis	43afa440a6	Merge pull request #6588 from huffman/fix-warnings ... Fix warnings	2015-12-08 13:17:30 -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	dffa37c0e7	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-12-08 09:44:50 -08:00
Seth Alves	ec9f1e0754	possible fix for crash when grabbing bubblewand	2015-12-08 09:44:43 -08:00
Ryan Huffman	0759462df7	Remove unused variable in PacketReceiver	2015-12-08 09:38:23 -08:00
Ryan Huffman	71c266bc00	Fix order of initializion in ReceivedMessage	2015-12-08 09:22:17 -08:00
Ryan Huffman	44d740ef57	Remove unused variable 'addr'	2015-12-08 09:22:02 -08:00
Howard Stearns	481fe5a7d0	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc	2015-12-07 18:52:29 -08:00
samcake	d12fdb9726	Merge pull request #6584 from birarda/pref-no-auto ... fix for avatar URL text editing, assert in Model.cpp	2015-12-07 18:11:49 -08:00
Brad Hefta-Gaub	4cbbd252d5	Merge pull request #6587 from jherico/rigel ... Fix crashes on exit due to poor cleanup	2015-12-07 18:04:52 -08:00
Bradley Austin Davis	b7aeb34a8c	Fix crashes on exit due to poor cleanup	2015-12-07 17:50:08 -08:00
James B. Pollack	6cf1ad464f	Merge pull request #6583 from birarda/extension-ci ... use a case insensitive check for extensions in Application	2015-12-07 17:33:03 -08:00
howard-stearns	9512c3f73d	Debugging. ... Please enter the commit message for your changes. Lines starting	2015-12-07 16:58:59 -08:00
howard-stearns	b007617c85	Remove unneeded DisplayPlugin stuff.	2015-12-07 16:56:59 -08:00
Stephen Birarda	6dbff93bbd	fix assert on model URL change from _renderItemsSet	2015-12-07 16:24:26 -08:00
howard-stearns	55cfd1c8b4	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc	2015-12-07 15:49:47 -08:00
Stephen Birarda	7beaf5e235	force asset upload to use a lowercase extension	2015-12-07 15:18:32 -08:00
Seth Alves	0bf276efa5	adjust method names to fit convention	2015-12-07 14:37:35 -08:00
Seth Alves	982e986f1a	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-12-07 14:31:18 -08:00
Seth Alves	f99812a903	adjust method names to fit convention	2015-12-07 14:31:08 -08:00
Brad Davis	353fe774ca	Merge pull request #6572 from howard-stearns/fix-render-rate ... Fix render rate.	2015-12-07 14:12:54 -08:00
Leonardo Murillo	25494ec867	Merge pull request #6562 from Atlante45/baseball ... Baseball	2015-12-07 14:11:21 -08:00
Ken Cooke	86db12acae	Fix naming clash with reserved word	2015-12-07 14:03:11 -08:00
Ken Cooke	4803b3bd9f	Merge branch 'master' of https://github.com/highfidelity/hifi into audio-reverb	2015-12-07 13:08:21 -08:00
Ken Cooke	8683bb5002	New reverb parameters	2015-12-07 13:05:30 -08:00
Clément Brisset	0be35ec6ea	Merge pull request #6578 from hyperlogic/tony/clear-joint-data-bug-fix ... MyAvatar.clearJointData bug fix	2015-12-07 12:18:28 -08:00
Howard Stearns	289c8d6137	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc	2015-12-07 11:54:33 -08:00
Howard Stearns	fc1f312851	Merge branch 'fix-render-rate' into fix-sync-period-calc	2015-12-07 11:54:25 -08:00
Howard Stearns	72ce46af59	Mac-only.	2015-12-07 11:46:36 -08:00
Clément Brisset	42365acef5	Merge pull request #6561 from ZappoMan/cruftRemovalRedux ... More Cruft Removal	2015-12-07 11:39:54 -08:00
Howard Stearns	8666cdd689	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-render-rate	2015-12-07 11:27:30 -08:00
Howard Stearns	8303b63491	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc	2015-12-07 10:11:12 -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
Howard Stearns	34de4d67d8	DisplayPlugin::getLastSynchronizedElapsed	2015-12-07 09:32:12 -08:00
Howard Stearns	df413c0b14	Temporary debugging aids.	2015-12-07 09:31:06 -08:00
Atlante45	cdf621e8d0	Remove unnecessary moveToThread to remove warning	2015-12-07 09:11:41 -08:00
Anthony J. Thibault	fd4ed29405	MyAvatar.clearJointData bug fix ... MyAvatar.setJointRotation() now works properly after MyAvatar.clearJointData()	2015-12-07 09:03:40 -08:00
Ryan Huffman	34138f07bd	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-12-07 08:58:47 -08:00
Atlante45	f8ee377f01	Fix QOpenGL warning	2015-12-07 08:37:07 -08:00