7069 commits

Author	SHA1	Message	Date
Stephen Birarda	219e78425b	resolve conflicts on merge with upstream master	2015-02-06 09:49:46 -08:00
Brad Hefta-Gaub	f8d62d332a	Merge pull request #4222 from jherico/text-renderer ... Text renderer refactor to use signed distance field font rendering	2015-02-05 21:58:41 -08:00
Brad Davis	39794a7a40	Getting rid of some warnings	2015-02-05 21:00:34 -08:00
Brad Davis	dc1cc84c1c	Working on porting to mac compatible shaders	2015-02-05 12:58:09 -08:00
Brad Hefta-Gaub	d76ede624c	Merge pull request #4234 from AndrewMeadows/bispinor ... fix physics crash on disconnect from domain-server	2015-02-05 11:36:02 -08:00
Andrew Meadows	b4da2ddd52	fix physics crash on disconnect from domainserver	2015-02-05 09:13:32 -08:00
Brad Davis	da05c26aad	Moving shaders to standard format, adding bounding box support and using it in text node	2015-02-04 21:32:05 -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
Stephen Birarda	93a3158153	Merge branch 'master' of https://github.com/highfidelity/hifi into android	2015-02-04 15:16:23 -08:00
ZappoMan	8fd11e70cc	clamp dt for skipTimeForward to prevent near infinite loops	2015-02-04 15:16:18 -08:00
Stephen Birarda	c9c53453c3	repairs to local audio injector cleanup	2015-02-04 14:47:18 -08:00
Brad Davis	02f2f1c1bf	Fixing header order and code style	2015-02-04 14:36:03 -08:00
Brad Hefta-Gaub	97f888b340	Merge pull request #4227 from huffman/internal-delete-fix ... Add force delete to internal EntityTree deletes	2015-02-04 14:02:34 -08:00
ZappoMan	698fcd8116	fix crash on shutdown	2015-02-04 13:54: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
Philip Rosedale	fe3f01be7e	Merge pull request #4225 from ZappoMan/memleak ... actually delete resources... even on windows	2015-02-04 11:57:54 -08:00
Stephen Birarda	9461d5d8d1	drop samples from ring buffer if muted	2015-02-04 11:47:53 -08:00
Seth Alves	bcf0846310	merge from master	2015-02-04 11:30:22 -08:00
Brad Davis	ba277e802a	Working on OSX compilability	2015-02-04 11:29:31 -08:00
Seth Alves	a645d784d8	uint32_t rather than uint, which mac doesn't like	2015-02-04 11:26:05 -08:00
Stephen Birarda	e47333a808	specify QScriptable include under QtScript	2015-02-04 11:08:26 -08:00
Stephen Birarda	30afadc7b7	fixes for new settings API	2015-02-04 10:53:05 -08:00
Ryan Huffman	2b00e3fadc	Add force option to deleteEntity	2015-02-04 10:49:49 -08:00
ZappoMan	ded035094a	actually delete resources... even on windows	2015-02-04 10:45:04 -08:00
Stephen Birarda	11f3161029	resolve conflicts on merge with upstream/master	2015-02-04 10:38:05 -08:00
Stephen Birarda	a2002d169f	fix for exception handled lookup in LimitedNodeList	2015-02-04 10:27:33 -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	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	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	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
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	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
Atlante45	e4591e0d03	Work arount for QVariant not converting to QVariant	2015-02-03 17:11:32 -08:00
Seth Alves	8489ee04f3	fix a couple of signed vs unsigned comparisons.	2015-02-03 16:11:04 -08:00