13018 commits

Author	SHA1	Message	Date
Sam Gateau	6a0ca6e113	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-20 16:22:12 -07:00
Stephen Birarda	9fb8b55359	repairs to early return for sendNackPackets	2015-07-20 16:10:11 -07:00
Sam Gateau	b5090883a0	merge with latest network pr	2015-07-20 15:49:10 -07:00
Sam Gateau	59666f664a	merging my changes to remove cruff from application to AUstin;s latest	2015-07-20 15:37:17 -07:00
Andrew Meadows	7578a70c4c	Merge pull request #5359 from birarda/protocol ... Network Protocol Refactor	2015-07-20 14:30:58 -07:00
Brad Davis	488a449cb1	Merge branch 'master' into homer	2015-07-20 13:34:21 -07:00
Stephen Birarda	462ff97722	remove FlowLayout.cpp that was accidentally kept	2015-07-20 13:06:31 -07:00
Stephen Birarda	0177513285	resolve conflicts on merge with upstream/master	2015-07-20 12:29:38 -07:00
Sam Gateau	1a9f6e12a5	something not compiling but just before merge with upstream	2015-07-20 12:20:04 -07:00
Brad Hefta-Gaub	c41e20b90f	Merge pull request #5366 from jherico/marge ... Naked GL removal work	2015-07-20 12:12:22 -07:00
Brad Davis	3d09e772f9	Merge branch 'marge' into homer	2015-07-20 12:09:51 -07:00
Brad Davis	23b058e4eb	Removing starfield tilt and reducing grid alpha	2015-07-20 11:40:12 -07:00
Brad Davis	dcaaeec593	Removing AO effect (temporarily) and wireframe mode	2015-07-20 10:55:11 -07:00
Brad Davis	de92e66635	Removing shadows code	2015-07-20 09:59:22 -07:00
Brad Davis	d4e637c5b8	Removing superfluous lighting and naked GL in mirror	2015-07-20 09:36:05 -07:00
Stephen Birarda	6b11495a20	resolve conflicts on merge with upstream master	2015-07-20 08:51:48 -07:00
Brad Davis	5159452335	Fixing invalid vector usage and strange picking crash	2015-07-19 23:03:46 -07:00
Brad Davis	4c3cfe1e82	Starfield jazz hands	2015-07-19 20:53:50 -07:00
Brad Davis	81543d9185	Removing unneeded undef	2015-07-19 19:06:21 -07:00
Brad Davis	f13152b2b4	Fixing reference to PI/2	2015-07-18 23:04:16 -07:00
Brad Davis	0da8b27fcf	Removing unused files	2015-07-18 22:53:43 -07:00
Brad Davis	5b494c23fd	More header cleanup	2015-07-18 22:38:26 -07:00
Brad Davis	35f7307f30	More header cleanup	2015-07-18 22:15:50 -07:00
Brad Davis	0056208565	Another whack at GL headers	2015-07-18 17:04:44 -07:00
Brad Davis	c446bb307d	Adding convenience return *this to many transform methods	2015-07-18 16:56:32 -07:00
Brad Davis	e4f6586c3c	Working on star rendering, removal of naked GL	2015-07-18 16:40:54 -07:00
Philip Rosedale	61c2b172d4	Merge pull request #5357 from ctrlaltdavid/scriptable-muting ... Mute / un-mute face tracking when menu item is changed from script	2015-07-18 15:45:01 -07:00
David Rowe	47fdbedfb2	Fix FPS throttle default	2015-07-18 15:22:47 -07:00
David Rowe	7b11d02eb2	Default Throttle FPS to disabled	2015-07-18 14:18:08 -07:00
David Rowe	d0489bf2a0	Add menu item, Developer > Render > Throttle FPS If Not Focus	2015-07-18 14:18:06 -07:00
Brad Davis	b7fdfd8663	Working on lighting	2015-07-18 10:55:53 -07:00
Brad Davis	d68618e206	Removing GL headers from most files, and some naked GL from application.cpp	2015-07-18 00:46:09 -07:00
Sam Gateau	a0590182ad	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-17 17:44:54 -07:00
ZappoMan	98c078d995	move audio scope to the back	2015-07-17 17:44:29 -07:00
Sam Gateau	96e18af77b	trying to remove the naked gl calls aroiund the rearViewMirror	2015-07-17 17:44:25 -07:00
ZappoMan	ecab2538d7	quick hack to fix overlay ordering	2015-07-17 17:27:15 -07:00
Stephen Birarda	f8c832e50b	resolve conflicts on merge with upstream master	2015-07-17 16:48:46 -07:00
ZappoMan	26e8090ec1	Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL	2015-07-17 16:48:42 -07:00
Brad Hefta-Gaub	3ea348b73b	Merge pull request #5349 from jherico/marge ... Working on text rendering overlays	2015-07-17 16:47:48 -07:00
ZappoMan	eb989fd725	fix the backround colors for text overlays, pending austins PR to really fix them	2015-07-17 16:38:05 -07:00
ZappoMan	695470b1c1	fix audio scope	2015-07-17 16:30:10 -07:00
ZappoMan	8692f51399	dead code cleanup	2015-07-17 16:15:02 -07:00
Stephen Birarda	1fd4a1f0c3	resolve conflicts on merge with upstream master	2015-07-17 16:07:45 -07:00
Stephen Birarda	54edc6f993	Merge branch 'master' of https://github.com/highfidelity/hifi into protocol	2015-07-17 16:04:45 -07:00
ZappoMan	c20c6e4b90	fix retina in an Austin approved manner	2015-07-17 16:01:32 -07:00
ZappoMan	03a44a1c80	fix retina	2015-07-17 15:45:42 -07:00
Atlante45	e3f7c33767	Fix index check in setJointRotation	2015-07-17 15:39:25 -07:00
ZappoMan	ccd2f98a76	one more try	2015-07-17 15:28:25 -07:00
Atlante45	3f4041595a	Fix compile error in connect	2015-07-17 15:26:04 -07:00
Brad Hefta-Gaub	2df75f8bff	Merge pull request #5337 from bwent/audioStatsDialog ... Added a dialog box to display Audio Network Statistics	2015-07-17 14:45:51 -07:00