3775 commits

Author	SHA1	Message	Date
Brad Davis	d91d0a2027	Fixing spray can script	2015-10-26 12:47:31 -07:00
Brad Davis	34b5178393	Fixing ping-ping entity script	2015-10-26 11:55:23 -07:00
Brad Hefta-Gaub	88ba6cda24	Merge pull request #6177 from jherico/guns ... Controller Branch - Fix gun.js	2015-10-26 10:51:08 -07:00
Brad Davis	75b2ee94b2	PR feedback	2015-10-25 19:37:41 -07:00
Brad Davis	3e50174114	Updating gun.js to new controller API	2015-10-24 16:26:50 -07:00
Brad Hefta-Gaub	394511ac1b	fix frisbee.js to work with new API	2015-10-24 09:50:09 -07:00
Brad Davis	f61cf843bc	Merge pull request #6172 from ZappoMan/fixScripts ... fix walkApi.js to detect hydra in official way	2015-10-23 21:04:17 -07:00
Brad Hefta-Gaub	6cffe8cb6a	Merge pull request #6169 from EdgarPironti/controllers2 ... fix toyball.js	2015-10-23 20:21:00 -07:00
Brad Hefta-Gaub	0b99728575	Merge pull request #6175 from AlessandroSigna/controllers ... fix stick.js	2015-10-23 20:20:00 -07:00
Brad Hefta-Gaub	3a2328a887	Merge pull request #6173 from EdgarPironti/controllers ... Fixed sword.js	2015-10-23 20:07:52 -07:00
AlessandroSigna	7f3f202567	fix stick.js	2015-10-23 18:23:15 -07:00
EdgarPironti	0d15182adb	Fixed sword.js	2015-10-23 18:09:43 -07:00
Brad Hefta-Gaub	4a19a14682	fix walkApi.js to detect hydra in official way	2015-10-23 17:53:34 -07:00
Brad Davis	304fe49628	Merge pull request #6170 from ZappoMan/fixScripts ... various controller script updates	2015-10-23 17:43:54 -07:00
Brad Hefta-Gaub	060f87d14a	CR feedback	2015-10-23 17:33:45 -07:00
Brad Hefta-Gaub	9aaef9aabd	fix hydraPaint.js to use new API	2015-10-23 17:32:06 -07:00
EdgarPironti	0959c98132	Fixed tab	2015-10-23 17:26:44 -07:00
Brad Davis	4e6f64833f	Conditional support from JS	2015-10-23 17:24:04 -07:00
Brad Hefta-Gaub	9ba1b800d9	CR feedback	2015-10-23 17:15:39 -07:00
Brad Hefta-Gaub	090dc5409b	CR feedback	2015-10-23 17:14:59 -07:00
Brad Hefta-Gaub	ed20e7d209	CR feedback	2015-10-23 17:14:13 -07:00
EdgarPironti	c64290b5cd	Removed unused variables	2015-10-23 17:13:29 -07:00
Brad Hefta-Gaub	9285cf8e2c	fix hydraGrabHockey.js to use new API	2015-10-23 17:12:26 -07:00
Brad Hefta-Gaub	6b795364c8	make handGrab treat shoulder bumbers and triggers as merged control	2015-10-23 16:30:40 -07:00
EdgarPironti	5c09391170	fix toyball.js	2015-10-23 16:19:40 -07:00
AlessandroSigna	5d8d8c8f0d	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-23 15:50:39 -07:00
AlessandroSigna	37e1e43ce0	Fix paddleBall.js	2015-10-23 15:48:29 -07:00
Brad Hefta-Gaub	7e3192d0f6	fix drumstick.js ... fix drumstick.js	2015-10-23 14:22:50 -07:00
AlessandroSigna	6001968d92	Fix paddleBall.js	2015-10-23 13:52:22 -07:00
AlessandroSigna	4c14cd757b	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-23 13:47:16 -07:00
Brad Davis	56deef9d6e	Moving omniTool to a route mapped input	2015-10-23 13:40:36 -07:00
Brad Davis	be148686a7	Fixing omnitool	2015-10-23 13:40:36 -07:00
Brad Davis	d83ad7fdc1	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-23 13:35:24 -07:00
AlessandroSigna	c2078aca3f	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-23 11:27:16 -07:00
EdgarPironti	5bae83173c	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-23 11:16:02 -07:00
James B. Pollack	6392b7080b	move scripts no longer in toybox to better locations	2015-10-23 10:36:32 -07:00
Brad Davis	63df9fb959	Fixing raw sound playback and air guitar	2015-10-22 22:37:18 -07:00
AlessandroSigna	ae2f7f6ff6	Fix paddleBall.js	2015-10-22 18:50:23 -07:00
EdgarPironti	eaaec516c2	fix controllerExample	2015-10-22 18:41:57 -07:00
Brad Davis	103fe3c545	Merge pull request #6155 from ZappoMan/fixScripts ... fix airGuitar.js	2015-10-22 18:19:26 -07:00
samcake	3e4bada313	remove uneeded var	2015-10-22 18:03:47 -07:00
samcake	9015e98b70	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-22 16:13:54 -07:00
samcake	0ad4634eac	Check that the velocity information is passed correctly and fixed clap.js	2015-10-22 16:13:12 -07:00
samcake	2db87e0d2d	Remove hydramove.js and expose the velocity and angular Velocity for hydra	2015-10-22 15:55:36 -07:00
Brad Hefta-Gaub	c826b48c92	fix airGuitar.js	2015-10-22 15:05:59 -07:00
Brad Davis	5227c40298	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-22 12:15:41 -07:00
samcake	2ebf862da9	Merge pull request #6148 from jherico/controllerFunctions ... Fixing controller functions & makeAxis	2015-10-22 11:56:58 -07:00
EdgarPironti	09cdc01599	Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers	2015-10-22 11:50:45 -07:00
Brad Davis	7ed9ed8500	Merge pull request #6149 from ZappoMan/exposeMyAvatarHandsToJS ... make handControllerGrab.js work with new API	2015-10-22 11:40:48 -07:00
Brad Davis	6cf0bdcffe	Testing function destination and fixing bug in rule ordering for multi-soure	2015-10-22 10:00:11 -07:00