5463 commits

Author	SHA1	Message	Date
ericrius1	d65479be77	Merge branch 'master' into growingPlant	2016-02-26 08:55:21 -08:00
Andrew Meadows	ef433c0e01	legacy support for EntityViewer.setKeyholeRadius()	2016-02-25 22:24:37 -08:00
Brad Hefta-Gaub	25634ea0ca	Merge pull request #7204 from PhilipRosedale/betterLeap ... Leap Motion can near grab entities	2016-02-25 17:48:56 -08:00
PhilipRosedale	4845de68dd	fixed typo	2016-02-25 17:29:53 -08:00
PhilipRosedale	0cc1c930c5	mapped finger curl to trigger value	2016-02-25 17:04:46 -08:00
Philip Rosedale	86d6d255fa	Merge pull request #7199 from sethalves/fix-grab-heartbeat ... only update heartbeat in userData of grabbed entity every 5 seconds	2016-02-25 16:17:11 -08:00
Brad Hefta-Gaub	82cbf19bca	Merge pull request #7078 from zzmp/fix/light-intensity ... Reimplement light attenuation for spot and point lights	2016-02-25 16:08:28 -08:00
Brad Hefta-Gaub	9e2d326b30	Merge pull request #7177 from howard-stearns/ac-sound-searcher-update ... Update sound searcher and spawner for load handling.	2016-02-25 15:10:42 -08:00
ericrius1	21808242ba	stashin	2016-02-25 14:20:13 -08:00
Seth Alves	b253cd53b9	Merge pull request #7190 from ericrius1/playaFireworks ... Playa fireworks	2016-02-25 14:02:25 -08:00
Eric Levin	4d27d5c9f2	Update fireworksLaunchButtonEntityScript.js	2016-02-25 13:45:08 -08:00
Seth Alves	6dafc654eb	only update heartbeat in userData of grabbed entity every 5 seconds	2016-02-25 13:19:56 -08:00
ericrius1	98cf784c6f	more smoke fading	2016-02-25 10:32:21 -08:00
Zach Pomerantz	32ce7c6eab	Rename light surfaceRadius->falloffRadius	2016-02-25 10:02:33 -08:00
ericrius1	54ee3d347c	more velocity	2016-02-25 09:53:17 -08:00
ericrius1	f12acfb7f3	simplfied	2016-02-25 09:49:44 -08:00
ericrius1	d4d5aed518	smoke tweaks	2016-02-25 09:44:48 -08:00
ericrius1	9a108c298f	smoke tweaks	2016-02-25 09:34:22 -08:00
Howard Stearns	077d331004	whitespace	2016-02-25 09:34:07 -08:00
ericrius1	728612f9a7	far trigger launches fireworks	2016-02-25 09:26:37 -08:00
ericrius1	8f914c6673	removed query string on entity script	2016-02-24 20:08:35 -08:00
ericrius1	ad49bcda72	lowered num fireworks	2016-02-24 18:29:44 -08:00
ericrius1	7cb57aa067	alpha tweaks	2016-02-24 18:15:34 -08:00
ericrius1	a1eab365ce	added name to launch pad	2016-02-24 18:11:08 -08:00
ericrius1	29c4ac83c0	can set launch position in userdata	2016-02-24 18:00:57 -08:00
ericrius1	857ccc7409	move sound with thing	2016-02-24 17:53:46 -08:00
Chris Collins	f6a6560b86	Merge pull request #7175 from sethalves/grab-clean-up-abandoned ... grab script cleans up abandoned grabs	2016-02-24 17:20:46 -08:00
ericrius1	08e7adc518	tweaks	2016-02-24 17:08:12 -08:00
ericrius1	45e8287d1d	particle trail in right spot	2016-02-24 16:55:31 -08:00
ericrius1	c26ad2b9d0	relative smoke trail	2016-02-24 16:52:02 -08:00
ericrius1	fdb5d33866	MORE RANDOM YAHH	2016-02-24 16:42:24 -08:00
ericrius1	208096f2e0	fireworks but no smoke	2016-02-24 16:36:54 -08:00
ericrius1	769a5ecca9	tweaks	2016-02-24 16:33:28 -08:00
ericrius1	0a6a35ddd8	need multiple explosions at once	2016-02-24 16:30:29 -08:00
Howard Stearns	274f72af52	Merge branch 'master' of https://github.com/highfidelity/hifi into ac-sound-searcher-update	2016-02-24 16:28:52 -08:00
Howard Stearns	90b5cdb30f	Fix bug. Annotate.	2016-02-24 16:27:46 -08:00
Zach Pomerantz	c2ed5e5474	Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity	2016-02-24 16:24:09 -08:00
ericrius1	0499334938	toadd: different colors for fireworks	2016-02-24 16:14:46 -08:00
ericrius1	dea41edf9c	tweaks	2016-02-24 16:01:38 -08:00
ericrius1	e245ad93d6	smoke and fire	2016-02-24 15:58:09 -08:00
Brad Hefta-Gaub	9273238b53	Merge pull request #7178 from Nex-Pro/20807 ... CR for Job #20807 - Fix vertically mirrored particles.	2016-02-24 13:43:40 -08:00
ericrius1	5520094bac	exploding fireworks	2016-02-24 12:29:54 -08:00
ericrius1	8b07bd00f8	basic firework	2016-02-24 11:05:02 -08:00
Howard Stearns	d1088031bf	Longer gap, as an experiment.	2016-02-23 18:13:40 -08:00
Clément Brisset	8e8e23452f	Merge pull request #7156 from ZappoMan/depthReticleWork ... Depth reticle work	2016-02-23 17:54:35 -08:00
Nex Pro	6403bb60a5	added particleOrientationTest.js for testing.	2016-02-24 01:20:49 +00:00
Seth Alves	7fb67e487e	when releasing a near-grab, zero velocity if there is another grab, regardless of the isInitialGrab flag	2016-02-23 16:47:05 -08:00
Seth Alves	efca6ecb1d	remove debug print	2016-02-23 16:37:08 -08:00
Seth Alves	acd2caf26c	handle case where user grab data didn't have a heartbeat	2016-02-23 16:35:20 -08:00
ericrius1	cf88421cf5	plant and pot are separated for raycasting purposes	2016-02-23 16:30:53 -08:00