32701 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ericrius1	d8e7da7b73	added painting to whiteboard	2015-09-29 15:43:59 -07:00
David Rowe	e2bee8ec08	Fix particle radius, color, and alpha starts/finishes	2015-09-29 15:40:46 -07:00
ericrius1	648fb7cb8c	Merge branch 'master' into toybox	2015-09-29 15:40:46 -07:00
ericrius1	e7834365f5	Made polyline painting experience smoother- no more flickering	2015-09-29 15:33:39 -07:00
Seth Alves	8f2f14c9e5	keep track of state of avatar-collisions menu-item with global variables rather than per object ones	2015-09-29 15:30:24 -07:00
Seth Alves	2ba686ed89	cleanups	2015-09-29 15:11:52 -07:00
Seth Alves	d554eb8db9	avatar collisions are off during a grab	2015-09-29 15:09:25 -07:00
Brad Hefta-Gaub	04115052b3	Merge pull request #5938 from samcake/calvin ... Fixing the lighting view matrix for stereo again	2015-09-29 15:08:41 -07:00
Brad Hefta-Gaub	f83eae4d42	more debugging	2015-09-29 14:45:24 -07:00
samcake	1bd07b58c3	Fixing the lighting view matrix for stereo again	2015-09-29 14:40:37 -07:00
Seth Alves	b1a133e55c	working on disabling avatar collisions during grab	2015-09-29 14:38:47 -07:00
Brad Hefta-Gaub	07515ce710	Merge pull request #5918 from PhilipRosedale/master ... Throw held objects with velocity from fingertip	2015-09-29 14:37:44 -07:00
unknown	006650f23b	Fix for PR comments	2015-09-29 14:34:23 -07:00
James Pollack	b9a83be4d3	cleanup	2015-09-29 14:31:13 -07:00
James B. Pollack	bbc32cdd1e	Merge pull request #5937 from ericrius1/grabFix ... releaseGrab event now triggered for non physical entities	2015-09-29 14:25:59 -07:00
Brad Hefta-Gaub	00c32fc7cd	Merge pull request #5924 from jherico/marge ... Support for accessing IPD in scripts	2015-09-29 14:24:53 -07:00
Seth Alves	8c98ab9eb6	Merge pull request #5933 from howard-stearns/quiet-other-default-avatars ... Quiet once/second logging/updating of other people's default avatars.	2015-09-29 14:24:18 -07:00
Brad Davis	9b13aac37d	PR comments	2015-09-29 14:23:56 -07:00
ericrius1	7681d8d77d	fixed commenting	2015-09-29 14:05:57 -07:00
ericrius1	644687f330	releaseGrab event now triggered for non physical entities	2015-09-29 14:04:03 -07:00
Seth Alves	e9dd165b1d	try calling updateMotionBehaviorFromMenu	2015-09-29 14:00:22 -07:00
ericrius1	a1f922721a	Merge branch 'toybox' of https://github.com/ericrius1/hifi into toybox	2015-09-29 13:57:20 -07:00
ericrius1	81c5d0c388	more whiteboard work	2015-09-29 13:57:17 -07:00
Seth Alves	d0a1e206ca	Merge branch 'master' of github.com:highfidelity/hifi into transmit-joint-translation	2015-09-29 13:55:13 -07:00
Seth Alves	f7b34f63c1	try calling updateMotionBehaviorFromMenu	2015-09-29 13:40:54 -07:00
Stephen Birarda	f4bc3f8e38	fix a timer leak, line width in PacketList	2015-09-29 16:35:24 -04:00
Brad Hefta-Gaub	6a01c10453	more debug	2015-09-29 13:35:16 -07:00
Brad Hefta-Gaub	9c199b23a2	more debug	2015-09-29 13:32:28 -07:00
Brad Hefta-Gaub	4abb251728	more debug	2015-09-29 13:28:45 -07:00
James Pollack	cbd55ddba6	Add the hoop	2015-09-29 13:24:49 -07:00
Seth Alves	49da3c5034	disable avatar collisions while holding something	2015-09-29 13:24:03 -07:00
James B. Pollack	3bbc809710	Merge pull request #5930 from ericrius1/grabFix ... Setting hand data for close grab of non physical objects	2015-09-29 13:17:21 -07:00
James Pollack	26554c5ac3	whitespace	2015-09-29 13:13:50 -07:00
Brad Hefta-Gaub	fdb9455540	debug	2015-09-29 13:12:55 -07:00
James Pollack	e615c62bd3	Prevent mouse grab from grabbing ungrabbable objects	2015-09-29 13:11:39 -07:00
James B. Pollack	23c9ffa1aa	Merge pull request #8 from imgntn/ericrius1-toybox ... Add fences to master script	2015-09-29 13:06:45 -07:00
Howard Stearns	96e3c722ed	Quiet once/second logging/updating of other people's default avatars.	2015-09-29 13:04:59 -07:00
ericrius1	17035ad9e1	Merge branch 'imgntn-ericrius1-toybox' into toybox	2015-09-29 13:02:15 -07:00
ericrius1	da16a6f55b	fixed merge	2015-09-29 13:02:00 -07:00
James Pollack	c52cd30843	Merge branch 'master' into ericrius1-toybox	2015-09-29 13:01:59 -07:00
James Pollack	f5743aa770	Merge remote-tracking branch 'upstream/master'	2015-09-29 12:58:43 -07:00
James Pollack	66ef92b659	thicker, heavier gates, wand collision shape	2015-09-29 12:52:34 -07:00
ericrius1	06194b6088	fixed formatting	2015-09-29 12:51:01 -07:00
Howard Stearns	745a59af1c	Default animation is anim graph. ... Remove state change logging from animation graph state machine.	2015-09-29 12:48:57 -07:00
Ryan Downe Karpf	64ad3c9e0e	Merge pull request #5931 from ZappoMan/flickeringLightScript ... new flickering light script	2015-09-29 12:06:15 -07:00
Brad Hefta-Gaub	3cf7553c2a	new flickering light script	2015-09-29 11:51:26 -07:00
James Pollack	a58cf66f2e	wand adjustments	2015-09-29 11:07:21 -07:00
James Pollack	63c02712c1	add shape types	2015-09-29 10:52:54 -07:00
James Pollack	337909b539	actual model url	2015-09-29 10:47:32 -07:00
James Pollack	48290a5275	Merge remote-tracking branch 'upstream/master' into ericrius1-toybox	2015-09-29 10:42:32 -07:00