3030 commits

Author	SHA1	Message	Date
ZappoMan	6f85cfdb2f	more warnings fixes	2014-03-15 23:00:03 -07:00
ZappoMan	851764a705	more warning fixes	2014-03-15 22:36:43 -07:00
ZappoMan	adb6ffe7c4	more warnings fixes	2014-03-15 22:00:44 -07:00
ZappoMan	61a905961e	darnit I hate casts..	2014-03-14 22:48:32 -07:00
Brad Hefta-Gaub	1f77505871	more unix warnings cleanup	2014-03-14 18:35:34 -07:00
Brad Hefta-Gaub	c6f8d34ded	fix unix warning	2014-03-14 18:16:38 -07:00
Brad Hefta-Gaub	c0ee3fa1f0	fix unix warning	2014-03-14 18:14:54 -07:00
Brad Hefta-Gaub	0e7e337807	fixed uninitialized variable warning	2014-03-14 18:05:40 -07:00
Brad Hefta-Gaub	711e6ca3f5	clean up casts and types to fix warnings in a cleaner way	2014-03-14 17:43:55 -07:00
Andrzej Kapolka	4ca7e873f6	Merge pull request #2319 from AndrewMeadows/warnings ... removing a few compile warnings	2014-03-14 16:23:35 -07:00
Andrew Meadows	ab84526a1b	removing compile warnings	2014-03-14 16:12:32 -07:00
Andrew Meadows	d4c7e25f8e	Merge branch upstream/master into "hands" project	2014-03-14 14:28:50 -07:00
Brad Hefta-Gaub	8f200e917b	fix JS radians vs degrees issues	2014-03-14 13:03:14 -07:00
Andrew Meadows	a045a87cca	Remove arm stretching, add sixense calibration	2014-03-14 11:11:00 -07:00
Atlante45	423f26f669	Review comments	2014-03-13 15:26:02 -07:00
Atlante45	e5b5778caf	Upload FST	2014-03-13 15:04:22 -07:00
Atlante45	51585acd25	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader	2014-03-13 10:53:24 -07:00
Stephen Birarda	54d73d4a64	use floor since round is missing on windows	2014-03-12 17:50:58 -07:00
Stephen Birarda	bd6c42a685	define roundf for use on Win from ScriptEngine	2014-03-12 17:32:52 -07:00
Stephen Birarda	060d8be9f4	Merge branch 'master' of https://github.com/highfidelity/hifi into agent-audio	2014-03-12 17:07:21 -07:00
Stephen Birarda	3b653ca542	add a sendAvatarAudioStream option to Agent for mixer load testing, closes #2291	2014-03-12 17:00:12 -07:00
Andrzej Kapolka	9ad2ea9059	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-03-12 15:30:39 -07:00
AndrewMeadows	bed8617846	Merge pull request #2277 from ZappoMan/server_scale_testing ... Voxel/Particle Server Scaling Work	2014-03-12 15:24:29 -07:00
Andrzej Kapolka	6fb313cc43	Allow streaming uints.	2014-03-12 13:03:59 -07:00
Andrzej Kapolka	f088912ecf	More GCC warning fixes.	2014-03-12 12:51:43 -07:00
Andrzej Kapolka	064f784db1	More OS X warning fixes.	2014-03-12 12:23:23 -07:00
Andrzej Kapolka	ffb9273da8	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-03-12 12:11:43 -07:00
Andrzej Kapolka	4c7737443e	Fix for OS X warning.	2014-03-12 12:11:30 -07:00
Andrzej Kapolka	e249b29b45	Merge pull request #2268 from AndrewMeadows/radians ... prefer radians over degrees	2014-03-12 12:10:29 -07:00
Andrew Meadows	e68241d2a9	using glm::degrees() instead of DEGREES_PER_RADIAN	2014-03-12 12:08:27 -07:00
AndrewMeadows	b1f4edb3a5	Merge pull request #2271 from ZappoMan/QWaitCondition ... Fix runaway JurisdictionListener thread and other improvements	2014-03-12 11:54:48 -07:00
Atlante45	3aa534d47c	Added the send method	2014-03-12 11:48:41 -07:00
ZappoMan	86feabee99	add last scene packets, bytes and pps	2014-03-12 02:22:24 -07:00
ZappoMan	7ce741762e	Merge branch 'master' of https://github.com/worklist/hifi into server_scale_testing	2014-03-12 01:21:33 -07:00
ZappoMan	e72d3127bf	fix comment and remove dead code	2014-03-11 21:25:30 -07:00
ZappoMan	025da315c6	removed dontSleep from JurisdictionListener	2014-03-11 21:11:47 -07:00
ZappoMan	8befefb054	first cut at making PacketSender use QWaitCondition	2014-03-11 20:45:46 -07:00
ZappoMan	4d0b762de3	some hacking on full scene debuggin	2014-03-11 20:33:53 -07:00
ZappoMan	f5cdb98efb	switch ReceivedPacketProcessor to using QWaitCondition	2014-03-11 20:32:02 -07:00
Andrzej Kapolka	6c4223bcdf	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-03-11 18:12:12 -07:00
Andrew Meadows	793a760272	merge upstream master into "radians" project	2014-03-11 17:28:36 -07:00
Andrew Meadows	aa8c2fc8cb	use radians instead of degrees (almost) everywhere	2014-03-11 17:26:58 -07:00
ZappoMan	0017625442	fix unix compiler issue	2014-03-11 16:48:49 -07:00
Dimitar Dobrev	60bf473be7	Improved the adherence to code conventions after a code review.	2014-03-12 01:24:30 +02:00
Dimitar Dobrev	86643803cf	Moved the connection and configuration of XMPP to the log-in process.	2014-03-12 01:24:30 +02:00
Dimitar Dobrev	9eb217794c	Added time stamps to the chat. Enabled translations.	2014-03-12 01:24:30 +02:00
Dimitar Dobrev	437cadf360	Added a basic version of the chat window.	2014-03-12 01:24:30 +02:00
ZappoMan	12becb9d19	improve octree stats display	2014-03-11 16:22:35 -07:00
Dimitar Dobrev	1c2e752f3c	Integrated QXmpp in the build system.	2014-03-12 01:16:10 +02:00
Dimitar Dobrev	07d3eb886a	Added reading and storing of the XMPP password of the current user.	2014-03-12 01:16:10 +02:00