10890 commits

Author	SHA1	Message	Date
Sam Gateau	ed8d433ad5	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-02-09 15:27:06 -08:00
David Rowe	468433e70a	Fix VSync menu item on Windows	2015-02-09 12:01:53 -08:00
Sam Gateau	ace6dc4faf	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-02-08 23:23:06 -08:00
Thijs Wenker	3ccbe50092	remove warnings for non-RSSDK builds	2015-02-07 19:07:10 +01:00
Thijs Wenker	c7b19277ee	rssdk fix missing constants	2015-02-07 13:40:51 +01:00
Brad Hefta-Gaub	ca0cf1f1f1	Merge pull request #4244 from birarda/binary-fonts ... move fonts to sdff bin files, load with qrc	2015-02-06 16:37:39 -08:00
Sam Gateau	469ee29f0b	Merge branch 'temp0' of https://github.com/samcake/hifi into temp1	2015-02-06 16:30:47 -08:00
Sam Gateau	bdf9164c7b	debugging the new global light pass	2015-02-06 16:30:07 -08:00
Stephen Birarda	41d2da8712	remove doubled Q_INIT_RESOURCE calls	2015-02-06 15:28:36 -08:00
Brad Hefta-Gaub	d3b387c1e0	Merge pull request #4247 from Atlante45/fix_3d_text_billboards ... Fix funky text 3D overlays	2015-02-06 15:01:47 -08:00
Stephen Birarda	6a58d8b0a3	resolve conflicts on merge with upstream master	2015-02-06 14:21:07 -08:00
Brad Hefta-Gaub	b3fb1b2403	Merge pull request #4246 from ctrlaltdavid/20282 ... CR for Job #20282 - Finish implementing Planar3DOverlay intersection code	2015-02-06 14:19:35 -08:00
Brad Hefta-Gaub	a4541758cf	Merge pull request #4245 from ctrlaltdavid/20301 ... CR for Job #20301 - Windows: If I'm running Interface go to a place via hifi://, don't start another instance of the app	2015-02-06 14:19:10 -08:00
Atlante45	920082331f	Fix funky text 3D overlays	2015-02-06 14:15:10 -08:00
Stephen Birarda	d68b0958a7	resolve conflicts on merge with upstream/master	2015-02-06 14:09:20 -08:00
Brad Hefta-Gaub	390d2be48f	Merge pull request #4189 from birarda/android ... add the gvr-interface target for GearVR	2015-02-06 14:07:28 -08:00
David Rowe	67e2e748e7	Merge branch 'master' into 20282	2015-02-06 13:25:43 -08:00
David Rowe	ec590791df	Merge branch 'master' into 20301	2015-02-06 13:23:59 -08:00
Stephen Birarda	9a98e07b2d	call Q_INIT_RESOURCE from mains to handle static link	2015-02-06 12:39:14 -08:00
Stephen Birarda	5e864278a3	fix packet processing, PerfWarn label	2015-02-06 12:21:05 -08:00
Stephen Birarda	c96085eb91	repairs to warnings shown in Xcode	2015-02-06 10:12:04 -08:00
Stephen Birarda	219e78425b	resolve conflicts on merge with upstream master	2015-02-06 09:49:46 -08:00
Andrew Meadows	5ea785f4ad	Merge pull request #4232 from thoys/cursor_is_visible_and_oculus_cursor_visibility ... Ability to make cursor invisible again (both OS-cursor and oculus rectile) and js-interface to cursorVisible boolean	2015-02-06 08:58:14 -08:00
Thijs Wenker	27147fde2a	add Write function to the Window.cursurVisible property	2015-02-06 14:45:22 +01:00
Sam Gateau	1b22a3ef36	connecting the globalLight info to the DeferredLightingEffect	2015-02-05 17:30:57 -08:00
David Rowe	9e34b36839	Send hifi command line url to other instance	2015-02-05 17:17:31 -08:00
David Rowe	ab758648c7	Show and focus on the other Interface instance	2015-02-05 16:44:26 -08:00
David Rowe	1fa50fa54d	Run only one instance of Windows Interface at a time ... OSX automatically does this.	2015-02-05 13:09:06 -08:00
Brad Davis	230d761ec3	fix display name scaling	2015-02-05 10:47:35 -08:00
David Rowe	3ceb1123b3	Cater for ellipses in circle3d overlay intersection	2015-02-05 09:39:16 -08:00
David Rowe	2f6749ff69	Implement dimensions test for 3D planar overlay intersection	2015-02-05 09:38:45 -08:00
David Rowe	056365932b	Make circle3d dimension property specify overall size not half size	2015-02-05 09:37:08 -08:00
Brad Davis	e1af9f8126	Merge remote-tracking branch 'upstream/master' into text-renderer	2015-02-04 21:04:47 -08:00
Clément Brisset	6a4577b6a5	Merge pull request #4231 from ZappoMan/crashonexit ... BUG FIXES: Crash on Exit with partially loaded scene & (near)-infinite loop in skipForward physics	2015-02-04 16:16:56 -08:00
Brad Hefta-Gaub	af91eee5a0	Merge pull request #4220 from sethalves/rework-bandwidth-meter ... fix several signed/unsigned comps, avoid sprintf in overlay code	2015-02-04 16:06:22 -08:00
Thijs Wenker	de3afa0637	keep a boolean for cursorHidden state, so we know when to hide the VR-mode-cursor while the normal cursor is hidden	2015-02-05 00:19:45 +01:00
Thijs Wenker	9dbcefed2a	Fix for making cursor invisible over the glwidget and js-interface to cursorVisible boolean	2015-02-04 23:23:27 +01:00
Brad Hefta-Gaub	8311d1a00a	Merge pull request #4228 from ctrlaltdavid/20279 ... CR for Job #20279 - Tools > Audio device selection doesn't work on Windows	2015-02-04 13:59:14 -08:00
ZappoMan	4061e14c2d	move static members of ResourceManager into DependencyManager	2015-02-04 13:24:37 -08:00
Brad Davis	1745ba9a7e	More OSX work, refactoring functions to shared, removing erroneuous Qt 5.4 dependency, fixing PrioVR text api usage	2015-02-04 12:42:27 -08:00
Seth Alves	bcf0846310	merge from master	2015-02-04 11:30:22 -08:00
Seth Alves	a645d784d8	uint32_t rather than uint, which mac doesn't like	2015-02-04 11:26:05 -08:00
Stephen Birarda	30afadc7b7	fixes for new settings API	2015-02-04 10:53:05 -08:00
Stephen Birarda	11f3161029	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
Brad Davis	8ca70c9e80	Removing some dev modifications	2015-02-03 23:30:43 -08:00
Brad Davis	f471597a73	Merge branch 'develop' into text-renderer	2015-02-03 23:07:19 -08:00
Brad Davis	d34c2ae26a	Merge branch 'master' into develop	2015-02-03 23:06:49 -08:00
Brad Davis	cb7f4ca672	Pre-pull checking	2015-02-03 23:06:09 -08:00
Brad Hefta-Gaub	de58c4a007	Merge pull request #4217 from Atlante45/master ... Fix for fps bug/field of view	2015-02-03 19:13:52 -08:00
Brad Hefta-Gaub	01f594b535	Merge pull request #4221 from AndrewMeadows/bispinor ... proof Andrew has a working Windows build on his laptop	2015-02-03 19:07:01 -08:00