21924 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Davis	8ca70c9e80	Removing some dev modifications	2015-02-03 23:30:43 -08:00
Brad Davis	0dcf5b001f	Some more cleanup	2015-02-03 23:26:15 -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 Davis	3ead8fc8a2	Adding some more example images	2015-02-03 22:32:03 -08:00
Brad Davis	53b0fd409d	Tweaking text scaling value to more closely match old text renderer	2015-02-03 22:30:39 -08:00
Brad Davis	1af2b65714	Fixing scaling to lineHeight	2015-02-03 22:21:32 -08:00
Brad Davis	42703d2234	Working on testing code	2015-02-03 22:13:16 -08:00
Brad Davis	77ce737f61	Working on porting renderable text item to new code	2015-02-03 22:11:24 -08:00
Brad Davis	9a6175a3b9	Starting to work on replacement for clip planes	2015-02-03 22:10:44 -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	bb8362b104	Merge pull request #4219 from ctrlaltdavid/20267 ... CR for Job #20267 - Create progress.js script as download progress indicator	2015-02-03 19:07:36 -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
Atlante45	fc4bf0c325	Don't check gl errors	2015-02-03 18:55:52 -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
Atlante45	7a03daa76f	Inline setFieldOfView	2015-02-03 18:51:26 -08:00
Brad Hefta-Gaub	79b04afaf8	Merge pull request #4210 from ctrlaltdavid/20280 ... CR for Job #20280 - Warn if Interface and Stack have incompatible build level	2015-02-03 18:51:17 -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
Brad Davis	cab31e7190	Working on text coordinates	2015-02-03 18:43:24 -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
Andrew Meadows	547a416c3b	merge upstream/master into andrew/bispinor	2015-02-03 18:33:10 -08:00
Seth Alves	450787fde2	Merge branch 'master' of github.com:highfidelity/hifi into rework-bandwidth-meter	2015-02-03 17:33:27 -08:00
Andrew Meadows	1e00d2199a	Merge pull request #4218 from samcake/temp0 ... Fix the lightmap not displaying when using the texcoord0	2015-02-03 17:23:25 -08:00
Seth Alves	3d23446dcb	remove a couple more sprintfs	2015-02-03 17:21:41 -08:00
Atlante45	e4591e0d03	Work arount for QVariant not converting to QVariant	2015-02-03 17:11:32 -08:00
Seth Alves	c97eb20d69	avoid use of sprintf in overlay code	2015-02-03 17:11:10 -08:00
Stephen Birarda	a86073384b	toggle login/logout for correct state	2015-02-03 16:25:09 -08:00
David Rowe	ca302e305b	Add progress.js to defaultScripts.js	2015-02-03 16:17:06 -08:00
David Rowe	78bcf3ddcb	Update SVG URLs to use S3 files	2015-02-03 16:15: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
Sam Gateau	5719e277dd	FIx the lightmap not displaying when using the texcoord0	2015-02-03 16:10:31 -08:00
Stephen Birarda	dc84c336ea	handle login failure, have AccountManager generate keypair	2015-02-03 16:09:06 -08:00
Atlante45	875507aaaa	Missing return	2015-02-03 15:58:24 -08:00
Stephen Birarda	64fda3253e	add a LoginDialog and pass credentials to AccountManager	2015-02-03 15:53:07 -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
David Rowe	8dd87aff16	Adjust size of 2D progress bar	2015-02-03 14:27:43 -08:00
David Rowe	46352d34ce	Make 3D progress bar match up with notifications	2015-02-03 14:27:43 -08:00
David Rowe	fdf4aeaeab	Display 3D progress bar	2015-02-03 14:27:42 -08:00
David Rowe	7beb5bf25f	Show and hide progress bar per downloads status	2015-02-03 14:27:41 -08:00
David Rowe	9b6a81cfb0	Display 2D progress bar	2015-02-03 14:27:41 -08:00
David Rowe	1fdebf63a4	Add progress.js; calculate download percent complete value	2015-02-03 14:27:40 -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
Brad Hefta-Gaub	fa608477b2	Merge pull request #4213 from sethalves/rework-bandwidth-meter ... Rework bandwidth meter	2015-02-03 13:53:24 -08:00