10715 commits

Author	SHA1	Message	Date
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
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
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
Brad Davis	e616308911	Adding runtime check to ensure that the correct frustum is fetched during rendering	2015-03-17 16:28: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
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	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
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
Philip Rosedale	009551c4dd	Merge pull request #4441 from AndrewMeadows/isentropic ... more correct shape for avatar collision capsule	2015-03-13 17:33:16 -07:00
Ryan Huffman	9d5c0cf4e3	Add layout to WebWindowClass to that it maximizes the webview	2015-03-13 17:25:24 -07:00
Ryan Huffman	1193d86d7b	Update webwindow to use datawebview	2015-03-13 16:39:25 -07:00
Ryan Huffman	d512a67c8a	Merge branch 'master' of github.com:highfidelity/hifi into edit-lights-overlays	2015-03-13 14:13:56 -07:00
Ryan Huffman	53b5c7e971	Update WebWindow to raise when being set to visible	2015-03-13 14:11:01 -07:00
Ryan Huffman	dc3453a878	Add Window.raiseMainWindow()	2015-03-13 14:10:46 -07:00
Stephen Birarda	2b08c20900	Merge pull request #4440 from birarda/master ... remove the close activity from Interface	2015-03-13 13:46:59 -07:00
Ryan Huffman	7ef1964a52	Add user agent for WebWindow	2015-03-13 11:52:02 -07:00
Ryan Huffman	93cdb3a293	Add option for non-tool window WebWindows	2015-03-13 11:51:40 -07:00
Ryan Huffman	2a84d9a6ab	Fix issue with .svo's not loading when the url has parameters	2015-03-13 10:06:49 -07:00
Andrew Meadows	924ebe1e54	propagate skeleton's bounding box into AvatarData	2015-03-13 09:39:47 -07:00
Andrew Meadows	645fc7dbc9	remove unused variable	2015-03-13 09:39:06 -07:00
Brad Hefta-Gaub	fadd1a09e5	Merge pull request #4433 from ZappoMan/fix3DTV ... fix rendering of models in 3D TV mode	2015-03-12 16:42:37 -07:00
Brad Hefta-Gaub	a6b5a73844	Merge pull request #4431 from ZappoMan/windowsMenuAssert ... Fix windows assert	2015-03-12 16:42:10 -07:00
Andrew Meadows	be252147e2	merge upstream/master into andrew/isentropic	2015-03-12 16:38:59 -07:00
Andrew Meadows	6bd857c4ea	update Avatar in PhysicsEngine on load new body	2015-03-12 16:35:12 -07:00
Andrew Meadows	1f3a267b16	compute correct bounding shape dimensions	2015-03-12 16:34:47 -07:00
Andrew Meadows	2fad4153a9	remove unused Avatar::getBoundingRadius()	2015-03-12 16:34:27 -07:00
Stephen Birarda	0fe843db01	Revert "remove the launch activity from UserActivityLogger" ... This reverts commit bc6ac9081f.	2015-03-12 15:53:05 -07:00
Stephen Birarda	bc6ac9081f	remove the launch activity from UserActivityLogger	2015-03-12 15:08:05 -07:00