30993 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ryan Huffman	4e3d0758e5	Remove UNUSED_2	2015-08-25 15:07:07 -07:00
Ryan Huffman	dc5d5cbb63	Add asset server ping to stats	2015-08-25 15:06:40 -07:00
Ryan Huffman	85f80ff6f9	Update AssetServer to use PacketList	2015-08-25 15:05:35 -07:00
Seiji Emery	62dc83fa32	test	2015-08-25 15:00:21 -07:00
Ryan Huffman	c1b9613a30	Update PacketList::writeData() to be non-recursive	2015-08-25 14:58:56 -07:00
Seiji Emery	3d59f8d7e8	changed setup_project to only use the generated shader source files	2015-08-25 14:40:52 -07:00
Stephen Birarda	c776f04ab2	don't allow in a user who should have edit but not verified	2015-08-25 14:36:22 -07:00
David Rowe	1f541832b6	Reword dialog	2015-08-25 14:24:15 -07:00
Seiji Emery	316ddd68ef	force cmake autoscribe to use full paths	2015-08-25 13:46:50 -07:00
Ryan Huffman	0352782e46	Add SendAssetTask	2015-08-25 12:46:44 -07:00
Atlante45	1878920ba4	Merge branch 'protocol' of https://github.com/birarda/hifi into protocol	2015-08-25 21:43:37 +02:00
Ryan Huffman	b865a3f8fb	Add thread pool to AssetGet requests	2015-08-25 12:41:55 -07:00
Stephen Birarda	6f14eb2206	fix for 0 entity avg ping	2015-08-25 12:35:34 -07:00
Clément Brisset	08ee5cbc17	Merge pull request #5656 from howard-stearns/fix-direct-url-avatars ... fix direct-url avatars	2015-08-25 21:30:05 +02:00
Clément Brisset	34b3bd211d	Merge pull request #14 from birarda/atp ... test for ordered sending in udt-test	2015-08-25 21:05:42 +02:00
Howard Stearns	6508d5943a	textChanged has to do something	2015-08-25 11:29:27 -07:00
Stephen Birarda	d76e8a7e48	remove double settings request for testing	2015-08-25 11:27:31 -07:00
Stephen Birarda	61507bde09	fix order of member initialization in PacketList	2015-08-25 11:24:26 -07:00
Stephen Birarda	9ff7bfd0b5	some header cleanup in UDTTest output	2015-08-25 11:21:04 -07:00
David Rowe	7c8ff4dcbd	If Interface.ini doesn't contain crash option value assume default	2015-08-25 11:07:55 -07:00
David Rowe	a98a867b06	Delete Interface.ini.lock before accessing to check crash option	2015-08-25 11:07:20 -07:00
Stephen Birarda	92116dd6e7	added stats for receive rate in Mbits	2015-08-25 11:04:24 -07:00
Stephen Birarda	9940f375ea	repairs for CR comments	2015-08-25 10:02:43 -07:00
Stephen Birarda	5e5bd77870	add initialization for all atomics in SendQueue	2015-08-25 09:55:21 -07:00
Howard Stearns	2ed6900c7e	Clear the brush, clear the cobwebs, and set the other orientations now that we're clear on what coordinate system we're in.	2015-08-25 09:55:04 -07:00
Atlante45	083a14bf4d	Merge branch 'protocol' of https://github.com/birarda/hifi into protocol	2015-08-25 15:08:52 +02:00
Philip Rosedale	ff3a0480fe	Merge pull request #5652 from birarda/master ... tweaks to domain-server web interface	2015-08-24 21:36:52 -07:00
Brad Davis	f9f5743fd7	Merge pull request #5650 from ZappoMan/fixCrashInController ... Fix a couple crashes in the Controller scripting interface	2015-08-24 18:49:50 -07:00
Stephen Birarda	17befac262	use fixed width for stats tables	2015-08-24 18:10:21 -07:00
Stephen Birarda	b8ac9aa5eb	update jquery and bootstrap in DS	2015-08-24 18:02:26 -07:00
Brad Hefta-Gaub	34e32ddaeb	Merge pull request #5636 from howard-stearns/marketplace-avatars ... marketplace avatars	2015-08-24 17:49:20 -07:00
Brad Hefta-Gaub	5ea6d2704a	Merge pull request #5628 from ctrlaltdavid/webwindow-external-links ... Make WebWindow hyperlinks with target="_blank" open in user's browser	2015-08-24 17:45:35 -07:00
Brad Hefta-Gaub	53ae958c74	Merge pull request #5643 from hyperlogic/tony/renderable-particle-crash-fix ... Fix for RenderableParticleEffectEntity crash.	2015-08-24 17:44:39 -07:00
Brad Hefta-Gaub	c6174ad88a	Merge pull request #5647 from jherico/homer ... Removing tabs from our javascript	2015-08-24 17:33:57 -07:00
Stephen Birarda	c8ba24817f	fix for hash specialization for QUuid	2015-08-24 17:09:52 -07:00
Stephen Birarda	f7799bcf8f	add TODO for settings fail, cleanup	2015-08-24 17:02:47 -07:00
Stephen Birarda	e84595af49	add a wait condition for empty queue and loss list	2015-08-24 17:02:40 -07:00
Lars Christensen	324f592719	updated FontAwesome to v4.4	2015-08-25 01:55:52 +02:00
Stephen Birarda	9275b954f4	Merge pull request #13 from huffman/ordered-sending ... Ordered sending	2015-08-24 16:41:50 -07:00
David Rowe	b27d25b46e	Implement crash option that retains only login and avatar information	2015-08-24 16:41:25 -07:00
Lars Christensen	110ba131a6	moved translation efforts into subdir	2015-08-25 01:36:19 +02:00
Brad Hefta-Gaub	13a9dc4df2	cleanup controller interface, add getActionNames() and getDeviceNames()	2015-08-24 15:35:55 -07:00
Brad Davis	380b0cb23c	Removing tabs from our javascript and C++	2015-08-24 15:26:46 -07:00
Stephen Birarda	d02e5b2450	fix a typo in comment in DomainGatekeeper	2015-08-24 15:10:27 -07:00
Stephen Birarda	a9c04e5116	don't allow verified connection without username	2015-08-24 15:01:39 -07:00
Howard Stearns	476ca36460	final	2015-08-24 15:01:01 -07:00
Stephen Birarda	c6f1567361	add a debug for refused connection in DomainGatekeeper	2015-08-24 14:58:25 -07:00
Stephen Birarda	fe591f61cc	fix class rename in processConnectRequestPacket	2015-08-24 14:54:48 -07:00
Stephen Birarda	d57c1fc2d5	fix a typo in DomainGatekeeper comment	2015-08-24 14:50:18 -07:00
Stephen Birarda	7591a29c48	add back indentation to STATICALLY_ASSIGNED_NODES	2015-08-24 14:44:24 -07:00