34222 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Clément Brisset	c63fc8557c	More baseball test code	2015-11-03 11:14:59 -08:00
Clément Brisset	40ce2416e8	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-03 11:13:57 -08:00
Ryan Huffman	e8b550be9f	Clean up foul/strike in pitching.js	2015-11-03 11:13:57 -08:00
Ryan Huffman	14cdc5801e	Fix updating of distance/high score	2015-11-03 11:13:57 -08:00
Ryan Huffman	bb0ce67f6b	Update bat.js to lazy load the pitching machine	2015-11-03 11:13:57 -08:00
Ryan Huffman	d535bb6ed8	Fix pitching machine not starting when enabled	2015-11-03 11:13:56 -08:00
Ryan Huffman	f18d8f5fbb	Add shouldRenderLocally to bat.js and fix findEntities	2015-11-03 11:13:56 -08:00
Ryan Huffman	03a338dfe6	Merge branch 'baseball' of github.com:birarda/hifi into baseball	2015-11-03 11:13:56 -08:00
Stephen Birarda	57a68edaa3	resolve conflicts merging with huffman/baseball	2015-11-03 11:13:54 -08:00
Stephen Birarda	8cd41b9383	resolve conflicts on merge with huffman/baseball	2015-11-03 11:13:15 -08:00
Ryan Huffman	55789fed99	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-03 11:11:26 -08:00
Ryan Huffman	67b43cafc1	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-03 11:10:47 -08:00
Ryan Huffman	ccb25f4b63	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-03 11:10:45 -08:00
Ryan Huffman	afffe7f5c6	Merge branch 'master' of github.com:Atlante45/hifi into baseball	2015-11-03 11:10:14 -08:00
Atlante45	01bbd3665e	Remove accidentally commited file	2015-11-03 11:06:21 -08:00
Atlante45	f2ff0b40f7	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-11-03 11:06:19 -08:00
Atlante45	b37fa6f403	Merge branch 'master' of github.com:Atlante45/hifi	2015-11-03 11:00:46 -08:00
Clément Brisset	31d92fd90a	Baseball test code	2015-11-03 11:00:35 -08:00
James B. Pollack	be33b40ced	Merge pull request #6287 from jherico/homer ... Removing iviewhmd due to broken production builds	2015-11-02 23:56:26 -08:00
Brad Davis	eeabc9b093	Removing iviewhmd due to broken production builds	2015-11-02 23:49:03 -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
Philip Rosedale	61109d09af	Merge pull request #6277 from sethalves/adjust-distance-grab ... distance grab works better with hmd on	2015-11-02 16:36:32 -08:00
Seth Alves	fe2c0effd0	oops left debug on	2015-11-02 16:17:46 -08:00
Seth Alves	0a5f43bba7	fix up boolean test	2015-11-02 16:16:13 -08:00
James B. Pollack	9851ddb39c	Merge pull request #6270 from ericrius1/hoopName ... Removing bball hoop from reset scripts- will be saved in SVO instead	2015-11-02 16:14:15 -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 Davis	5d957e6535	Merge pull request #6255 from samcake/controllers ... Controllers : Adding support for 'NOT' ito the conditional endpoint	2015-11-02 16:03:52 -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
Seth Alves	181901ed19	distance grab works better with hmd on	2015-11-02 14:42:28 -08:00
samcake	c2687b4998	Cleaning the feature not conditional do the true design	2015-11-02 14:17:07 -08:00
Brad Hefta-Gaub	5a93516330	Merge pull request #6276 from sethalves/lazy-smi-init ... don't initialize SMI sdk unless we need it	2015-11-02 14:05:38 -08:00
Seth Alves	310a5c9bfb	don't initialize SMI sdk unless we need it	2015-11-02 13:42:12 -08:00
Brad Hefta-Gaub	d359aa3b65	more tweaks	2015-11-02 13:41:16 -08:00
Brad Hefta-Gaub	46bedf7667	more tweaks to hydra mappings	2015-11-02 13:35:49 -08:00
Howard Stearns	cdd150f24e	Merge pull request #6158 from hyperlogic/tony/anim-sync-blend ... Synced blending for avatar movement animations	2015-11-02 12:59:38 -08:00
Brad Hefta-Gaub	354157ccec	Merge pull request #6272 from jherico/externals ... Try using the VS2010 build of the latest SDK.	2015-11-02 12:26:35 -08:00
Anthony J. Thibault	2236573a9d	Merge branch 'master' into tony/anim-sync-blend	2015-11-02 12:18:11 -08:00
Anthony Thibault	f896a84391	Merge pull request #6269 from AndrewMeadows/avatar-velocity ... proper avatar velocity for HMD motion	2015-11-02 12:16:48 -08:00
Ryan Huffman	b8d90ab28e	Replace pitching.js include with relative path	2015-11-02 12:12:54 -08:00
Ryan Huffman	3820adf3f6	Add bat.js	2015-11-02 12:12:21 -08:00
Ryan Huffman	72775a7af8	Clean up pitching.js so the pitching machine code is separate	2015-11-02 12:12:05 -08:00
Stephen Birarda	017cee6961	make shouldRenderLocally do the right thing	2015-11-02 11:59:09 -08:00
Brad Hefta-Gaub	b94258f953	add example of overriding default rightClick behavior	2015-11-02 11:55:50 -08:00
U-GAPOS\andrew	a77f888f15	more correct HMD offset correction velocity	2015-11-02 11:29:17 -08:00
Brad Davis	edf3e5b17a	Try using the VS2010 builds from the new Sixense SDKs	2015-11-02 11:15:51 -08:00