12097 commits

Author	SHA1	Message	Date
ZappoMan	4dadf60724	some tweaks from Sam	2015-07-17 12:50:20 -07:00
ZappoMan	33464dfd6c	cleanup dead code	2015-07-17 11:35:42 -07:00
ZappoMan	efa2001325	Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL	2015-07-17 09:25:37 -07:00
ZappoMan	410e0a99ad	hacking on more naked GL	2015-07-16 16:45:58 -07:00
ZappoMan	069620b2d9	hacking on more naked GL	2015-07-16 16:36:48 -07:00
ZappoMan	09430b6596	hacking on more naked GL	2015-07-16 16:27:41 -07:00
ZappoMan	398075e45a	hacking on more naked GL	2015-07-16 16:26:28 -07:00
samcake	b7ac84e174	Merge pull request #5342 from ZappoMan/removeNakeGL ... remove some more dead code and naked gl	2015-07-15 17:07:55 -07:00
Howard Stearns	01a3701b52	Merge pull request #5329 from SamGondelman/hydraFix ... Hydra hand and mouse fixes	2015-07-15 19:03:04 -05:00
ZappoMan	d5a6e87a02	remove naked gl from Avatar::calculateDisplayNameTransform()	2015-07-15 16:34:23 -07:00
ZappoMan	7795eaace6	remove more naked gl	2015-07-15 15:56:27 -07:00
ZappoMan	d1e511efcb	more naked gl cleanup, deleting dead code, tweaking comments so they don't give false positives in searching for more naked gl	2015-07-15 15:52:12 -07:00
ZappoMan	2ad2c4d554	remove some dead code	2015-07-15 15:33:28 -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
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
ZappoMan	53c3e3d731	fix CR feedback	2015-07-15 09:03:07 -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	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
Sam Gondelman	6a0df442f9	emulated mouse events don't get sent back to the keyboard (can't right click and drag with sixense, etc)	2015-07-14 17:59:59 -07:00
ZappoMan	f1b85aefa9	more dead code removal: NodeBounds	2015-07-14 17:59:20 -07:00
Sam Gondelman	f3cb25065f	can't move when hydras at base, hands can deactivate individually	2015-07-14 17:36:22 -07:00
ZappoMan	23b89a6f7d	remove naked gl/dead code from line and cube overlays	2015-07-14 17:04:07 -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
David Rowe	bfad3ee02a	Fix eye directions so that they're correct when avatar leans backwards	2015-07-14 14:07:32 -07:00
Atlante45	a32f54da2f	Cleanup	2015-07-14 12:36:18 -07:00
Atlante45	7bf45308b6	Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart	2015-07-14 12:31:37 -07:00
Brad Hefta-Gaub	049419cec7	Merge pull request #5307 from howard-stearns/remove-octreeFades ... Remove old octreeFade code that wasn't working anyway	2015-07-14 10:24:01 -07:00
Brad Davis	684d466b44	Merge pull request #5308 from venkatn93/avatar ... Avatars rendered correctly based on Scene.shouldRenderAvatars	2015-07-14 09:06:49 -07:00
Niraj Venkat	ef3c6b25e0	More coding standard changes	2015-07-14 00:45:38 -07:00
Niraj Venkat	1f1a5f8e75	Coding standard and fixing pointers	2015-07-13 22:57:11 -07:00
Philip Rosedale	c81053fc83	Merge pull request #5318 from samcake/punk ... Fixing the ImageOverlay Bug	2015-07-13 22:25:46 -07:00
Clément Brisset	a432752c39	Merge pull request #5316 from ctrlaltdavid/20604 ... QA for #20604 - Add an "is looking at me" indicator above avatars' heads	2015-07-13 16:40:11 -07:00
Sam Gateau	f08c608195	Remove dead code	2015-07-13 16:33:04 -07:00
Sam Gateau	5555ccd225	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-13 16:19:09 -07:00