34261 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stephen Birarda	804db537bf	volume changes for crowd, bat avatar suppression fix	2015-11-03 16:11:13 -08:00
Stephen Birarda	8c0592caba	add semicolons to createBatButton script	2015-11-03 14:52:40 -08:00
Stephen Birarda	501b905e7a	change script URL for bat to HTTP	2015-11-03 14:25:38 -08:00
Stephen Birarda	06dbe2693a	fix for created bat properties	2015-11-03 14:21:52 -08:00
Atlante45	9be8d1edf9	Remove now unecessary vive hack	2015-11-03 11:44:33 -08:00
Atlante45	570777e6f3	Merge branch 'baseball' of github.com:birarda/hifi into baseball	2015-11-03 11:42:00 -08:00
Atlante45	2bdd282708	Merge branch 'vive' of github.com:Atlante45/hifi into baseball	2015-11-03 11:40:45 -08:00
Atlante45	0508091130	Rebase fixes	2015-11-03 11:37:57 -08:00
Atlante45	52c61f069f	Merge branch 'master' of https://github.com/highfidelity/hifi into vive	2015-11-03 11:21:54 -08:00
Atlante45	f4b5933af4	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-03 11:21:39 -08:00
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
Stephen Birarda	db7bb61209	Merge pull request #6288 from sethalves/fix-grab-some-more ... fix grab	2015-11-03 11:10:14 -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
Brad Davis	27551b8532	Merge pull request #6289 from thoys/patch-6 ... Fix: Vec3.UP was pointed to Vectors::UNIT_X	2015-11-03 10:29:03 -08:00
samcake	78e3f8ebbc	Merge pull request #6281 from AlessandroSigna/master ... Vive - fix input drifting	2015-11-03 10:19:59 -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
Seth Alves	27b239176f	fix grab	2015-11-03 10:16:56 -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
Atlante45	1928753dda	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-02 18:14:53 -08:00
Atlante45	54c5f28592	Merge branch 'baseball' of github.com:Atlante45/hifi into baseball	2015-11-02 18:14:34 -08:00
Stephen Birarda	48cbd69421	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-02 17:33:31 -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
Ryan Huffman	91a1378889	Clean up foul/strike in pitching.js	2015-11-02 16:09:51 -08:00
AlessandroSigna	b77945d430	Vive - fix input drifting ... Conflicts: libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp	2015-11-02 16:06:17 -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
Ryan Huffman	1b673a99c0	Fix updating of distance/high score	2015-11-02 15:59:55 -08:00