54491 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
howard-stearns	61b738e3cd	announcment styling	2017-05-01 15:35:17 -07:00
Seth Alves	45a50f9a46	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-5	2017-05-01 15:32:29 -07:00
Seth Alves	3ec3005c6d	code review	2017-05-01 15:32:17 -07:00
Dante Ruiz	a08b55d5f5	minimize diff	2017-05-01 23:08:25 +01:00
Dante Ruiz	07582c2624	Merge branch 'master' of github.com:highfidelity/hifi into tabletwebview-fix-links	2017-05-01 23:04:55 +01:00
druiz17	67daa4b0a9	Merge pull request #10335 from druiz17/webview-js ... Implemented of a web app to bring up the tablet webView	2017-05-01 15:03:55 -07:00
Clément Brisset	42294fa8c0	Merge pull request #10306 from Atlante45/feat/progressive-load-ktx ... Load High Mips before Fbx after skybox	2017-05-01 14:56:22 -07:00
Dante Ruiz	b00d7d763a	Merge branch 'master' of github.com:highfidelity/hifi into tabletwebview-fix-links	2017-05-01 22:45:42 +01:00
Dante Ruiz	64b8237bd6	fix twitter and facebook links	2017-05-01 22:45:13 +01:00
Brad Davis	f81d01f179	Prevent possible crash in texture buffering thread	2017-05-01 14:13:59 -07:00
Dante Ruiz	62870d85d3	Merge branch 'webview-js' of github.com:druiz17/hifi into tabletwebview-fix-links	2017-05-01 21:58:09 +01:00
Sam Cake	3abd9f21e8	Debugging without understanding...	2017-05-01 13:50:19 -07:00
Dante Ruiz	bb9eb98625	prevent mouse events from propagating to far	2017-05-01 21:49:57 +01:00
Atlante45	4f368cc867	Load High Mips before Fbx after skybox	2017-05-01 13:35:14 -07:00
Dante Ruiz	c205bf0980	working on cleaner navigation	2017-05-01 21:23:38 +01:00
Ryan Huffman	c839118c6b	Add ResourceManager::resourceExists	2017-05-01 13:22:23 -07:00
Ryan Huffman	074a11306c	Add support for atp and file urls in OBJReader	2017-05-01 13:22:02 -07:00
CFresquet	a3f637dc0e	Merge remote-tracking branch 'upstream/master'	2017-05-01 13:16:31 -07:00
Seth Alves	a75544a9fb	Merge pull request #10319 from hyperlogic/feature/head-standard-action ... Head, Hips and Chest IK can now be controlled from Controller inputs	2017-05-01 13:03:23 -07:00
Seth Alves	2b13d4d257	Merge pull request #10331 from ctrlaltdavid/21306 ... Fix keyboard not raising for Facebook username field	2017-05-01 13:02:19 -07:00
CFresquet	55fdf35c4a	merge of Request module	2017-05-01 13:02:18 -07:00
Brad Davis	40e4e2f307	Merge pull request #10327 from jherico/face_tracker_refactor ... Remove Faceshift	2017-05-01 12:14:55 -07:00
Howard Stearns	9fab66b66a	Merge pull request #10328 from howard-stearns/tablet-discovery-events ... fix announcement suggestions	2017-05-01 11:28:45 -07:00
Howard Stearns	0146d7550e	Merge pull request #10333 from howard-stearns/handshake-cleanup-2 ... Handshake cleanup	2017-05-01 11:15:54 -07:00
Clément Brisset	5c46d1e3ff	Merge pull request #10316 from sethalves/fix-stray-edit-laser ... fix -- show hand lasers when edit is enabled, but not if there are not hand-controllers	2017-05-01 10:48:59 -07:00
Dante Ruiz	763feccbe1	removed tabs	2017-05-01 18:07:42 +01:00
Dante Ruiz	9f33af479d	saving work	2017-05-01 18:04:22 +01:00
Sam Cake	ae5cd3059a	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis	2017-05-01 09:59:18 -07:00
anshuman64	5731242e7f	Merge pull request #10321 from ZappoMan/fixFrozenBots ... fix frozen bots	2017-05-01 09:33:33 -07:00
Anthony J. Thibault	0c09823f67	clang warning fixes, unused variables...	2017-05-01 09:10:31 -07:00
CFresquet	72a6403eb0	Merge remote-tracking branch 'upstream/master'	2017-05-01 08:11:26 -07:00
CFresquet	28aaa545d8	Created RequestModule	2017-05-01 08:07:16 -07:00
druiz17	f60deb0cfc	fixed the twitter link	2017-04-30 22:55:44 -07:00
Howard Stearns	f980d6f435	Merge branch 'master' of https://github.com/highfidelity/hifi into handshake-cleanup-2	2017-04-30 15:51:12 -07:00
Howard Stearns	e740fb67f4	convert foreign handString to jointIndex once, not often	2017-04-30 15:50:30 -07:00
Howard Stearns	a057400a92	Merge pull request #10323 from davidkelly/dk/gripThresholdGetsBigger ... increase minimum grip pressure to initiate handshake	2017-04-30 15:49:35 -07:00
druiz17	2bf7b12c7d	open webview from tabletwebscreen	2017-04-30 15:27:34 -07:00
Howard Stearns	bc9049cb42	remove extra joint search	2017-04-30 14:19:33 -07:00
Seth Alves	6808cf62b6	trying to get electron package to download	2017-04-30 14:09:44 -07:00
Seth Alves	2e23a073f7	trying to get electron package to download	2017-04-30 14:03:45 -07:00
Howard Stearns	292065a918	It may be possible to switch hands without endHandshake, and thus not reset currentHandJointIndex on updateTrigger. That was filled in later by startHanshake ONLY if there was already waiting avatars so that we didn't have wait. As a result, our distance measure would be from hips instead of hand. This changes it to always compute currentHandJointIndex on updateTriggers (and not elsewhere).	2017-04-30 13:32:21 -07:00
druiz17	b1abbbe472	Merge branch 'master' of github.com:highfidelity/hifi into webview-js	2017-04-30 13:17:28 -07:00
Seth Alves	1b67a8b251	cleanups	2017-04-30 12:23:34 -07:00
Seth Alves	41663c58b8	test app for bullet dynamics	2017-04-30 12:09:37 -07:00
Seth Alves	dabec586ec	if spring is linked to another entity which we can't find, disable the spring	2017-04-30 11:01:34 -07:00
Seth Alves	c9dfebb713	allow spring action to have targets relative to another entity	2017-04-30 10:58:58 -07:00
Seth Alves	7ce0ef2ec4	fix spring action so that it can be linear or rotational or both	2017-04-30 10:04:07 -07:00
Howard Stearns	eca7292651	check your own location data on failure, and notify if it is wrong	2017-04-30 09:44:34 -07:00
Howard Stearns	92481bf475	standardize data init/clear	2017-04-30 08:04:46 -07:00
Howard Stearns	d41a911fd2	setupCandidate	2017-04-29 19:39:50 -07:00