2882 commits

Author	SHA1	Message	Date
Zach Pomerantz	694dc1bbf6	Delay Overlays cleanup for scripting	2016-05-09 17:32:25 -07:00
Clément Brisset	2ef87557fc	Merge pull request #7798 from zzmp/clean/override ... Fix warnings on vanilla XCode compilations	2016-05-02 10:56:07 -07:00
Brad Hefta-Gaub	cddcac60c1	Merge pull request #7768 from ctrlaltdavid/20891 ... Add Interface "Home" bookmark function	2016-05-02 10:14:57 -07:00
Zach Pomerantz	13945aa4d9	Annotate all virtual fns with override	2016-04-30 13:48:59 -07:00
David Rowe	5e00a1ef49	Implement "go home" action	2016-04-27 11:24:19 +12:00
David Rowe	f74be226c8	Add "home" button to address bar	2016-04-27 10:28:05 +12:00
Zach Pomerantz	63b0c0a9ad	Reset pipeline after rendering text3d	2016-04-26 13:23:16 -07:00
Brad Hefta-Gaub	04dab65b59	Merge pull request #7727 from ZappoMan/supportLargeClockSkew ... support for larger than 35 minute clock skew	2016-04-23 08:42:38 -07:00
Chris Collins	9bd9de5710	Merge pull request #7636 from samcake/red ... Stereo drawcall amplification	2016-04-22 15:46:18 -07:00
Brad Hefta-Gaub	ddf5b0f316	some debugging	2016-04-21 10:32:22 -07:00
Brad Hefta-Gaub	31f9d592e0	support for larger than 35 minute clock skew	2016-04-20 18:42:00 -07:00
Brad Hefta-Gaub	c7ecbb6b4b	tweaks to LOD behavior	2016-04-19 11:19:28 -07:00
samcake	298300e42f	Merge branch 'master' of https://github.com/highfidelity/hifi into red	2016-04-15 14:16:02 -07:00
Zach Pomerantz	f803ecd2e7	Merge pull request #7633 from Atlante45/fix/shared-resource ... Fix raw pointers in shared resource cache items	2016-04-14 17:52:04 -07:00
Atlante45	4ed8573f74	CR	2016-04-14 17:28:24 -07:00
samcake	6c3e011b89	Expose cleanely the 3 different techniques	2016-04-14 02:43:28 -07:00
samcake	41d4d3b2d7	Providing a cleaner way to try different paths and exploring a simpler way	2016-04-13 19:21:17 -07:00
samcake	de4345bdc5	Trying to use several FBO instead to avoid changing the REnderBUffers for overlay but...	2016-04-13 01:27:57 -07:00
samcake	8800dd84f1	Trying to use several FBO instead to avoid changing the REnderBUffers for overlay but...	2016-04-13 01:25:46 -07:00
Atlante45	e45939d18f	Make sure ResourceCacheSharedItems deals with strong refs	2016-04-12 13:51:11 -07:00
Atlante45	afdfef1482	Make sure we don't use raw resource ptr	2016-04-12 13:51:11 -07:00
Brad Davis	3349093908	Fix vr menu login item update	2016-04-12 11:15:06 -07:00
Brad Davis	df8ad57185	Fix FPS counter	2016-04-11 00:25:16 -07:00
Anthony J. Thibault	a2c520a74a	ModelOverlay: use a shared_ptr<Model> not a model member ... This is necessary for shared_ptr and weak_ptr to work for Models contained within a ModelOverlay.	2016-03-29 10:47:26 -07:00
Brad Hefta-Gaub	481a75faca	Merge pull request #7366 from markej/ShowDownloadURLs ... Show which URLs are being actively downloaded	2016-03-18 10:42:01 -07:00
Howard Stearns	0cbddb217c	Don't ask about differences over after the user has said no -- until the external file changes again.	2016-03-17 19:58:28 -07:00
howard-stearns	d59d5549a1	Merge branch 'master' of https://github.com/highfidelity/hifi into os-window-vs-modal-overlay-in-script-editor	2016-03-17 17:04:54 -07:00
howard-stearns	a957716511	Disable script editor close and tab close when we have a modal dialog up ... about external changes to the file.	2016-03-17 16:54:59 -07:00
Bradley Austin Davis	7045680bc7	Reduce crashes on switching display plugins	2016-03-17 10:13:52 -07:00
Mark Johnson	66f9effd12	Update to match coding standards ... - Single letter for loop variable names - Preface bool variables with is/has/should/can/want	2016-03-16 15:15:42 -07:00
David Rowe	5faa7b3e87	Merge branch 'master' into 20851 ... Conflicts: interface/resources/qml/dialogs/MessageDialog.qml	2016-03-17 09:29:56 +13:00
Andrew Meadows	6028c3e841	Merge pull request #7318 from birarda/atp ... Asset Transfer Protocol Mappings	2016-03-15 16:52:36 -07:00
Anthony Thibault	addde84bee	Merge pull request #7363 from markej/master ... Fill in the Downloads: line of the stats window	2016-03-15 10:42:09 -07:00
Clément Brisset	bbfbbf6565	Merge pull request #109 from birarda/asset-migrator ... tweaks to the ATP asset migrator for compound URLs and mappings	2016-03-15 09:25:11 -07:00
Stephen Birarda	72c64532f5	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2016-03-15 09:12:49 -07:00
Mark Johnson	bc2aea8774	Show the (generally truncated) urls being downloaded	2016-03-14 18:18:33 -07:00
David Rowe	ab963b4a4b	Fix up script editor's "reload script?" message box	2016-03-15 09:04:23 +13:00
Mark Johnson	b7a47d7bf2	Tabs -> Spaces	2016-03-12 17:35:57 -08:00
Mark Johnson	00829db375	Fill in the downloads line of the stats window ... Will show the active download, current download limit and how many pending requests	2016-03-12 17:27:43 -08:00
Anthony Thibault	ea95295e66	ApplicationOveraly: Fix for gray line at top of HMD UI overlay	2016-03-12 14:52:26 -08:00
Stephen Birarda	8375de4517	make the ATPAssetMigrator hmd friendly and a little less brittle	2016-03-11 17:32:24 -08:00
Stephen Birarda	66e572f226	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2016-03-11 14:44:49 -08:00
Brad Hefta-Gaub	9b89654d6a	Merge pull request #7312 from jherico/crashes ... Better threaded handling of QML overlays	2016-03-11 08:45:08 -08:00
Seth Alves	0d15706f34	Merge pull request #7315 from hyperlogic/tony/avatar-speed-stat-fix ... Stats: fix for avatar velocity stat being stuck at 0.1	2016-03-11 06:37:23 -08:00
Brad Davis	e452020126	Better threaded handling of QML overlays	2016-03-10 15:50:07 -08:00
Anthony J. Thibault	c0880a570e	Stats: fix for avatar velocity stat being stuck at 0.1	2016-03-10 15:15:46 -08:00
samcake	ad7d567932	Fixing the overlay renderItem access issue	2016-03-10 14:09:34 -08:00
Stephen Birarda	5ad4645b47	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2016-03-10 13:28:59 -08:00
Stephen Birarda	9d19bf85b1	add consistent error handling for asset request and upload	2016-03-10 10:52:05 -08:00
Atlante45	f6e01bbd36	Fix messed up LogDialog multi-lines	2016-03-09 17:31:04 -08:00