13851 commits

Author	SHA1	Message	Date
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
Brad Hefta-Gaub	021a6e689d	added some asserts to test future mistakes that would cause render item leaks	2015-11-09 17:09:17 -08:00
Brad Hefta-Gaub	e47b049200	fix render item leak on Model::reset()	2015-11-09 16:41:40 -08:00
U-GAPOS\andrew	390310f822	swap the order of checks	2015-11-09 14:15:09 -08:00
U-GAPOS\andrew	c07b97920e	fix for avatars created with blender	2015-11-09 14:11:45 -08:00
U-GAPOS\andrew	2716a9f2b4	fix IK for feet targets	2015-11-09 13:11:03 -08:00
Eric Levin	7700e67734	Merge pull request #6326 from imgntn/entity_params ... Add Ability to Pass Parameters When Calling Methods on Entities	2015-11-09 12:17:58 -08:00
James B. Pollack	1812444614	Merge pull request #6278 from ericrius1/particleSorting ... Added additiveBlending property to particle effect entity	2015-11-09 11:32:44 -08:00
Brad Davis	07be03dc7e	Bad merge fix, PR feedback	2015-11-09 09:30:18 -08:00
Brad Davis	2ecc4f8a5c	Prevent sixense manager from triggering continuous reset	2015-11-09 09:16:32 -08:00
Seth Alves	f3d26e163d	turn _drawItemStatus into a bitfield, split out bounding boxes and network/physics-sim-ownership. hook Display-Simulation-Ownership menu item to this system	2015-11-07 07:19:27 -08:00
Clément Brisset	2c27d18922	Merge pull request #6282 from jherico/externals ... Runtime plugins fixes	2015-11-06 19:30:40 -08:00
Brad Davis	e84f3af483	Merge pull request #6343 from Atlante45/sixense ... Sixense cleanup	2015-11-06 17:50:12 -08:00
Atlante45	68a72b0f41	Bit of cleanup	2015-11-06 17:28:51 -08:00
Brad Davis	6122fa145d	More PR feedback	2015-11-06 17:17:26 -08:00
Atlante45	137a2c1c48	Fix file headers	2015-11-06 17:15:34 -08:00
samcake	07fb3a0532	Merge pull request #6341 from howard-stearns/for-sam ... Make life easier for Sam.	2015-11-06 17:13:22 -08:00
Howard Stearns	314c11e8d4	Make life easier for Sam.	2015-11-06 16:59:46 -08:00
Brad Davis	37a9538f10	PR feedback, ensure destruction of shared objects	2015-11-06 16:57:31 -08:00
Brad Davis	11733c039f	Allow shared libraries to access core global objects	2015-11-06 16:57:31 -08:00
Atlante45	6323728d7a	Added perfect forwarding of arguments	2015-11-06 16:56:48 -08:00
Atlante45	d95709ee73	Added input plugins logging category	2015-11-06 16:45:23 -08:00
Atlante45	0a65bb145b	Some more code cleanup	2015-11-06 16:44:28 -08:00
samcake	7890aa6ec1	Merge pull request #6333 from jherico/rec2 ... Adding clip serialization implementation, tests	2015-11-06 16:38:39 -08:00
Atlante45	6ad20e417b	Typo	2015-11-06 16:33:36 -08:00
Atlante45	e3b54f0272	Cleanup	2015-11-06 16:33:29 -08:00
Atlante45	503e03d4a8	Remove unused using	2015-11-06 16:33:22 -08:00
Atlante45	96aa5be457	Implement all Sixense methods for OS X	2015-11-06 16:33:16 -08:00
Atlante45	298ac650d8	Isolate sixense dynamic linking for OSX	2015-11-06 16:33:07 -08:00
Clément Brisset	143e92ee1b	Merge pull request #6300 from jherico/lisa ... Breaking up InputDevices and InputPlugins, cleanup of some shared_ptr madness	2015-11-06 16:15:53 -08:00
Brad Davis	bf70ae4724	PR feedback	2015-11-06 15:59:13 -08:00
Brad Davis	7c433f47c0	Breaking up input devices and input plugins classes.	2015-11-06 15:20:00 -08:00
Andrew Meadows	e410030dd9	Merge pull request #6320 from hyperlogic/tony/blender-avatar-ik-fix ... IK fix for avatars exported from Blender	2015-11-06 15:00:25 -08:00
Brad Davis	4513b638db	Adding clip serialization implementation, tests	2015-11-06 14:40:21 -08:00
James B. Pollack	8eea7ff67c	Merge pull request #6329 from sethalves/fix-grab-release ... send to server upon grab release	2015-11-06 14:33:08 -08:00
James B. Pollack	e928c8278b	overload a single function and cleanup, add examples	2015-11-06 11:48:51 -08:00
Brad Davis	1dc392bb36	Merge pull request #6330 from Atlante45/master ... // FIXME incredibly evil....	2015-11-06 11:43:33 -08:00
samcake	640845c944	Merge pull request #6328 from jherico/rec2 ... Add recording classes	2015-11-06 11:39:14 -08:00
Seth Alves	bc516c0b86	use render-item status getters to display physics debugging information	2015-11-06 11:32:56 -08:00
Brad Davis	0bf29a441f	Add recording classes	2015-11-06 11:14:46 -08:00
Atlante45	e630f3072e	Bit of cleanup	2015-11-06 11:14:10 -08:00
Atlante45	c53c0ec53f	Fix double delete on shutdown	2015-11-06 11:13:10 -08:00
Stephen Birarda	ed960b02ec	Merge pull request #6291 from zzmp/fix/script-engine-run-bail ... Bail early from ScriptEngine::run if stopped	2015-11-06 10:05:02 -08:00
samcake	63106f6991	Merge pull request #6322 from Atlante45/record ... Recording fixes from Clement.	2015-11-06 09:28:58 -08:00
Seth Alves	4ed8a1e5d1	changes to send an update to entity-server when AvatarActionHold releases an entity	2015-11-06 09:25:53 -08:00
Atlante45	dbe25651cf	constify audio client loop	2015-11-05 16:57:51 -08:00
James B. Pollack	3cee569bae	pass parameters to entities	2015-11-05 16:57:39 -08:00
Atlante45	6c35ae48b0	Don't allocate big samples array in tight loop	2015-11-05 16:52:38 -08:00