10821 commits

Author	SHA1	Message	Date
Stephen Birarda	c96085eb91	repairs to warnings shown in Xcode	2015-02-06 10:12:04 -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
Brad Davis	230d761ec3	fix display name scaling	2015-02-05 10:47:35 -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
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
Brad Davis	0c78af9abb	Working on text rendering refactor	2015-02-03 18:57:39 -08:00
Brad Hefta-Gaub	b9ee1294fa	Merge pull request #4216 from ctrlaltdavid/20281 ... Fix orientation of non-solid rectangle3d overlays, too	2015-02-03 18:52:51 -08:00
Brad Davis	d64e7c464a	Merge branch 'develop' into text-renderer	2015-02-03 18:44:06 -08:00
Brad Davis	190669d168	Merge branch 'master' into develop	2015-02-03 18:43:51 -08:00
Andrew Meadows	35cbc9a41d	pass FBXGeometry by const reference ... this fixes a bug on windows about misaligned data in function call	2015-02-03 18:40:55 -08:00
Seth Alves	3d23446dcb	remove a couple more sprintfs	2015-02-03 17:21:41 -08:00
Seth Alves	c97eb20d69	avoid use of sprintf in overlay code	2015-02-03 17:11:10 -08:00
Atlante45	578ab1a9f2	Leave LOD settings as globals	2015-02-03 16:13:13 -08:00
Seth Alves	8489ee04f3	fix a couple of signed vs unsigned comparisons.	2015-02-03 16:11:04 -08:00
Atlante45	875507aaaa	Missing return	2015-02-03 15:58:24 -08:00
David Rowe	8297bbd5e7	Fix orientation of non-solid rectangle3d overlays, too	2015-02-03 15:52:20 -08:00
Atlante45	375d9eed5b	Fix QTimer warning	2015-02-03 15:22:52 -08:00
David Rowe	d9e353e498	Merge branch 'master' into 20280 ... Conflicts: libraries/networking/src/LimitedNodeList.h	2015-02-03 14:46:27 -08:00
Brad Hefta-Gaub	b5e62922a2	Merge pull request #4215 from huffman/edit-changes ... A few improvements to editEntities.js	2015-02-03 13:55:59 -08:00
Brad Hefta-Gaub	81871abd06	Merge pull request #4214 from ctrlaltdavid/20281 ... Fix orientation of rectangle3d overlays to match other 3D overlays	2015-02-03 13:54:19 -08:00
Atlante45	78a9d002db	Remove settings from InboundAudioStream	2015-02-03 12:47:25 -08:00
Atlante45	27459ba861	Settings update	2015-02-03 12:27:30 -08:00
Ryan Huffman	ba5a96f541	Add Window.setFocus	2015-02-03 11:44:22 -08:00
David Rowe	7f7cba8a1b	Fix orientation of rectangle3d overlays to match other 3D overlays	2015-02-03 10:54:16 -08:00
Atlante45	aacf61609f	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-02-03 10:53:44 -08:00
Atlante45	09a9f82256	More settings update	2015-02-03 10:52:50 -08:00
Seth Alves	0fa1273cc9	draw background behind bandwidth overlay stats	2015-02-03 10:51:20 -08:00
Atlante45	fdade344a3	Move Audio to new settings	2015-02-03 10:15:11 -08:00
Philip Rosedale	6483df69a4	Merge pull request #4209 from sethalves/rework-bandwidth-meter ... Consolidate Network Bandwidth Metrics	2015-02-03 09:05:28 -08:00
Ryan Huffman	13ea8ddb9e	Add missing _texture to BillboardOverlay copy ctor	2015-02-03 08:52:58 -08:00
Brad Davis	6cfb51283e	Working on the text renderer	2015-02-03 01:49:06 -08:00
Atlante45	cc58cb0f03	Update domain-server and Application setting handles	2015-02-02 20:06:13 -08:00
Atlante45	1e64fc84e8	Moved startup Application info settings load out of Application	2015-02-02 17:19:54 -08:00
Seth Alves	3fdf05ff77	coding standard	2015-02-02 15:36:18 -08:00
Seth Alves	82b8595af8	coding standard	2015-02-02 15:34:08 -08:00