35036 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Leonardo Murillo	c56a3b6d22	Checkpoint - turning quazip into external	2015-11-20 09:56:10 -06:00
Brad Davis	5adcbcaf5f	Support writing a clip to a qbytearray	2015-11-19 20:23:50 -08:00
EdgarPironti	e267926725	JSON computing	2015-11-19 20:04:04 -08:00
EdgarPironti	d75209cb37	Fixes to clip_url overwriting	2015-11-19 20:04:03 -08:00
EdgarPironti	fb90ffec5c	Migration of AC playback	2015-11-19 20:04:03 -08:00
James B. Pollack	225909f8a1	play notch sound at right time	2015-11-19 19:25:51 -08:00
James B. Pollack	ea59e0887d	more bow features and debug prep	2015-11-19 19:22:54 -08:00
Brad Hefta-Gaub	5c6cd9b06c	fix thread safety and crash with no asset server	2015-11-19 18:53:12 -08: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
Chris Collins	7f8274f58f	removed omnitool ... removed omnitool	2015-11-19 18:08:12 -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
Howard Stearns	431a8c9584	cleanup	2015-11-19 17:12:50 -08:00
samcake	bb7ab9b1f8	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-19 16:29:58 -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
Stephen Birarda	22f5d4df6d	change signature of copy return	2015-11-19 16:25:33 -08:00
Stephen Birarda	430cb7876d	remove a couple of read lockers for AvatarHashMap	2015-11-19 16:22:56 -08: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
Stephen Birarda	40397add43	fix for extra adds in AvatarManager	2015-11-19 16:15:21 -08:00
Brad Davis	e187aaedcb	Load recorded clips from URLs, not file paths	2015-11-19 15:56:37 -08:00
Stephen Birarda	6398a922c6	leverage COW for AvatarHash	2015-11-19 15:43:29 -08:00
Stephen Birarda	5140a480a1	fix for recursive write then read lock	2015-11-19 15:35:41 -08:00
Ryan Huffman	9e31614fce	Fix textures property not being sent for polyline	2015-11-19 15:16:46 -08:00
Ryan Huffman	b122dad7ea	Add begin and middle textures to InfiniteLine	2015-11-19 15:16:23 -08:00
Stephen Birarda	2a05ec650b	fix locking in AvatarHashMap/AvatarManager	2015-11-19 14:17:48 -08:00
Philip Rosedale	f1b5589813	Merge pull request #6434 from AndrewMeadows/another-reset ... fix avatar reset	2015-11-19 13:37:06 -08:00
Howard Stearns	f6286201f4	cleanup	2015-11-19 11:55:22 -08:00
James B. Pollack	83238cf8c9	Merge remote-tracking branch 'upstream/master' into bow	2015-11-19 11:31:39 -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
samcake	3fc69e7953	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-19 10:14:33 -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
Howard Stearns	0a8fd9cbad	Spread avatars around (not up to) a larger area.	2015-11-19 09:22:41 -08:00
Howard Stearns	7d30cd0159	checkpoint: it works!	2015-11-19 09:18:40 -08:00
Ryan Huffman	8adf456b91	Update range of LOD to go up to 20:2	2015-11-19 08:52:57 -08:00
samcake	7cc68e851d	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-18 18:07:42 -08:00
samcake	90ee205a66	Merge pull request #6429 from ZappoMan/samConditionalLove ... make preferences dialog resizable	2015-11-18 18:07:07 -08:00
Stephen Birarda	271387f96e	use a unique_ptr for linkedData in Node	2015-11-18 18:03:31 -08:00
Brad Hefta-Gaub	dc093159a1	make preferences dialog resizable	2015-11-18 17:54:51 -08:00