2513 commits

Author	SHA1	Message	Date
Howard Stearns	237628e4cd	Merge branch 'master' of https://github.com/highfidelity/hifi into user-specified-animation-graph	2015-09-21 11:24:25 -07:00
Howard Stearns	8b701b8a5b	Provide a place in the advanced avatar section of preferences in which users can specify a different animation graph spec. ... Takes effect when you save (if you have enabled the anim graph under developer->avatar). An empty string gives you the default behavior.	2015-09-21 10:26:04 -07:00
Stephen Birarda	5ebc8d6036	fix for file upload to ATP on Windows	2015-09-21 10:24:11 -07:00
Atlante45	9678e70444	Asset caching	2015-09-16 15:17:15 +02:00
Stephen Birarda	8308dbf4a3	Merge pull request #5787 from huffman/cleanup-asset-requests-on-node-kill ... DO NOT MERGE: Cleanup asset requests on node kill	2015-09-14 13:08:01 -07:00
Ryan Huffman	71456eee5e	Add UploadDialog error for NetworkError	2015-09-14 11:19:47 -07:00
Brad Davis	244795b629	Merge branch 'homer' into temp ... Conflicts: interface/src/Application.cpp	2015-09-11 11:21:29 -07:00
Stephen Birarda	a286f4e7d0	Merge pull request #5772 from Atlante45/protocol ... Asset server node JSON stats	2015-09-11 09:35:39 -07:00
Atlante45	5808658958	Make NodeJSONStats reliable	2015-09-11 14:21:53 +02:00
Brad Davis	aa989c3687	Fixing some entity race condition crashes	2015-09-10 20:53:17 -07:00
Stephen Birarda	973fd80c1d	fail asset request if hash does not match	2015-09-10 15:24:37 -07:00
Howard Stearns	eb67254e54	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-08 16:54:14 -07:00
Howard Stearns	d3106de7c1	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-04 14:32:58 -07:00
Stephen Birarda	ed19987b7d	resolve conflicts on merge with upstream/master	2015-09-04 12:31:46 -06:00
Brad Davis	c8069ba73c	Working on magballs polish	2015-09-03 20:09:54 -07:00
Howard Stearns	32eb51d0fa	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-03 13:55:57 -07:00
Brad Davis	b6ef2e314f	Adding 'web3d' overlay type	2015-09-02 18:25:49 -07:00
Brad Davis	54b7a063e2	Support HTML colors in overlays	2015-09-02 15:56:37 -07:00
Howard Stearns	8cf71f285d	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-09-01 16:03:40 -07:00
Stephen Birarda	fa0abe2972	resolve conflicts on merge with upstream/master	2015-08-31 10:51:12 -07:00
Stephen Birarda	1d6f43e0d0	cleaned up some warnings	2015-08-27 18:26:55 -07:00
Stephen Birarda	43d2c0653d	return correct ATP url from upload dialog	2015-08-27 16:06:54 -07:00
Stephen Birarda	549c514400	fix upload leak, return error for failed load	2015-08-27 15:12:08 -07:00
Stephen Birarda	46990184d6	AssetUploadDialogFactory constructor should be private	2015-08-27 15:07:15 -07:00
Stephen Birarda	e3e529c4e5	resolve conflicts on merge with origin/protocol	2015-08-27 14:52:29 -07:00
Stephen Birarda	80cf7b6c76	resolve conflicts on merge with upstream/master	2015-08-27 14:50:04 -07:00
Stephen Birarda	59775e5756	actually add the additional error to the dialog	2015-08-27 14:40:12 -07:00
Stephen Birarda	26757eae7a	immediately show permission denied error if applicable	2015-08-27 14:37:44 -07:00
Stephen Birarda	f238c1b167	include the extension in upload confirmation	2015-08-27 14:29:42 -07:00
Stephen Birarda	c212ef5734	fix PacketReceiver cleanup, return permission error for upload	2015-08-27 12:01:24 -07:00
Stephen Birarda	b3bd94c8db	show a QMessageBox if not connected to asset-server	2015-08-27 11:37:27 -07:00
Stephen Birarda	f92ee597e5	fix width of asset upload dialog to fit ATP url	2015-08-27 11:32:03 -07:00
Stephen Birarda	513cae0d40	thread the AssetUpload so it doesn't take over main	2015-08-27 10:23:02 -07:00
Stephen Birarda	5b5941fea2	move asset upload to AssetUploadDialogFactory	2015-08-26 16:30:09 -07:00
Ryan Huffman	aa7d8678e1	Merge branch 'protocol' of github.com:birarda/hifi into atp-server	2015-08-26 12:26:11 -07:00
Howard Stearns	0e18395fd0	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-26 12:04:28 -07:00
Andrew Meadows	45c846572e	Merge pull request #5645 from jherico/maggie ... Fixing problems reported by static analysis tool	2015-08-26 08:31:05 -07:00
Atlante45	179ee73e26	Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol	2015-08-26 16:50:33 +02:00
Brad Hefta-Gaub	1cd699de9d	Merge pull request #5657 from birarda/master ... fix for 0 entity avg ping	2015-08-25 22:27:44 -07:00
Brad Davis	d311e4f2ea	Fixing problems reported by static analysis tool	2015-08-25 19:18:55 -07:00
Ryan Huffman	dc5d5cbb63	Add asset server ping to stats	2015-08-25 15:06:40 -07:00
Stephen Birarda	6f14eb2206	fix for 0 entity avg ping	2015-08-25 12:35:34 -07:00
Howard Stearns	6508d5943a	textChanged has to do something	2015-08-25 11:29:27 -07:00
Howard Stearns	2ca4768766	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-25 10:44:54 -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
Howard Stearns	74fd640f16	Restore the ability to change avatars from the edit.js marketplace button.	2015-08-21 16:49:07 -07:00
Howard Stearns	e84cc03bcc	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-21 11:35:42 -07:00
David Rowe	b1db7e5ed2	Make WebWindow hyperlinks with target="_blank" open in user's browser	2015-08-21 10:28:47 -07:00
Howard Stearns	ae3e052e72	Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates	2015-08-21 08:13:44 -07:00