11354 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	3d6d79ae3a	Merge pull request #4478 from sethalves/maximum-capacity ... Maximum capacity redux	2015-03-20 09:28:22 -07:00
Brad Hefta-Gaub	96bfb96936	Merge pull request #4468 from ctrlaltdavid/20399 ... CR for 20399 - Fix near field clipping on avatars with large heads	2015-03-19 20:02:17 -07:00
Andrew Meadows	a7dbd6779f	Merge pull request #4467 from huffman/avatar-thrust ... Fix thrust not being applied w/ Physics + Avatar	2015-03-19 16:40:10 -07:00
ZappoMan	5f825211df	Merge branch 'master' of https://github.com/highfidelity/hifi into dragDropLinkAvatars	2015-03-19 15:12:06 -07:00
Seth Alves	baa8e9c86f	remove uneeded #includes	2015-03-19 13:05:30 -07:00
Seth Alves	817a6130ef	return a reason as part of the domain server's connection-denied packet. Don't apply max-capacity check to users in the editors list	2015-03-19 13:01:57 -07:00
ZappoMan	24132968fe	oops	2015-03-19 12:41:44 -07:00
ZappoMan	26670f9e41	remove unneeded debug	2015-03-19 12:15:12 -07:00
ZappoMan	c5314aceac	more DRYing up of code	2015-03-19 11:57:57 -07:00
ZappoMan	5814a14152	removed dead code	2015-03-19 11:42:00 -07:00
ZappoMan	e6cefa946c	more DRYing of code	2015-03-19 11:41:03 -07:00
ZappoMan	3c41ecd091	cleanup accepted files implementation	2015-03-19 11:29:41 -07:00
ZappoMan	8e0141b8e9	first cut at fst drag/drop support	2015-03-19 08:48:13 -07:00
samcake	c0a66a05f4	Merge pull request #4463 from ZappoMan/LODTweaks ... MVP Task - tweaks to automatic-LOD adjustments & Display warning when LOD is decreased	2015-03-18 16:55:39 -07:00
Brad Davis	0c465ce2b5	Merge pull request #4460 from ZappoMan/runJSFiles ... MVP task - Allow a script to be added to a users "running script" from the marketplace	2015-03-18 12:52:44 -07:00
David Rowe	c114442325	Merge branch 'master' into 20399	2015-03-18 12:44:29 -07:00
David Rowe	648a2e3b1d	Set clip distance on rendering frustum rather than camera ... This fixes wrong clipping distance used for rendering in FPV if also have rear view mirror.	2015-03-18 12:43:49 -07:00
ZappoMan	8239a295cb	Merge branch 'master' of https://github.com/highfidelity/hifi into LODTweaks	2015-03-18 11:54:05 -07:00
ZappoMan	a2e012f7a9	Merge branch 'master' of https://github.com/highfidelity/hifi into runJSFiles	2015-03-18 11:53:19 -07:00
Brad Davis	07ee350c09	Removing reported logspam from release builds	2015-03-18 10:24:53 -07:00
Brad Hefta-Gaub	53ae4b48bc	Merge pull request #4459 from ctrlaltdavid/20400 ... CR for 20400 - Name tags going through the head	2015-03-17 21:54:13 -07:00
Brad Hefta-Gaub	a5294ae3fa	Merge pull request #4436 from sethalves/persist-entities-as-json ... Optionally persist entities as json	2015-03-17 21:53:17 -07:00
Brad Hefta-Gaub	55d9560c9e	Merge pull request #4469 from jherico/frustumFetchCheck ... Fix broken aspect ratio in mirror	2015-03-17 17:06:21 -07:00
Brad Davis	1662230289	Adding some fixmes to the code, since globals are evil and such checks should be confined to debug mode only	2015-03-17 16:44:29 -07:00
David Rowe	7b54443bda	Adjust clip distance as HMD head moves backwards	2015-03-17 16:33:20 -07:00
David Rowe	a04bd09b83	Set clip near distance per skeleton model if no separate head model	2015-03-17 16:32:59 -07:00
Brad Davis	e616308911	Adding runtime check to ensure that the correct frustum is fetched during rendering	2015-03-17 16:28:44 -07:00
Ryan Huffman	870f1112e4	Fix thrust not being applied w/ Physics + Avatar	2015-03-17 16:17:44 -07:00
Brad Davis	895a0d7b85	Correcting frustum usage by the avatar renderer that was causing aspect ratio problem	2015-03-17 16:14:35 -07:00
Brad Davis	c88f6f8f07	Adding some documentation on the change	2015-03-17 13:49:06 -07:00
ZappoMan	1e03335012	implement scripting interface for LODManager	2015-03-17 13:18:29 -07:00
Brad Davis	71e59cfa88	Fix: Mini-mirror doesn't render avatar head when in first person mode	2015-03-17 13:15:15 -07:00
ZappoMan	e5be8d01b6	tweaks to automatic-LOD adjustments	2015-03-17 10:36:39 -07:00
ZappoMan	749bc1ee9b	support for loading of JS files by drag, web page urls, and openfile events	2015-03-17 08:38:39 -07:00
Brad Hefta-Gaub	d33d3afb52	Merge pull request #4454 from Atlante45/fix_mouse_visible_in_oculus ... Hide cursor at MainWindow level when in VRMode	2015-03-17 08:06:05 -07:00
Atlante45	1f8a874ce6	Hide cursor in 3D TV mode too	2015-03-17 12:34:13 +01:00
David Rowe	d08a25f1a3	A more realistic default head height	2015-03-16 15:48:10 -07:00
David Rowe	913527eaa3	Calculate head height based on skeleton model mesh if no head model ... This fixes the problem of some skeleton models with heads having display names rendering through them.	2015-03-16 15:47:54 -07:00
Brad Davis	fd29f72bfe	Making nsight usage optional (still defaults to on)	2015-03-16 12:59:41 -07:00
Atlante45	c5010c4d55	Hide cursor at MainWindow level when in VRMode	2015-03-16 14:19:24 +01:00
Seth Alves	806280f9cc	Merge branch 'linux-tools-window-freakout' of github.com:sethalves/hifi into persist-entities-as-json	2015-03-15 09:00:24 -07:00
Seth Alves	bfa38521ed	linux desktops are often configured as point-to-focus. don't autohide tools window on linux	2015-03-15 07:59:32 -07:00
Seth Alves	6c4b808813	Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json	2015-03-15 07:10:56 -07:00
David Rowe	08c95555dd	Calculate head height based on model mesh rather than joints ... This fixes the problem of some head models having display names rendering through them.	2015-03-14 09:47:47 -07:00
Stephen Birarda	dcff4f5956	use HIGH_FIDELITY_USER_AGENT for DataWebPage	2015-03-13 18:25:17 -07:00
Stephen Birarda	859f81cdd7	some & squishes missed in review	2015-03-13 18:12:31 -07:00
Stephen Birarda	641581a825	Merge pull request #4446 from huffman/marketplace-window ... Marketplace window	2015-03-13 17:51:44 -07:00
Ryan Huffman	235b5d77ae	Add missing include to DataWebPage	2015-03-13 17:38:36 -07:00
Ryan Huffman	47e63719ee	Handle svo request in DataWebPage as import requests	2015-03-13 17:35:33 -07:00
Ryan Huffman	aca509d5cc	Add Application::improtSVOFromURL	2015-03-13 17:35:06 -07:00