21802 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Atlante45	cc58cb0f03	Update domain-server and Application setting handles	2015-02-02 20:06:13 -08:00
Atlante45	5388ed1c4a	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-02-02 18:38:09 -08:00
Atlante45	f0b5cd195d	Renaming + end of file spaces	2015-02-02 18:37:49 -08:00
Stephen Birarda	9a0c102fb6	remove some extra spaces in Application	2015-02-02 17:27:53 -08:00
Atlante45	1e64fc84e8	Moved startup Application info settings load out of Application	2015-02-02 17:19:54 -08:00
Stephen Birarda	ef82b90b89	add back the Application getter in ApplicationOverlay	2015-02-02 17:19:33 -08:00
Stephen Birarda	67c21be5dc	remove old audioIO connections for bandwidth	2015-02-02 17:17:22 -08:00
Atlante45	9abdb41764	Rearrange settings classes in correct files	2015-02-02 17:17:19 -08:00
Stephen Birarda	c904a62e64	repairs for defines in GVRMainWindow	2015-02-02 17:15:24 -08:00
Stephen Birarda	28d710877c	remove application calls from audio-client	2015-02-02 17:13:08 -08:00
Stephen Birarda	bd0552618f	resolve conflicts on merge with upstream/master	2015-02-02 17:10:13 -08:00
Stephen Birarda	951617d40a	get PlatformActivity menu working in GVR	2015-02-02 17:01:04 -08:00
Atlante45	633ec9807d	New settings api	2015-02-02 15:56:03 -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	c1ae98fa1a	quiet some compiler warnings about signed vs unsigned comparisons	2015-02-02 15:02:29 -08:00
Stephen Birarda	3f50311d04	handle back key press in GVRMainWindow	2015-02-02 12:54:15 -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
David Rowe	6e82679997	Permanently re-enable audio selection on Windows	2015-02-02 11:19:11 -08:00
Stephen Birarda	30a9f6159b	add required files for ndk-gdb	2015-02-02 11:01:35 -08:00
Stephen Birarda	884d8713ee	actually enter and leave vr mode	2015-02-02 10:04:04 -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
Seth Alves	b85456b1e9	refactoring, cause BandwidthDialog to only update numbers once per second	2015-02-02 05:28:28 -08:00
Brad Davis	0726f7cd21	Example images from text rendering test	2015-02-01 19:49:01 -08:00
Brad Davis	8bac67abf9	Merge branch 'develop' into text-renderer	2015-02-01 19:47:05 -08:00
Brad Davis	a096c79747	Working on text rendering test	2015-02-01 19:46:49 -08:00
Brad Davis	96a5a02e18	Merge branch 'develop' into text-renderer	2015-02-01 16:25:34 -08:00
Brad Davis	ab1624b0a8	Adding matrix stack (currently not used	2015-02-01 16:25:17 -08:00
Brad Davis	6835068496	Adding text rendering test tool	2015-02-01 16:24:43 -08:00
Brad Davis	711506e055	Moving implementation details out of header	2015-02-01 14:15:34 -08:00
Brad Davis	0ca928ca3d	Merge branch 'oglplus' into text-renderer	2015-02-01 11:48:28 -08:00
Brad Davis	95a4e1626e	Merge branch 'oglplus' into develop	2015-02-01 11:48:10 -08:00