12 commits

Author	SHA1	Message	Date
ZappoMan	9630279459	Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy ... Conflicts: examples/editVoxels.js examples/fallingSand.js examples/growTrees.js interface/src/Application.cpp interface/src/Application.h libraries/avatars/CMakeLists.txt libraries/entities/src/EntityItem.h	2014-12-31 10:50:53 -08:00
ZappoMan	48285b21c4	remove voxel related scripts	2014-12-30 20:50:07 -08:00
Ryan Huffman	5537fb970b	Update scripts to use instead of for line3d	2014-12-18 16:23:24 -08:00
Ryan Huffman	ba3f051c8c	Disable the warp button in gamepad.js	2014-12-04 15:11:16 -08:00
Ryan Huffman	3bbee640fb	Make gamepad mirror button toggle	2014-12-04 14:48:03 -08:00
Ryan Huffman	500b8a49d1	Add button to gamepad.js to toggle mirror mode	2014-12-04 14:17:24 -08:00
Ryan Huffman	e3a34f6db0	Add multi-speed control to gamepad.js	2014-12-04 12:17:31 -08:00
Stephen Birarda	f0b0c5fe0b	change warp button to button face right	2014-12-03 11:08:41 -08:00
Ryan Huffman	1c2a971638	Update gamepad.js to use new Joysticks interface	2014-10-10 17:03:25 -07:00
Ryan Huffman	c69ad78d3b	Add wired 360 controller on Windows support	2014-10-10 09:30:51 -07:00
Ryan Huffman	a9eaf3b740	Update gamepad.js to work with wired 360 controller	2014-10-10 09:27:07 -07:00
Ryan Huffman	0fce89a627	Add gamepad.js	2014-10-09 16:22:27 -07:00