32449 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ericrius1	259391a40b	Merge branch 'toybox' of https://github.com/ericrius1/hifi into toybox	2015-09-29 18:32:56 -07:00
ericrius1	ba17225c19	Remove hand control script from PR	2015-09-29 18:32:52 -07:00
Eric Levin	68615e171a	Update masterResetEntity.js	2015-09-29 17:40:05 -07:00
ericrius1	d8e7da7b73	added painting to whiteboard	2015-09-29 15:43:59 -07:00
ericrius1	648fb7cb8c	Merge branch 'master' into toybox	2015-09-29 15:40:46 -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
samcake	1bd07b58c3	Fixing the lighting view matrix for stereo again	2015-09-29 14:40:37 -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 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
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
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 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
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
ericrius1	932f7ce92c	up to date	2015-09-29 10:39:07 -07:00
ericrius1	35e4ec17ea	add which hand for near grab of non physical objects	2015-09-29 10:35:38 -07:00
ericrius1	4a64245ae5	Merge branch 'master' of https://github.com/ericrius1/hifi	2015-09-29 10:33:11 -07:00
ericrius1	d07c93ef8f	adds hand setting when grabbing near non physical objects	2015-09-29 10:22:03 -07:00
ericrius1	1662471583	whiteboard changes	2015-09-29 10:16:44 -07:00
samcake	a7e3ec58b9	Merge pull request #5927 from ZappoMan/fixSkybox ... fix skybox not always loading when you haven't moved or if the texture is slow in loading	2015-09-29 10:04:49 -07:00
Brad Hefta-Gaub	dccf121cd3	Merge pull request #5928 from jherico/homer ... Disabling vertex attrib format due to crashes	2015-09-29 10:01:36 -07:00
James Pollack	1ceefc3c63	add model key and url	2015-09-29 10:00:45 -07:00
Brad Hefta-Gaub	c201ed1b04	Merge pull request #5926 from samcake/calvin ... HIghlight issue not solved, but a few fixes along the way	2015-09-29 10:00:30 -07:00
Brad Davis	daf803e8ea	Disabling vertex attrib format due to crashes	2015-09-29 09:52:41 -07:00
ericrius1	c4be6e2fb2	Merge branch 'master' into toybox	2015-09-29 09:47:13 -07:00
ericrius1	8857042363	whiteboard	2015-09-29 09:46:49 -07:00
samcake	73b458c72e	Cleaning the normal texture load path	2015-09-29 09:38:01 -07:00
Brad Hefta-Gaub	2040fb4507	fix skybox not always loading when you haven't moved or if the texture is slow in loading	2015-09-29 09:32:34 -07:00
samcake	103e1c76b3	Member initialization respecting the standard	2015-09-29 09:26:29 -07:00
samcake	8a8411c8d1	Merge branch 'master' of https://github.com/highfidelity/hifi into calvin	2015-09-29 09:15:53 -07:00
ericrius1	80405450ce	Paint can now just sprays out stream	2015-09-29 09:00:12 -07:00
Brad Hefta-Gaub	8da52e2f17	Merge pull request #5906 from kencooke/audio-src ... Algorithmic optimization of new resampler	2015-09-28 20:44:27 -07:00