3050 commits

Author	SHA1	Message	Date
Sam Gateau	38fcb80135	FIx bad relative path	2015-09-10 09:52:52 -07:00
Howard Stearns	d7c1c7593a	Merge pull request #5761 from ZappoMan/preventIncludeRecusion ... prevent Script.include() from including the same file multiple times	2015-09-10 09:22:55 -07:00
Brad Hefta-Gaub	1aa3c746a6	Merge pull request #5762 from samcake/punk ... Adding the flashlight toy script	2015-09-10 09:15:22 -07:00
Brad Hefta-Gaub	edf889a4c8	Merge pull request #5756 from ericrius1/grabChanges ... added lifetime to pointer, default grab behavior now honors objects i…	2015-09-10 09:14:11 -07:00
Brad Hefta-Gaub	f45e182d33	fix CR feedback, add examples	2015-09-10 09:06:56 -07:00
ericrius1	66a4ff752c	cleaning up lifetime calc	2015-09-10 09:01:51 -07:00
ericrius1	9ba681dd7f	fixed way lifetime on pointer entity is updated	2015-09-10 08:59:05 -07:00
samcake	e647bfc19b	Update flashlight.js ... modify the path to be relative	2015-09-09 22:41:09 -07:00
Sam Gateau	0a0a9805f6	Fixing the url behavior	2015-09-09 18:11:00 -07:00
Sam Gateau	8360fceadf	Fixing the url behavior	2015-09-09 18:09:52 -07:00
Sam Gateau	6aebda86f4	Creating the flashlight script files	2015-09-09 17:24:20 -07:00
Brad Hefta-Gaub	0023016447	Merge pull request #5757 from ZappoMan/breakdanceToy ... added some debugging to breakdance toy	2015-09-09 14:56:08 -07:00
Brad Hefta-Gaub	62bf6c7c6f	added some debugging to breakdance toy	2015-09-09 14:55:39 -07:00
Brad Hefta-Gaub	ec93fc1b05	added some debugging to breakdance toy	2015-09-09 14:24:52 -07:00
ericrius1	5025030726	added lifetime to pointer, default grab behavior now honors objects initial position and rotation	2015-09-09 14:24:30 -07:00
Brad Hefta-Gaub	6866c288b0	Merge pull request #5754 from ZappoMan/breakdanceToy ... fix breakdance toy	2015-09-09 12:42:10 -07:00
Brad Hefta-Gaub	427ed8807b	fix breakdance toy	2015-09-09 12:41:59 -07:00
Ryan Downe Karpf	9c71d5fd4d	Merge pull request #5750 from ZappoMan/boombox ... lower volume	2015-09-09 09:30:29 -07:00
Brad Hefta-Gaub	b0329a58a6	lower volume	2015-09-09 09:29:31 -07:00
Brad Davis	75a05ff15d	Reduce logging spam in omniTools/magBalls	2015-09-08 20:56:54 -07:00
Brad Hefta-Gaub	ae8c3a19ed	Merge pull request #5746 from imgntn/bubblewand_hotfix_1 ... Run cleanup when createWand.js ends; Don't delete bubbles on collision (for now)	2015-09-08 18:18:36 -07:00
Brad Hefta-Gaub	ece8addf81	fix issue with default scripts	2015-09-08 18:08:30 -07:00
James Pollack	66b6d5178f	Cleanup wand when createWand.js script ends	2015-09-08 17:25:39 -07:00
Brad Hefta-Gaub	0612ee498d	Merge pull request #5742 from ericrius1/defaultGrab ... handControllerGrab.js is active by default	2015-09-08 16:49:03 -07:00
Brad Davis	ec566a63fc	Merge pull request #5736 from ZappoMan/breakdanceToy ... Breakdance Toy - better positioning on puppet	2015-09-08 16:29:29 -07:00
Eric Levin	e9ea42f9ad	Merge pull request #5740 from ZappoMan/boombox ... add a boom box entity script	2015-09-08 16:16:41 -07:00
ericrius1	717cbf3d5b	handControllerGrab.js is active by default	2015-09-08 16:13:17 -07:00
Brad Hefta-Gaub	ca6c413221	tweak THE_SONG	2015-09-08 16:02:10 -07:00
Brad Hefta-Gaub	8c4d7b98fd	fix header comment	2015-09-08 16:01:07 -07:00
Brad Hefta-Gaub	fe90af0e07	Merge pull request #5737 from ericrius1/grabChanges ... hydraGrab is now called handControllerGrab.js now grabs entities based on how they want to be grabbed (th…	2015-09-08 15:59:28 -07:00
ericrius1	572b120bf0	removed print statements	2015-09-08 15:57:31 -07:00
Brad Hefta-Gaub	8185a8da7f	Merge pull request #5732 from jherico/selma ... Procedural skyboxes	2015-09-08 15:12:59 -07:00
Brad Hefta-Gaub	a6395e9438	add a boom box entity script	2015-09-08 14:54:22 -07:00
Eric Levin	69612551e2	Merge pull request #5739 from ctrlaltdavid/20669 ... CR for 20669 - Add additional particle properties controlling size, colour, and opacity	2015-09-08 14:51:54 -07:00
Brad Davis	5f1affaff9	Procedural skybox work	2015-09-08 14:31:16 -07:00
James B. Pollack	4d907aa53b	Merge pull request #5726 from SeijiEmery/jsbenchmarks ... Javascript benchmarking	2015-09-08 14:24:30 -07:00
David Rowe	2325cb8ee0	Merge branch 'master' into 20669	2015-09-08 13:26:20 -07:00
Brad Hefta-Gaub	57c27f7049	added an example script that detects being touched by avatars hand	2015-09-08 13:06:20 -07:00
ericrius1	7133fc94f5	hydraGrab now grabs entities based on how they want to be grabbed (through setting of userData field with a key called spatialKey	2015-09-08 12:54:02 -07:00
Brad Hefta-Gaub	781f19c9e3	position the puppet on level of nearby table	2015-09-08 12:27:24 -07:00
David Rowe	cdd5e68815	Add colorStart and colorFinish entity particle properties	2015-09-08 11:28:53 -07:00
Brad Davis	743d79335d	Procedural shaders V2	2015-09-07 17:37:45 -07:00
David Rowe	cb9468c311	Add colorSpread entity particle property	2015-09-07 16:27:42 -07:00
Brad Hefta-Gaub	ebeedb5cde	work on moving dancers to center of table if it's present	2015-09-05 22:05:53 -07:00
David Rowe	47b27a3280	Add alphaStart and alphaFinish entity particle properties	2015-09-05 16:30:01 -07:00
David Rowe	1b3d125cb3	Add alphaSpread entity particle property	2015-09-05 14:39:10 -07:00
Brad Hefta-Gaub	1df3a8f814	Merge pull request #5727 from jherico/marge ... Procedural rendering for box & sphere entities	2015-09-05 12:43:21 -07:00
Brad Davis	d8e5945d14	Removing procedural edit work in progress for now	2015-09-05 12:17:36 -07:00
Brad Davis	e8435b6218	Procedural rendering for box entities	2015-09-05 12:10:45 -07:00
David Rowe	12b8a5a1d5	Add alpha property support to ParticleEffect entities ... Add at same "level" as color so that it's available for other entity types to use in the future.	2015-09-05 10:23:27 -07:00