34735 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Leonardo Murillo	9ad865c7f0	checkpoint	2015-11-20 15:19:45 -06:00
Leonardo Murillo	e17d0b2af3	Bundling and consolidating deployment package	2015-11-20 15:10:56 -06:00
Leonardo Murillo	6105191a3f	OS X Bundling	2015-11-20 14:45:25 -06:00
Leonardo Murillo	6f3d818121	Checkpoint - fixing ID in dylib	2015-11-20 10:56:47 -06:00
Leonardo Murillo	7b748dc59a	Merge branch 'master' of github.com:highfidelity/hifi into stack-manager	2015-11-20 09:56:20 -06:00
Leonardo Murillo	c56a3b6d22	Checkpoint - turning quazip into external	2015-11-20 09:56:10 -06:00
Brad Hefta-Gaub	e6db72c887	Merge pull request #6437 from imgntn/grasp_equip ... Grasp hands when equipping entities	2015-11-19 18:28:44 -08:00
Brad Hefta-Gaub	a59dc6a423	Merge pull request #6419 from imgntn/betterbubbles ... Improvments to Bubblewand	2015-11-19 18:26:59 -08:00
Brad Hefta-Gaub	ce9c3f1969	Merge pull request #6433 from AlessandroSigna/groupRecording ... cleanup directory + recording bug fix	2015-11-19 18:26:33 -08:00
samcake	732c911fd7	Merge pull request #6439 from ZappoMan/assetJS ... add Assets.uploadData() and Assets.downloadData()	2015-11-19 17:56:10 -08:00
Brad Hefta-Gaub	f80a765a29	add Assets.uploadData() and Assets.downloadData()	2015-11-19 17:28:20 -08:00
samcake	c9f7bffd36	Merge pull request #6435 from jherico/dargo ... Load recorded clips from URLs, not file paths	2015-11-19 16:29:50 -08:00
Leonardo Murillo	f981fb9f46	Initial stack manager commit	2015-11-19 18:27:58 -06:00
James B. Pollack	6f76f0cbc0	release grasp at cleanup	2015-11-19 16:22:54 -08:00
James B. Pollack	3f89d73fc6	add grasp to equip and example	2015-11-19 16:15:34 -08:00
Brad Davis	e187aaedcb	Load recorded clips from URLs, not file paths	2015-11-19 15:56:37 -08:00
Philip Rosedale	f1b5589813	Merge pull request #6434 from AndrewMeadows/another-reset ... fix avatar reset	2015-11-19 13:37:06 -08:00
U-GAPOS\andrew	28e349f421	remeasure sensor after recentering	2015-11-19 10:43:40 -08:00
U-GAPOS\andrew	b7f501c0b3	use glm::quat_cast instead of extractRotation()	2015-11-19 10:42:53 -08:00
Seth Alves	0df37612a6	Merge pull request #6428 from birarda/goodbye-to-interested ... only send node disconnect packet to interested types	2015-11-19 10:38:57 -08:00
Seth Alves	2c1ca526df	Merge pull request #6423 from ZappoMan/messaging ... add an example of an entityScript that subscribes to messages	2015-11-19 10:32:36 -08:00
Seth Alves	2938f0d835	Merge pull request #6421 from ZappoMan/outOfOrderDelete ... Possible fix to abandoned lines/entities	2015-11-19 10:26:14 -08:00
Brad Hefta-Gaub	e318537af4	Merge pull request #6425 from birarda/handshake-ds-settings ... fix case where servers could run without settings	2015-11-19 10:10:28 -08:00
Seth Alves	98073de0b8	Merge pull request #6426 from ZappoMan/entitiesFileDownload ... implement support to download the persist file from entity server status page	2015-11-19 09:47:10 -08:00
AlessandroSigna	b4f9c4158f	cleanup directory + bug fix	2015-11-19 09:45:28 -08:00
Brad Hefta-Gaub	45e8ebbe8c	Merge pull request #6432 from huffman/lod-range ... Increase available range in LOD Tools	2015-11-19 09:40:10 -08:00
Ryan Huffman	f523cad0a9	Add lodTest.js for testing LOD settings	2015-11-19 09:24:29 -08:00
Ryan Huffman	8adf456b91	Update range of LOD to go up to 20:2	2015-11-19 08:52:57 -08:00
samcake	90ee205a66	Merge pull request #6429 from ZappoMan/samConditionalLove ... make preferences dialog resizable	2015-11-18 18:07:07 -08:00
Brad Hefta-Gaub	dc093159a1	make preferences dialog resizable	2015-11-18 17:54:51 -08:00
samcake	74beeefe06	Merge pull request #6420 from jherico/dargo ... Make recording and playback work in interface, playback in agent	2015-11-18 17:52:09 -08:00
Stephen Birarda	3fba1f8445	better variable naming for nodeToKill	2015-11-18 17:46:32 -08:00
Stephen Birarda	f4cf1c0291	only broadcast removed node messages to interested nodes	2015-11-18 17:45:18 -08:00
Brad Hefta-Gaub	456da661ff	implement support to download the persist file from entity server status page	2015-11-18 17:30:07 -08:00
Brad Davis	98cc7408b1	Fixing issues found in AC playback test	2015-11-18 17:17:20 -08:00
Brad Hefta-Gaub	b47aadff2b	Merge pull request #6424 from AlessandroSigna/groupRecording ... Group recording - upgraded to the new messages system	2015-11-18 16:49:31 -08:00
Stephen Birarda	08e6b63090	cleanup debug of received domain-server settings	2015-11-18 15:43:31 -08:00
Stephen Birarda	3773995bb7	remove true return for readAdditionalConfiguration	2015-11-18 15:41:27 -08:00
Stephen Birarda	3ba0c9d042	resolve conflicts on merge with upstream master	2015-11-18 15:29:39 -08:00
Stephen Birarda	20485b817c	use safer domain-server settings request in entity-server	2015-11-18 15:27:57 -08:00
Stephen Birarda	eafc11e054	use safer domain settings request in AvatarMixer	2015-11-18 15:18:16 -08:00
AlessandroSigna	1f854784e1	not load the last recording	2015-11-18 15:17:06 -08:00
Stephen Birarda	f2ecce6043	use safer domain settings request in audio-mixer	2015-11-18 15:13:29 -08:00
Brad Hefta-Gaub	6719092094	add an example of an entityScript that subscribes to messages	2015-11-18 15:03:07 -08:00
Howard Stearns	b4934275e1	Merge pull request #6422 from AndrewMeadows/crashfix ... fix crash on login for invalid index	2015-11-18 15:02:54 -08:00
Andrew Meadows	73055a59a7	fix crash on login for bad boolean logic	2015-11-18 14:48:59 -08:00
Stephen Birarda	1a066abb26	fix some indentation for UDT_CONNECTION_DEBUG lines	2015-11-18 14:43:56 -08:00
Brad Davis	fd3599acc5	PR comments	2015-11-18 14:32:56 -08:00
Brad Hefta-Gaub	2f3cf82202	don't apply out of order edits to entities that have been deleted	2015-11-18 14:26:18 -08:00
Stephen Birarda	65142a3963	clean up agent comment for domain settings request	2015-11-18 14:20:56 -08:00