27829 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ericrius1	b44193c2ad	catching end of texture	2015-07-22 17:25:33 -07:00
ericrius1	3379291b05	making uv mapping DRIER	2015-07-22 16:13:02 -07:00
ericrius1	352c42d8d4	head body tail	2015-07-22 15:40:29 -07:00
ericrius1	75220a32e7	tail dynamic	2015-07-22 14:49:48 -07:00
ericrius1	b452566d75	transparent textures and setting up 9-patch system for texture scaling	2015-07-22 10:57:03 -07:00
ericrius1	99856df112	tail strip	2015-07-21 11:43:10 -07:00
ericrius1	e1f8871ec9	drawing trails at end of stroke	2015-07-21 10:48:25 -07:00
ericrius1	b9affba93f	textures working	2015-07-21 09:56:09 -07:00
ericrius1	9fc54a6040	getting closer to texturing properly	2015-07-20 15:33:21 -07:00
ericrius1	1e34de1c51	adding in screen space effect for getting hit	2015-07-20 10:44:38 -07:00
ericrius1	bad6aa8f0a	adding textures to poly line"	2015-07-17 15:39:44 -07:00
ericrius1	a44e5f949c	Merge branch 'master' into polyLineInProgress	2015-07-17 15:01:40 -07:00
ericrius1	5e3e1e4567	adding texture	2015-07-17 15:00:10 -07:00
Brad Hefta-Gaub	7d8f2e906b	Merge pull request #5340 from cozza13/20617 ... CR for Job #20617 - Change default Minimum Desktop FPS	2015-07-15 14:59:43 -07:00
samcake	de7aed1abc	Merge pull request #5338 from ZappoMan/removeGlowEffect ... Remove the glow effect.	2015-07-15 14:50:15 -07:00
Brad Hefta-Gaub	ae6e7f05b6	Merge pull request #5341 from samcake/daft ... Remove the glGet( viewport ) from DeferredLightingEffect	2015-07-15 14:26:08 -07:00
samcake	5e2fe8dbec	Merge pull request #5333 from ZappoMan/removeNakeGL ... Remove more naked GL Tested	2015-07-15 14:19:05 -07:00
ZappoMan	849b584596	more GlowEctomy	2015-07-15 13:16:38 -07:00
Chris Collins	ff288fdd5d	While we work on FPS I have decreased the default LOD FPS ... While we work on FPS I have decreased the default LOD FPS. In a new users preferences this will now show as 15 desktop and 30 HMD.	2015-07-15 13:09:55 -07:00
ZappoMan	c17794849d	more GlowEctomy	2015-07-15 12:58:15 -07:00
ZappoMan	819fa852b8	first pass at GlowEctomy	2015-07-15 12:47:59 -07:00
Sam Gateau	48f23a6eaf	Merge branch 'master' of https://github.com/highfidelity/hifi into daft	2015-07-15 11:29:41 -07:00
ZappoMan	6b06987700	remove dead code for magnifier	2015-07-15 10:48:07 -07:00
ZappoMan	0eeddddd6b	removed naked GL from drawOnHUD overlays.	2015-07-15 09:46:58 -07:00
Brad Davis	029af5354f	Merge pull request #5330 from ZappoMan/removeNakeGL ... Remove More Naked GL	2015-07-15 09:21:57 -07:00
samcake	f9e7558c3c	Merge pull request #5313 from jherico/marge ... Make scribe generated shaders more readable	2015-07-15 09:06:01 -07:00
ZappoMan	53c3e3d731	fix CR feedback	2015-07-15 09:03:07 -07:00
Brad Davis	b18dd54c10	Merge pull request #5331 from samcake/punk ... Caching the input buffers' gpuObject in GLBackend	2015-07-15 06:57:13 -07:00
samcake	9df26c8488	removing naked glViewport from DeferredLightingEffect by adding the current viewport in renderArgs	2015-07-15 00:24:43 -07:00
samcake	a6148ab73d	Remove naked gl call	2015-07-14 22:59:55 -07:00
samcake	c9112966ba	revert debug code	2015-07-14 22:00:32 -07:00
ZappoMan	e39ea72daf	removed dead code	2015-07-14 21:25:49 -07:00
ZappoMan	5d43c98ebc	fix image overlays to not use Naked GL	2015-07-14 20:56:36 -07:00
ZappoMan	8bb6616a25	remove nakedGL from skeleton IK constraint rendering	2015-07-14 18:47:35 -07:00
Sam Gateau	98a3141e11	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-14 18:38:21 -07:00
Sam Gateau	440464f884	Trying to improve the GLBackendINtpu cahce a bit and thinking about moving to core profile	2015-07-14 18:35:11 -07:00
ZappoMan	5a927c4c90	remove dead code	2015-07-14 18:25:50 -07:00
Brad Davis	1e6c2e737a	Merge pull request #5328 from ZappoMan/removeNakeGL ... removing Naked GL calls	2015-07-14 18:25:38 -07:00
ZappoMan	47dad82d50	removed dead code	2015-07-14 18:09:58 -07:00
samcake	de9f97d675	Merge pull request #5327 from ZappoMan/master ... Remove the NodeBounds feature	2015-07-14 18:06:07 -07:00
ZappoMan	f1b85aefa9	more dead code removal: NodeBounds	2015-07-14 17:59:20 -07:00
samcake	be5ce2114d	Merge pull request #5326 from ZappoMan/master ... Remove some dead code	2015-07-14 17:59:13 -07:00
ZappoMan	23b89a6f7d	remove naked gl/dead code from line and cube overlays	2015-07-14 17:04:07 -07:00
ZappoMan	d19c7125da	remove naked gl calls	2015-07-14 16:49:43 -07:00
ZappoMan	bc251de43c	delete dead code	2015-07-14 16:49:22 -07:00
Philip Rosedale	17ec524253	Merge pull request #5324 from ZappoMan/fixLaggingTouch ... fix lagging touch events	2015-07-14 16:28:00 -07:00
ZappoMan	68f4fe6566	fix lagging touch events	2015-07-14 16:03:44 -07:00
Philip Rosedale	221a92eeee	Merge pull request #5322 from ctrlaltdavid/fix-eye-direction ... Fix eye directions so that they're correct when avatar leans backwards	2015-07-14 15:38:56 -07:00
Stephen Birarda	6cd584ddd9	Merge pull request #5276 from Atlante45/clear_cache_and_restart ... Reload content menu item	2015-07-14 15:30:33 -07:00
Atlante45	22f0dbdefb	CR	2015-07-14 15:16:00 -07:00