13783 commits

Author	SHA1	Message	Date
Atlante45	e630f3072e	Bit of cleanup	2015-11-06 11:14:10 -08:00
Atlante45	c53c0ec53f	Fix double delete on shutdown	2015-11-06 11:13:10 -08:00
Anthony J. Thibault	50e8f49f52	SpacemouseManager Moved stub init into cpp file. ... This should fix the windows build. For some reason the linker was having a problem resolving this.	2015-11-05 10:56:24 -08:00
Anthony J. Thibault	2318e48fa8	AvatarRig: fix for crash when index was -1	2015-11-05 09:43:41 -08:00
Anthony J. Thibault	8d16f60b15	Removed hardcoded define HAVE_3DCONNEXIONCLIENT ... This should be set from cmake, right?	2015-11-05 09:02:39 -08:00
Anthony J. Thibault	d9f4b0218e	Merge branch 'master' into tony/mac-fixes	2015-11-05 08:26:44 -08:00
samcake	00797b4dea	Merge pull request #6314 from jherico/homer ... Fixing step yaw to move by consistent amounts, be 'tappable'	2015-11-04 23:33:45 -08:00
Brad Davis	86b852231e	Merge pull request #6286 from EdgarPironti/master ... Spacemouse migration	2015-11-04 19:15:35 -08:00
Brad Davis	69d29bbbbb	Creating recording library	2015-11-04 16:18:55 -08:00
Brad Davis	20d1035821	Fixing step yaw to move by consistent amounts, be 'tappable'	2015-11-04 15:54:50 -08:00
samcake	f4cc8c4c2e	Merge pull request #6306 from jherico/barney ... Fix ability to enable mappings parsed from JSON in JS	2015-11-04 11:47:04 -08:00
Brad Davis	18d2b184dc	Fix ability to enable mappings parsed from JSON in JS	2015-11-04 11:39:34 -08:00
U-GAPOS\andrew	f260c6b12b	fix bad time measurment in AtRestDetector	2015-11-04 10:47:39 -08:00
EdgarPironti	ade0862948	Spacemouse fixes	2015-11-04 00:49:40 -08:00
EdgarPironti	7adf38f781	Spacemouse migration	2015-11-03 18:22:55 -08:00
EdgarPironti	2a84cadd5d	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-11-03 18:22:29 -08:00
Andrew Meadows	4215ce5d25	Merge pull request #6212 from howard-stearns/dont-use-other-avatar-sounds ... Don't play other avatar's collision sounds.	2015-11-03 13:40:27 -08:00
EdgarPironti	d99838de9c	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-11-03 12:25:19 -08:00
Thijs Wenker	73d7fd4648	Fix: Vec3.UP was pointed to Vectors::UNIT_X ... This fixes the scripting property Vec3.UP to point to Vectors::UP which is equal to {X: 0, Y: 1, Z: 0}.	2015-11-03 19:19:12 +01:00
EdgarPironti	5d695da630	Do not merge - Spacemouse	2015-11-02 23:31:10 -08:00
Brad Hefta-Gaub	79f7284c32	Merge pull request #6285 from jherico/lisa ... Adding diagnostics to track down the 'black rectangles of death'	2015-11-02 22:18:16 -08:00
Brad Davis	764ecba2a8	Adding diagnostics to track down the 'black rectangles of death'	2015-11-02 21:55:35 -08:00
James B. Pollack	192e4c8185	Merge pull request #6274 from ZappoMan/rightClickMenu ... add example of overriding default rightClick behavior	2015-11-02 18:58:12 -08:00
Brad Davis	699a13b2a7	Merge pull request #6275 from ZappoMan/mappingTweaks ... Mapping tweaks to match Controllers spec	2015-11-02 16:06:08 -08:00
Brad Hefta-Gaub	02288e84e8	CR feedback	2015-11-02 15:35:30 -08:00
samcake	3d2739c7b4	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-02 15:34:57 -08:00
Brad Hefta-Gaub	f532607cca	add touch and other gestures to standard	2015-11-02 15:06:38 -08:00
samcake	0211e00c86	Cleaning the feature not conditional do the true design	2015-11-02 15:01:59 -08:00
samcake	c2687b4998	Cleaning the feature not conditional do the true design	2015-11-02 14:17:07 -08:00
Anthony J. Thibault	2236573a9d	Merge branch 'master' into tony/anim-sync-blend	2015-11-02 12:18:11 -08:00
Brad Hefta-Gaub	b94258f953	add example of overriding default rightClick behavior	2015-11-02 11:55:50 -08:00
Andrew Meadows	9799693135	remove extra whitespace	2015-11-02 11:07:41 -08:00
Andrew Meadows	fd557c4e52	route HMD-following through the physics simulation	2015-11-02 11:07:40 -08:00
Seth Alves	c381da24a7	get interface building on my linux box	2015-11-02 10:42:06 -08:00
samcake	543f322ffe	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-02 09:48:32 -08:00
Brad Hefta-Gaub	d9dd045886	better parameter name	2015-11-02 09:29:09 -08:00
Brad Hefta-Gaub	c3a78ed151	cleanup	2015-11-02 09:27:35 -08:00
Brad Hefta-Gaub	b00f572e1a	add mouseClicked inputs vs mouseButton inputs, make right-click work without right button drag	2015-11-02 09:21:15 -08:00
Anthony J. Thibault	e3e759248f	Merge branch 'master' into tony/anim-sync-blend	2015-11-02 08:37:10 -08:00
Howard Stearns	ea2971a24f	Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds	2015-11-01 17:02:59 -08:00
Brad Hefta-Gaub	fe4a6fa2bf	Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarnings	2015-11-01 15:01:30 -08:00
Brad Hefta-Gaub	9c23f2551d	Merge pull request #6207 from jherico/pluginSupport ... Support for runtime plugins (DLLs)	2015-11-01 14:57:13 -08:00
Brad Hefta-Gaub	4a08329d22	fix unix warnings for comparing enums to enums	2015-11-01 12:10:42 -08:00
Brad Hefta-Gaub	43df5b55fe	fix linker warnings	2015-11-01 11:55:55 -08:00
Brad Davis	cfb2fd1523	Support for runtime plugins (DLLs)	2015-11-01 11:12:12 -08:00
Brad Davis	99d8554cc8	Make zlib a true external on windows (linux and OSX should rely on system libraries)	2015-11-01 01:36:59 -07:00
Brad Davis	7fdb8e28e7	Merge pull request #6262 from ZappoMan/fixControllers ... Tweaks to standard hand controller mappings	2015-10-31 23:42:13 -07:00
Brad Hefta-Gaub	05dea847be	add Actions.CycleCamera and wire up secondary thumb buttons to Actions.CycleCamera and Actions.ContextMenu	2015-10-31 15:47:40 -07:00
Howard Stearns	fb26e85faf	Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds	2015-10-31 14:33:17 -07:00
Brad Davis	0e13348b5a	PR feedback	2015-10-31 14:26:14 -07:00