30904 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stephen Birarda	0f36385b86	remove version conflict markers accidentally committed	2015-08-27 14:58:22 -07:00
Stephen Birarda	80cf7b6c76	resolve conflicts on merge with upstream/master	2015-08-27 14:50:04 -07:00
Stephen Birarda	0807d1bf4d	Merge pull request #16 from birarda/handshake ... add a handshake before UDT connection starts	2015-08-27 14:46:26 -07:00
Stephen Birarda	c80c4a9b45	resolve conflicts on merge with origin/protocol	2015-08-27 14:45:22 -07:00
Stephen Birarda	183a2ab996	Merge pull request #18 from Atlante45/protocol ... Cleanup connections	2015-08-27 14:41:00 -07:00
Stephen Birarda	fa3cdce46e	Merge pull request #19 from huffman/atp-server ... Asset server	2015-08-27 14:40:52 -07:00
Ryan Huffman	dabea21d66	Remove unused variable	2015-08-27 14:30:48 -07:00
Ryan Huffman	5aa5bca8f7	Add path to headers	2015-08-27 14:29:54 -07:00
Stephen Birarda	1da9eeab1f	handle double handshake in Connection	2015-08-27 14:27:29 -07:00
Ryan Huffman	755c33e551	Remove unused variable	2015-08-27 14:11:40 -07:00
Ryan Huffman	24eef654e0	Remove unnecessary debug	2015-08-27 14:11:29 -07:00
Ryan Huffman	4fcfd5b8f8	Fix indentation	2015-08-27 13:58:28 -07:00
Ryan Huffman	b401a62d7f	Disable request limiting for ATP requests in ResourceCache	2015-08-27 13:58:17 -07:00
Philip Rosedale	d0db56a4a6	Merge pull request #5667 from howard-stearns/rig-menu-toggle ... Rig Menu Toggle and new animations	2015-08-27 13:52:12 -07:00
Ryan Huffman	12d3cf557a	Remove assert in ScriptCache	2015-08-27 12:58:57 -07:00
Ryan Huffman	33d6f561eb	Reintroduce request limit in ResourceCache	2015-08-27 12:52:11 -07:00
Ryan Huffman	750080fe66	Remove early return in Model::restoreJointPosition	2015-08-27 12:52:01 -07:00
Ryan Huffman	b30a008162	Fix bug with NetworkTexture occasionally breaking on assert	2015-08-27 12:48:55 -07:00
Leonardo Murillo	dd5d58a5e1	Merge pull request #5663 from birarda/master ... don't request a cert from peer in HTTPSManager	2015-08-27 12:46:24 -07:00
Howard Stearns	96c74ebbd5	Enable Rig Animations is now a developer menu item (rather than requiring javascript to set). Also turning it off resets you to bind pose and deliberately throws away old animations. ... Default animations are the new ones for our standard T-pose. (Had been for the double-A pose fightbot.) Rig state machine now does "backup", and doesn't apply strafe while turning.	2015-08-27 12:25:40 -07:00
Ryan Huffman	a49a1eb0d6	Add extension to atp requests	2015-08-27 11:51:45 -07:00
Brad Hefta-Gaub	79a9694d4a	Merge pull request #5648 from ctrlaltdavid/20663 ... Clean Interface.ini after a crash	2015-08-27 10:52:25 -07:00
Brad Hefta-Gaub	176860c612	Merge pull request #5649 from larsnaesbye/master ... Move i18n to own dir, update FA	2015-08-27 10:46:29 -07:00
Brad Hefta-Gaub	7b2f944f48	Merge pull request #5561 from ericrius1/particleExtensions ... Extended Particle entity to allow for more varied effects	2015-08-27 10:45:03 -07:00
Ryan Huffman	c6493b1720	Remove extension from hash in AssetResourceRequest	2015-08-27 10:27:12 -07:00
Ryan Huffman	628f275013	Fix asset server upload errors	2015-08-27 10:07:53 -07:00
Ryan Huffman	1d45293184	Fix lambda callback affinity in BatchLoader	2015-08-27 09:56:26 -07:00
Ryan Huffman	667db200c0	Cleanup BatchLoader	2015-08-27 09:39:12 -07:00
Ryan Huffman	8765329a46	Add ASSET_TOO_LARGE to AssetUtils	2015-08-27 09:32:39 -07:00
Ryan Huffman	92dbe9997c	Clean up AssetRequest	2015-08-27 09:31:50 -07:00
Ryan Huffman	15854c6715	Make AssetClient methods private	2015-08-27 09:31:34 -07:00
Ryan Huffman	b72e7e356d	Clean up AssertClient	2015-08-27 09:31:17 -07:00
Ryan Huffman	3731091d5e	Remove max chunk requesting from SendAssetTask	2015-08-27 09:30:47 -07:00
Ryan Huffman	f95957a271	Cleanup AssetServer	2015-08-27 09:30:34 -07:00
Brad Hefta-Gaub	87c604a475	Merge pull request #5655 from jherico/sideshow-bob ... Fixing framerate limit, moving vsync to 2d plugin	2015-08-26 16:44:35 -07:00
Ryan Huffman	c2fcf5865a	Update log message for uploading assets	2015-08-26 16:02:47 -07:00
Ryan Huffman	4105b7369c	Remove AssetScriptingInterface	2015-08-26 15:55:29 -07:00
Ryan Huffman	59b32751f0	Cleanup AssetScriptingInterface	2015-08-26 15:54:02 -07:00
Brad Davis	270f2f7a3b	Fixing framerate limit, moving vsync to 2d plugin	2015-08-26 15:47:45 -07:00
Brad Davis	8cd13cad00	Merge pull request #5661 from sethalves/linux-memory-debugger ... call setup_memory_debugger from common macros rather than from everywhere	2015-08-26 15:43:08 -07:00
Andrew Meadows	0835b79e33	Merge pull request #5646 from birarda/ds-cleanup ... de-bloat the domain-server by adding a gatekeeper	2015-08-26 15:42:43 -07:00
Ryan Huffman	4ed5748afa	Fix new asset loading in directory	2015-08-26 15:37:58 -07:00
Ryan Huffman	287f2533eb	Remove AssetServer dtor	2015-08-26 15:37:38 -07:00
Ryan Huffman	d66c521200	Move SendAssetTask to separate file	2015-08-26 15:37:23 -07:00
Brad Hefta-Gaub	cd2cd90d8f	Merge pull request #5664 from sethalves/quiet-obj-reader ... ifdef out debug prints in OBJ reader	2015-08-26 15:32:17 -07:00
Seth Alves	f53704051f	ifdef out debug prints in OBJ reader	2015-08-26 15:09:58 -07:00
Stephen Birarda	cd7d0f383b	allow editors who can't be verified in the short term	2015-08-26 15:07:29 -07:00
Seth Alves	d2eb3108d5	Merge pull request #5644 from howard-stearns/eye-correction-application ... eye correction correction	2015-08-26 14:46:48 -07:00
Ryan Huffman	34f7aa74f3	Move SendAssetTask declaration to header	2015-08-26 14:27:46 -07:00
Ryan Huffman	2e585256ff	Update asset hash to Sha256	2015-08-26 14:20:24 -07:00