21819 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ryan Huffman	a527bd85ba	Update Text3DOverlay::textSize to use new TextRenderer::getExtents	2015-02-11 12:13:26 -08:00
Ryan Huffman	d7e18d6f6d	Update TextOverlay::textSize to use new TextRenderer::getExtents	2015-02-11 11:04:04 -08:00
Brad Hefta-Gaub	3e8f7dc3da	Merge pull request #4263 from huffman/text-size ... Increase size of text entity	2015-02-10 15:04:32 -08:00
Ryan Huffman	9997ef1b97	Increase size of text entity	2015-02-10 14:23:00 -08:00
Brad Hefta-Gaub	d84398524b	Merge pull request #4258 from ctrlaltdavid/fix-windows-windowing ... Fix maximized Windows window unintentionally changing to windowed	2015-02-10 12:01:29 -08:00
Brad Hefta-Gaub	cf5fb49562	Merge pull request #4261 from Atlante45/reverb_memory_leak ... Reverb memory leak	2015-02-10 12:00:54 -08:00
Brad Hefta-Gaub	c06ca24819	Merge pull request #4259 from huffman/update-entity-list-style ... Update entity list style	2015-02-10 11:50:17 -08:00
Atlante45	562b289c05	Fix warning	2015-02-10 19:25:38 +01:00
Atlante45	438978b855	Fix reverb memory leak	2015-02-10 19:25:12 +01:00
Andrew Meadows	8a7f130c5b	Merge pull request #4257 from ZappoMan/bugfix ... fix a couple of bugs	2015-02-10 09:27:50 -08:00
Andrew Meadows	26b4882ddf	Merge pull request #4254 from birarda/master ... handle custom domain port if returned via place API	2015-02-10 09:26:53 -08:00
Ryan Huffman	39cc6c86ae	Update selected entity color to have more contrast	2015-02-10 09:03:48 -08:00
Ryan Huffman	8d65caaaef	Update entity list search input to be full width with margin	2015-02-10 09:03:21 -08:00
Ryan Huffman	7ac3bd3ee8	Add padding to buttons in entity list	2015-02-10 09:02:53 -08:00
David Rowe	45c0d0e6a9	Fix Windows --url command line parameter handling	2015-02-09 23:50:43 -08:00
David Rowe	4fa2b3a6e9	Fix maximized Windows window unintentionally changing to windowed ... This stops a maximized Windows window changing to being windowed when you click on a menu item.	2015-02-09 22:07:12 -08:00
ZappoMan	2f981686fa	fix bad colors on windows	2015-02-09 15:38:50 -08:00
ZappoMan	ea33c66681	fix formating issue in performance stats	2015-02-09 15:04:43 -08:00
Stephen Birarda	5f7c4278b8	handle custom domain-server port if it is present	2015-02-09 13:01:38 -08:00
Brad Hefta-Gaub	9aa9dac7f3	Merge pull request #4253 from ctrlaltdavid/fix-vsync-menu-item ... Fix VSync menu item on Windows	2015-02-09 12:37:50 -08:00
Brad Hefta-Gaub	967b04af1a	Merge pull request #4251 from jherico/master ... Fixing bug in text renderer causing glyphs to float at different depths	2015-02-09 12:24:47 -08:00
David Rowe	468433e70a	Fix VSync menu item on Windows	2015-02-09 12:01:53 -08:00
Brad Davis	b28920f4ed	Fixing bug in text renderer causing glyphs to float at different depths	2015-02-08 15:37:55 -08:00
Brad Hefta-Gaub	6378009992	Merge pull request #4249 from birarda/master ... don't force requirement of both debug and release versions of bullet	2015-02-08 12:52:41 -08:00
Brad Hefta-Gaub	0e779f34e1	Merge pull request #4250 from thoys/rssdk_fix_missing_constants ... rssdk fix missing constants	2015-02-07 21:24:55 -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
Stephen Birarda	adbf6de3e6	actually append found libraries to BULLET_LIBRARIES	2015-02-06 17:02:36 -08:00
Brad Hefta-Gaub	12ab841191	Merge pull request #4248 from samcake/temp0 ... Remove unneeded texture memory once loaded to GPU and Lightmap control in FBX	2015-02-06 16:52:40 -08: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
Stephen Birarda	6c2710354a	remove an extra cmake debug line	2015-02-06 16:36:15 -08:00
Stephen Birarda	f0f7bca5db	don't force requirement of BOTH debug/release Bullet	2015-02-06 16:35:25 -08:00
Sam Gateau	d4566bb1d7	Adding support for hifi_global light intensity & COlor and use it to adjust the lighmap parameters	2015-02-06 15:51:57 -08:00
Stephen Birarda	945b556e26	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-02-06 15:47:13 -08:00
Stephen Birarda	41d2da8712	remove doubled Q_INIT_RESOURCE calls	2015-02-06 15:28:36 -08:00
Stephen Birarda	caf50764b4	correct resource name for Q_INIT_RESOURCE	2015-02-06 15:27:50 -08:00
Stephen Birarda	961b5b5346	call Q_INIT_RESOURCE statically from Font constructor	2015-02-06 15:17:53 -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
Stephen Birarda	bde0f0ef73	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-02-06 14:20:03 -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	c7deb0f137	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-02-06 14:11:59 -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	df6071093c	fix for double packet check, unused var	2015-02-06 12:27:34 -08:00