32776 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	febdb52b26	Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab	2015-10-06 09:20:13 -07:00
Seth Alves	c3142ab90b	include setVelocity in returned arguments	2015-10-06 09:20:07 -07:00
Seth Alves	91f5a6fec6	make setting of rigid-body velocity controlled by an action argument	2015-10-06 08:08:33 -07:00
Brad Hefta-Gaub	a554f3afb7	Merge pull request #5996 from cozza13/20701 ... CR for Job #20701 - Create a menu for HMD stereo and mono eye switching/	2015-10-05 17:22:36 -07:00
Brad Hefta-Gaub	d95fe3ddb7	Merge pull request #5989 from jherico/homer ... Enabling programmatic access to the IPD scale	2015-10-05 17:22:19 -07:00
Brad Hefta-Gaub	d5663ed773	Merge pull request #5946 from jherico/nelson ... Improved procedural surfaces, textures and additional standard uniforms	2015-10-05 17:12:32 -07:00
Clément Brisset	b2ef114e13	Merge pull request #5993 from imgntn/furniture_adjustments ... [Scripts] Toybox Furniture adjustments	2015-10-05 17:09:55 -07:00
Clément Brisset	5eda3095bb	Merge pull request #5998 from birarda/qt-5.5 ... suppress warnings for overriden methods in Xcode 7	2015-10-05 17:00:43 -07:00
Stephen Birarda	d48f17e0e1	Merge pull request #5995 from Atlante45/log ... Make log more readable	2015-10-05 16:04:47 -07:00
Stephen Birarda	5989cad054	add override qualifier to suppress warnings in entities-renderer	2015-10-05 15:55:05 -07:00
Stephen Birarda	7bd98354d8	add override to supress warnings in ui-test	2015-10-05 15:53:52 -07:00
Stephen Birarda	25a1f2dd11	add override to suppress warning for PluginContainerProxy	2015-10-05 15:53:37 -07:00
Stephen Birarda	a2c9d7a4b2	add overrides for Avatar classes in Interface	2015-10-05 15:52:47 -07:00
Stephen Birarda	3ddfcc10c2	override additions to input-plugins	2015-10-05 15:50:35 -07:00
Chris Collins	c0a881ec52	added the correct call ... added the correct call	2015-10-05 15:37:04 -07:00
Chris Collins	1e01d6bd8f	Add the ability to switch between mono and stereo in HMD ... Add the ability to switch between mono and stereo in HMD	2015-10-05 15:30:53 -07:00
Stephen Birarda	e835b5ccf3	remove old gnutls code from domain-server	2015-10-05 15:30:26 -07:00
Anthony Thibault	2a406481d4	Merge pull request #5992 from howard-stearns/reset-on-calibration ... Reset (as though by apostrophe key) whenever we calibrate the hydra.	2015-10-05 15:19:16 -07:00
Stephen Birarda	9bc95a0fc1	fix override warnings in assignment-client	2015-10-05 15:17:10 -07:00
Clément Brisset	70b9b1eb77	Merge pull request #5985 from hyperlogic/tony/anim-warning-fix ... animation lib warning fixes	2015-10-05 15:03:47 -07:00
Atlante45	598aab884e	Make log more readable	2015-10-05 14:59:28 -07:00
Seth Alves	99be44f92d	smooth out vibrating appearance for kinematic hold	2015-10-05 14:58:42 -07:00
Seth Alves	7f8411d947	reference count grabs on an entity	2015-10-05 14:15:38 -07:00
James B. Pollack	8cd549c958	adjust chair and plant starting positions	2015-10-05 14:02:24 -07:00
Seth Alves	635c83dad1	reset gravity and ignore-for-collisions after grabs have released	2015-10-05 13:39:01 -07:00
Eric Levin	3f684307e9	Merge pull request #5990 from highfidelity/revert-5987-20699 ... Revert "QA for 20699 - Sanitize particle property values when set"	2015-10-05 13:36:21 -07:00
Eric Levin	c72c87b59c	Revert "QA for 20699 - Sanitize particle property values when set"	2015-10-05 13:35:58 -07:00
Eric Levin	d0f0aae885	Merge pull request #5987 from ctrlaltdavid/20699 ... QA for 20699 - Sanitize particle property values when set	2015-10-05 13:13:16 -07:00
Seth Alves	7f84e882c5	attempt to keep ignoreForCollisions the same before and after grab	2015-10-05 13:06:39 -07:00
Seth Alves	8f924f0be4	merge from upstream	2015-10-05 13:05:37 -07:00
Howard Stearns	844270e306	Reset (as though by apostrophe key) whenever we calibrate the hydra.	2015-10-05 12:44:22 -07:00
Andrew Meadows	1ead20683c	Merge pull request #5976 from sethalves/fix-action-deletes ... Fix action deletion/addition when more than one interface are involved	2015-10-05 12:31:01 -07:00
Anthony J. Thibault	75849db867	Changed (float)fabs() to fabsf()	2015-10-05 12:00:02 -07:00
Seth Alves	993111d22f	code review	2015-10-05 11:28:59 -07:00
James B. Pollack	2e293718fc	Merge remote-tracking branch 'upstream/master'	2015-10-05 10:06:41 -07:00
Seth Alves	8c25f2e16c	Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab	2015-10-05 09:09:01 -07:00
Brad Davis	725ed26ac2	Enabling programmatic access to the IPD scale	2015-10-04 16:55:49 -07:00
David Rowe	53e85e8566	Tidying	2015-10-03 09:59:33 -07:00
David Rowe	510065fe5c	Fix particle property maxParticles not being able to be set properly	2015-10-03 09:16:07 -07:00
Brad Davis	c8aea67505	Working on texture compatibility with Shadertoy	2015-10-02 19:09:43 -07:00
David Rowe	88937318d8	Merge branch 'master' into 20699 ... Conflicts: libraries/entities/src/ParticleEffectEntityItem.h	2015-10-02 18:39:50 -07:00
Seth Alves	a42bb5f533	Merge pull request #5981 from ericrius1/sprayCanFix ... No longer removing non-existent entities from spray paint can; color …	2015-10-02 17:56:51 -07:00
Seth Alves	26310d8ce4	kill gravity in near-held objects	2015-10-02 17:54:09 -07:00
David Rowe	67a497cda3	Sanitize particle properties and their use ... Excluding animationSetings because it's unused and will be removed.	2015-10-02 17:37:59 -07:00
Seth Alves	6a770a870b	set correct type in kinematic hold	2015-10-02 17:31:45 -07:00
James Pollack	2600fe577e	Merge remote-tracking branch 'upstream/master'	2015-10-03 01:24:41 +01:00
Seth Alves	89c848d8c8	fix up kinematic hold	2015-10-02 17:14:53 -07:00
Howard Stearns	fdba55e56e	Merge pull request #5973 from ctrlaltdavid/20698 ... Fix Reload Content menu item not reloading FST files	2015-10-02 16:43:11 -07:00
Anthony J. Thibault	b6b57de1c6	animation lib warning fixes	2015-10-02 16:42:50 -07:00
Howard Stearns	a5a7c16466	Merge pull request #5789 from highfidelity/revert-5777-revert-5769-edit-js-adjustment ... edit.js adjustment	2015-10-02 16:28:54 -07:00