28733 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stephen Birarda	2c965eee91	fix ugly deref of matchingPeer	2015-07-22 14:42:44 -07:00
Stephen Birarda	5bed3502ef	fix order of ctors and assignment operators	2015-07-22 14:15:17 -07:00
Stephen Birarda	023f3b8134	fix sequence number read in PacketReceiver	2015-07-22 11:34:30 -07:00
Stephen Birarda	4a11bdc22e	indentation and spacing fixes	2015-07-22 11:26:28 -07:00
Stephen Birarda	12e684bea1	fix identation for NLPacket move ctor	2015-07-22 11:21:31 -07:00
Stephen Birarda	3fbda89f1d	copy version in Packet move ctor/assignment	2015-07-22 11:17:50 -07:00
Stephen Birarda	8363b0d522	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2015-07-22 11:06:53 -07:00
Stephen Birarda	8bf507dd24	add a sanity check for data NLPacket ctor	2015-07-22 11:06:13 -07:00
Brad Hefta-Gaub	3f8348c3d7	Merge pull request #5384 from jherico/homer ... Make stars a little smaller	2015-07-22 11:04:15 -07:00
Stephen Birarda	1386aa57da	repair to NLPacket creation from Packet and char*	2015-07-22 11:02:45 -07:00
Bradley Austin Davis	68cf3776f0	Make stars a little smaller	2015-07-22 13:44:37 -04:00
Brad Hefta-Gaub	bf0bf09c98	Merge pull request #5379 from jherico/marge ... Break framebuffer operations out of TextureCache, minor naked GL removal	2015-07-22 10:24:14 -07:00
Stephen Birarda	fb7130120a	another rename to Socket callbacks	2015-07-22 10:16:26 -07:00
Stephen Birarda	7f53eda0d9	naming changes to udt::Socket handlers	2015-07-22 10:01:24 -07:00
Stephen Birarda	240f53ddd2	bunch up the NLPacket constructors	2015-07-22 09:51:13 -07:00
Bradley Austin Davis	2f13488f11	Fixing FBO bug on resizing windows	2015-07-22 11:28:36 -04:00
Bradley Austin Davis	de30288b5d	Merge remote-tracking branch 'upstream/master' into marge	2015-07-22 11:03:36 -04:00
Brad Hefta-Gaub	4e04f0d887	Merge pull request #5381 from jherico/bart ... Fix deadlock when using textoverlay from main thread	2015-07-22 07:59:35 -07:00
Brad Hefta-Gaub	2bd2004bda	Merge pull request #5380 from jherico/maggie ... Restoring starfield size and color variation	2015-07-22 07:58:15 -07:00
Brad Hefta-Gaub	60637befbc	Merge pull request #5382 from jherico/homer ... Fix domain connection status border	2015-07-22 07:42:03 -07:00
Bradley Austin Davis	65732d874c	Merge branch 'maggie' into marge	2015-07-22 09:07:50 -04:00
Bradley Austin Davis	c0048afbec	Merge branch 'bart' into marge	2015-07-22 09:07:45 -04:00
Bradley Austin Davis	190984657e	Merge branch 'homer' into marge	2015-07-22 09:07:33 -04:00
Bradley Austin Davis	a93e17d622	Fix domain connection status border	2015-07-22 08:27:51 -04:00
Bradley Austin Davis	9596452c32	Trying to fix oculus rendering	2015-07-22 08:07:44 -04:00
Bradley Austin Davis	ae539afafb	Fix deadlock when using textoverlay from main thread	2015-07-22 07:23:12 -04:00
Bradley Austin Davis	bd5da87551	Merge remote-tracking branch 'upstream/master' into marge	2015-07-21 19:23:38 -04:00
Bradley Austin Davis	d6994c6dfd	Restoring star size and color variation	2015-07-21 19:22:10 -04:00
Bradley Austin Davis	c3f77a1c24	Merge branch 'master' into maggie	2015-07-21 19:21:45 -04:00
Brad Hefta-Gaub	6dbe6bc375	Merge pull request #5332 from ctrlaltdavid/20612 ... Fix full-screen mirror not mirroring correctly with Faceshift or DDE	2015-07-21 13:32:56 -07:00
Andrew Meadows	d6aa6b930b	Merge pull request #5368 from bwent/keyLightDirectionFix ... Add Vec3 function to convert a Vec3 to/from Euler angles	2015-07-21 13:31:28 -07:00
bwent	5a8106a049	fixes in edit.js UI	2015-07-21 13:15:24 -07:00
Stephen Birarda	30225ba3c1	fix spacing for multi-line QDebug in PacketReceiver	2015-07-21 13:05:38 -07:00
Stephen Birarda	086e4efe44	verify packet versions at ice-server	2015-07-21 13:03:39 -07:00
Stephen Birarda	4604bc5a3a	leverage udt::Socket in ice-server	2015-07-21 12:27:27 -07:00
Stephen Birarda	da761d4c95	fix static methods to handle header read/write	2015-07-21 12:12:15 -07:00
Stephen Birarda	a61c04aa92	allow socket owner to specify unfiltered packets	2015-07-21 12:00:16 -07:00
Stephen Birarda	ed6867e1a0	add a method to LNL to verify packets	2015-07-21 11:47:06 -07:00
bwent	2b745395ec	use radius for z-component	2015-07-21 11:38:10 -07:00
bwent	d688e5f915	fix case where v not normalizable	2015-07-21 11:08:53 -07:00
bwent	30d4b9f635	switch to radians, overload fromPolar, use atan2	2015-07-21 11:08:53 -07:00
bwent	89eed589e2	Add Vec3 function to convert vec3 to/from euler angles	2015-07-21 11:08:53 -07:00
Stephen Birarda	3901dbae33	fix for broken move in NLPacket/Packet	2015-07-21 11:06:25 -07:00
Stephen Birarda	a8618ab3d5	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2015-07-21 10:19:12 -07:00
Philip Rosedale	cf88bce082	Merge pull request #5367 from ctrlaltdavid/fix-speech-bubble-not-rendering ... Fix Avatar > Blue Sphere While Speaking not rendering	2015-07-21 09:11:36 -07:00
Bradley Austin Davis	fda1cb6f7b	Merge remote-tracking branch 'upstream/master' into marge	2015-07-21 08:59:29 -07:00
Brad Davis	9016f437a8	Merge pull request #5371 from Atlante45/smart_pointers ... Smart pointers fixes	2015-07-21 08:52:29 -07:00
Brad Davis	5b63863dca	Merge pull request #5378 from ZappoMan/warningFixes ... coding standard fix	2015-07-21 08:52:17 -07:00
David Rowe	716211c6b7	Merge branch 'master' into fix-speech-bubble-not-rendering	2015-07-21 08:45:13 -07:00
ZappoMan	558f10640b	coding standard fix	2015-07-21 08:30:33 -07:00