3845 commits

Author	SHA1	Message	Date
Sam Gondelman	8201997a16	Merge pull request #13660 from SamGondelman/parabolic ... Parabolic Picking + Pointers	2018-07-30 10:49:02 -07:00
SamGondelman	6a52b7b8f3	CR improvements	2018-07-26 12:15:12 -07:00
SamGondelman	9b41cb5554	improve model picking performance, scale parabola v/a with avatar, improve followNormal behavior, turn off followNormal on teleport, remove 1 m no teleport spot	2018-07-25 15:19:25 -07:00
amantley	85b7a9b67c	added the changes committed to the hot fix rc70.1 in AvatarConstants.h	2018-07-25 11:31:02 -07:00
SamGondelman	645f905239	cleanup, model performance improvements	2018-07-24 13:25:49 -07:00
SamGondelman	318ef907b8	parabola/polyvox, fixing some bugs	2018-07-24 10:08:35 -07:00
SamGondelman	763e6465a2	followNormal, fixin stuff	2018-07-20 10:41:24 -07:00
SamGondelman	956c1511b6	Merge remote-tracking branch 'upstream/master' into parabolic	2018-07-19 15:23:25 -07:00
SamGondelman	564578aac6	parabola aabox fixes, refactoring some intersection math	2018-07-19 14:54:49 -07:00
SamGondelman	845ddda695	parabola-overlay and -avatar intersection, handle case where acceleration == 0	2018-07-17 12:41:03 -07:00
Seth Alves	4cf706dd96	Merge pull request #13574 from AndrewMeadows/grab-kinematic-children ... more correct kinematic motion of grabbed things	2018-07-11 10:34:44 -07:00
Andrew Meadows	dd6be374fa	cleanup and optimization rotational integration	2018-07-10 11:18:38 -07:00
Anthony Thibault	1d33f51ca4	Merge pull request #13528 from amantley/integratedStepping ... Step Detection From Head and Hands Tracking	2018-07-10 09:59:22 -07:00
SamGondelman	ca5ce888f4	parabola triangle intersection	2018-07-09 18:11:57 -07:00
SamGondelman	fcc523fbef	parabola sphere intersection	2018-07-09 15:15:36 -07:00
amantley	a2f8e024fb	added avatar constants changed for posterior and head velocity	2018-07-09 13:59:56 -07:00
amantley	55ae08c071	Merge remote-tracking branch 'upstream/master' into integratedStepping	2018-07-09 13:55:59 -07:00
Alexander Ivash	fb1a2037e3	move specifying custom properties for preferences dialog from C++ to QML (per Dante's request)	2018-07-06 21:00:55 +03:00
Alexander Ivash	2c07aa787f	allow passing properties to preferences; left align 'User real-world height' & right-align 'reset sensors' (Mukul's request)	2018-07-06 21:00:54 +03:00
SamGondelman	bbe9a0005d	parabola vs. web and text	2018-07-05 17:02:55 -07:00
SamGondelman	7130b5aa7f	fixing findRayIntersection bugs	2018-07-05 10:27:12 -07:00
Anthony Thibault	f56c0a3a3f	Merge pull request #13502 from luiscuenca/eyelidFix ... Fix closed eyelids when head is tilted down	2018-07-05 08:50:22 -07:00
SamGondelman	bfcf4f7865	add parabola test, performance optimization	2018-07-03 15:14:43 -07:00
SamGondelman	90091d11e4	parabola picks, started implementing math	2018-07-03 09:47:31 -07:00
amantley	7f5f762208	fixing merge conflict	2018-07-02 15:54:21 -07:00
amantley	096d0d2827	reorganized the step detection code, creating a shouldActivateHorizontalCG that calls all the step detection conditionals. The average rotation and the mode are now calculated in MyAvatar::update	2018-07-02 15:43:57 -07:00
luiscuenca	97a0edf026	spaces	2018-06-29 14:38:43 -07:00
luiscuenca	24d03ace4c	Changes from CR and decreased looking at angle to mitigate freaky eyes	2018-06-29 14:34:17 -07:00
John Conklin II	b9439d1e6b	Merge pull request #13384 from ctrlaltdavid/21892 ... Fix entity detaching from head joint not becoming visible	2018-06-27 12:32:52 -07:00
John Conklin II	c1d949351e	Merge pull request #13399 from kitely/roll-log-on-startup ... Always roll hifi-log.txt when starting	2018-06-27 12:32:20 -07:00
Sam Gondelman	fbe54437b8	Merge pull request #13409 from humbletim/add-raypick-shapeID ... Include shapeID in RayPick results	2018-06-26 10:25:39 -07:00
David Rowe	40fb627504	Merge branch 'master' into 21892	2018-06-25 16:04:44 +12:00
Sam Gondelman	850e2d5cf5	Merge branch 'master' into particleFix	2018-06-21 17:32:24 -07:00
SamGondelman	8f411ad6c8	CR	2018-06-20 16:13:10 -07:00
SamGondelman	12a5d8b550	quiet ubuntu warnings, particle properties show radians	2018-06-19 12:51:35 -07:00
humbletim	dc5c5c20df	raypick partIndex commit ... include shapeID for accessing proper material index add raypick shapeID test script	2018-06-18 18:22:30 -04:00
Andrew Meadows	085130e3c9	avatars collide again again	2018-06-18 13:17:32 -07:00
Oren Hurvitz	0cb77362e8	Always roll hifi-log.txt when starting. ... Otherwise the active log file ("hifi-log.txt") contains lines from both previous sessions and the current session, which is confusing.	2018-06-17 13:44:14 +03:00
David Rowe	be4b929301	Fix cauterization when reparent entity to a different joint	2018-06-16 16:31:06 +12:00
Clément Brisset	11d84e780d	Merge pull request #13283 from huffman/feat/uncompressed-ktx-in-texmeta ... Add uncompressed KTX files to baked texture output	2018-06-13 11:49:41 -07:00
John Conklin II	99b5835098	Merge pull request #13344 from birarda/feat/new-version-numbers ... handle semantic version numbers in interface/sandbox update	2018-06-13 11:16:56 -07:00
Anthony J. Thibault	042f902d2e	Merge branch 'master' into scriptedBlendshapesFaceFlags	2018-06-11 17:13:30 -07:00
Ryan Huffman	38df5d3db5	Merge branch 'master' of github.com:highfidelity/hifi into feat/uncompressed-ktx-in-texmeta	2018-06-11 16:17:56 -07:00
Anthony Thibault	044d142635	Merge pull request #13133 from amantley/nativeCGCode ... Center of Gravity Leaning	2018-06-08 17:53:55 -07:00
Stephen Birarda	9506e7edbe	check for update for dev-builds, handle semantic version	2018-06-08 17:20:57 -07:00
Anthony J. Thibault	c3da4e74de	Code review feedback	2018-06-08 16:22:00 -07:00
Ryan Huffman	faafd26d2a	Add uncompressed KTX files to baked texture output	2018-06-08 11:39:47 -07:00
amantley	913d78841d	Merge remote-tracking branch 'upstream/master' into scriptedBlendshapes ... synching with upstream master	2018-06-07 16:20:11 -07:00
amantley	67fc7b90b5	fixed get and set semi nibble to deal with 16 bits	2018-06-07 15:43:21 -07:00
amantley	dca93ca61f	fixed setatone16 function to return the correct result for additional flags	2018-06-06 16:44:12 -07:00