21404 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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 Davis	0c78af9abb	Working on text rendering refactor	2015-02-03 18:57:39 -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	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
Sam Gateau	5719e277dd	FIx the lightmap not displaying when using the texcoord0	2015-02-03 16:10:31 -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
Ryan Huffman	e2b6be2a92	Fix focus behavior when selecting an item without shift	2015-02-03 11:58:39 -08:00
Ryan Huffman	7f0fdbe23e	Make auto-focus in editEntities always use ease-on-focus	2015-02-03 11:50:58 -08:00
Ryan Huffman	814d585086	Make the entity list always visible	2015-02-03 11:44:38 -08:00
Ryan Huffman	ba5a96f541	Add Window.setFocus	2015-02-03 11:44:22 -08:00
Ryan Huffman	74dfd29708	Remove Mass from entity properties window	2015-02-03 11:44:01 -08:00
David Rowe	7f7cba8a1b	Fix orientation of rectangle3d overlays to match other 3D overlays	2015-02-03 10:54:16 -08:00
Seth Alves	d2c70936e3	coding standard, remove unneeded asserts	2015-02-03 10:51:35 -08:00
Seth Alves	0fa1273cc9	draw background behind bandwidth overlay stats	2015-02-03 10:51:20 -08:00
Brad Hefta-Gaub	35431a0a4c	Merge pull request #4211 from PhilipRosedale/master ... Dice.js script that lets you, well, throw dice	2015-02-03 10:46:32 -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
Philip Rosedale	c234f3372f	Merge pull request #4212 from huffman/fix-clone-billboard ... Add missing _texture to BillboardOverlay copy ctor	2015-02-03 09:04:30 -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
Brad Davis	5d9aee16cb	Merging develop branch	2015-02-03 00:28:52 -08:00
Brad Davis	0fab50a388	Updating example text	2015-02-03 00:27:58 -08:00
Brad Davis	2d029314e6	Merge branch 'develop' into text-renderer	2015-02-02 23:30:16 -08:00
Brad Davis	f7b2266f92	Fixing oglplus find	2015-02-02 23:30:07 -08:00
Brad Davis	68448daa18	Moving closer to the original coordinate system	2015-02-02 23:29:46 -08:00
Brad Davis	8d81607e28	Tweaking the example text renderer	2015-02-02 23:27:57 -08:00
Philip Rosedale	35aeb86acc	First version, dice script	2015-02-02 23:15:18 -08:00
Philip Rosedale	28964cfc4c	Merge branch 'master' of https://github.com/worklist/hifi	2015-02-02 21:33:05 -08:00
Philip Rosedale	2ae6514c87	Merge pull request #4200 from PhilipRosedale/master ... Planet simulation script	2015-02-02 21:31:47 -08:00
Philip Rosedale	81fe2d69ba	Merge pull request #4207 from huffman/billboard-update ... Update BillboardOverlay to use NetworkTexture	2015-02-02 21:30:18 -08:00
Seth Alves	38162380ad	coding standard	2015-02-02 15:37:28 -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
Seth Alves	e779a55e22	remove stray debugging line	2015-02-02 12:30:11 -08:00
Seth Alves	8e64417607	formatting and cleanups	2015-02-02 12:21:46 -08:00
Seth Alves	4377105410	formatting and cleanups	2015-02-02 12:13:54 -08:00
Brad Davis	e71b61a256	remove oglplus references	2015-02-02 12:01:21 -08:00
Seth Alves	779a0086c4	BandwidthRecorder no longer knows about channel displays. cause overlay pps and Mbps to only update once per second	2015-02-02 11:56:50 -08:00
Seth Alves	f1cca2ac92	move bandwidth stats display details out of recorder class into dialog class	2015-02-02 09:26:09 -08:00
Seth Alves	c0a219678c	use DependencyManager to keep track of BandwidthRecorder	2015-02-02 08:55:55 -08:00
Philip Rosedale	aa86db202c	Merge branch 'master' of https://github.com/worklist/hifi	2015-02-02 07:05:04 -08:00