7107 commits

Author	SHA1	Message	Date
Stephen Birarda	0498c5c708	provide old ASI APIs in AudioInjector	2015-02-11 15:57:32 -08:00
Stephen Birarda	7b485829c4	cleanup AudioInjector memory management	2015-02-11 15:52:00 -08:00
Brad Hefta-Gaub	9a7ed8055f	Merge pull request #4267 from samcake/master ... Fix performance bug for NetworkGeometry::isLoadedWithTextures() and glTransform removal	2015-02-11 09:45:29 -08:00
Andrew Meadows	5975380892	Merge pull request #4266 from ZappoMan/bugfix ... fix color issues with quads	2015-02-11 09:03:10 -08:00
Andrew Meadows	68c1e9ef71	Merge pull request #4260 from birarda/master ... replace data with metaverse for highfidelity urls, allow optional gvr-interface build	2015-02-11 09:02:18 -08:00
Sam Gateau	a6f006a36d	more cleaning	2015-02-10 18:41:36 -08:00
Sam Gateau	b9fd116dbf	Introduce a cache bit in networkGemometry to capture the status of texture LOaded and avoid requiring everything once everything is loaded and get rid of the Transform stack calls on gl from gpu	2015-02-10 18:38:48 -08:00
ZappoMan	8016fb5e0d	fix color issues with quads	2015-02-10 17:35:27 -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
Stephen Birarda	fe79d8902e	replace data with metaverse for highfidelity urls	2015-02-10 10:05:38 -08:00
Stephen Birarda	5f7c4278b8	handle custom domain-server port if it is present	2015-02-09 13:01:38 -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	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
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	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
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
Stephen Birarda	9a98e07b2d	call Q_INIT_RESOURCE from mains to handle static link	2015-02-06 12:39:14 -08:00
Sam Gateau	e9add29af1	texture memory	2015-02-06 12:17:51 -08:00
Stephen Birarda	7b5af1e3fd	cleanup debug for font load	2015-02-06 12:06:20 -08:00
Stephen Birarda	27b91e7d43	use QIODevice for loadFont method	2015-02-06 12:04:57 -08:00
Brad Hefta-Gaub	c90c0b53c3	Merge pull request #4242 from huffman/fix-ac-entity-viewer ... Fix ac entity viewer	2015-02-06 12:01:13 -08:00
Stephen Birarda	f32556d64a	Merge branch 'master' of https://github.com/highfidelity/hifi into binary-fonts	2015-02-06 11:50:38 -08:00
Brad Hefta-Gaub	79b397fc3f	Merge pull request #4241 from birarda/master ... repairs for warnings exposed in Xcode	2015-02-06 11:49:29 -08:00
Stephen Birarda	c8fb891158	move fonts to sdff files, load with qrc	2015-02-06 11:48:55 -08:00
Ryan Huffman	4a3ee02b11	Initialize _entityScriptingInterface in ScriptEngine	2015-02-06 11:31:19 -08:00
Stephen Birarda	58d5e0b9d3	fix some asterisk type squishes in TextRenderer	2015-02-06 10:48:10 -08:00
Seth Alves	9539292c22	clarify settings explaination, coding standard	2015-02-06 10:44:35 -08:00
Stephen Birarda	c96085eb91	repairs to warnings shown in Xcode	2015-02-06 10:12:04 -08:00
Stephen Birarda	219e78425b	resolve conflicts on merge with upstream master	2015-02-06 09:49:46 -08:00
Seth Alves	839b622a05	formatting	2015-02-06 09:20:16 -08:00
Seth Alves	6d5d6b9085	Merge branch 'master' of github.com:highfidelity/hifi into allowed-editors	2015-02-06 09:15:41 -08:00
Seth Alves	60a4f48985	rather than a list of allowed editors, a list of allowed lockers/unlockers	2015-02-06 09:14:40 -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
Seth Alves	46bf6ea5da	coding standard	2015-02-05 16:37:37 -08:00
Seth Alves	bad44c540a	also guard deleteEntity and getEntityProperties with canEdit. make canEdit available to javascript	2015-02-05 16:22:52 -08:00
Seth Alves	80cf571d7d	formatting	2015-02-05 15:43:27 -08:00
Seth Alves	485785be7f	Allowed Editors setting in DomainServer; domain-list wire protocol includes "you can edit" boolean after uuid; entity server checks canEdit flag of node who sends edit requests; interface does not attempt to do edits if DomainServer sent false for "you can edit"	2015-02-05 15:37:14 -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