22911 commits

Author	SHA1	Message	Date
Seth Alves	f47a49e631	Merge pull request #10597 from druiz17/record-standard ... Saved recording are officially g zipped and pose are played back to the standard endpoint	2017-06-02 09:44:03 -07:00
Stephen Birarda	6a89726a6a	Merge pull request #10593 from birarda/log-api-session-id ... print the metaverse session ID to the debug log	2017-06-01 18:02:17 -07:00
Brad Davis	3fdad14ca4	Merge pull request #10571 from jherico/ktx_tests ... FileCache refactoring and test, plus KTX unit tests	2017-06-01 16:09:14 -07:00
Stephen Birarda	0f22b07026	move session ID logging later in app startup	2017-06-01 16:07:36 -07:00
Stephen Birarda	06b3ecfdc3	also log metaverse session ID during ctor of AccountManager	2017-06-01 15:50:56 -07:00
Dante Ruiz	77eb75db95	add .json to extension	2017-06-01 22:48:59 +01:00
Dante Ruiz	6bc53388f8	Merge branch 'master' of github.com:highfidelity/hifi into record-standard	2017-06-01 22:34:57 +01:00
Dante Ruiz	725388043f	removed double semi-colons	2017-06-01 22:30:50 +01:00
Dante Ruiz	2a5c43026a	gzip recording data	2017-06-01 22:27:51 +01:00
Stephen Birarda	3d98f1b3ee	print metaverse session ID to debug log	2017-06-01 13:46:37 -07:00
Dante Ruiz	9a8030cc09	Merge branch 'recorder-fix' into record-standard	2017-06-01 19:01:54 +01:00
Dante Ruiz	0e82b33d6d	final changes	2017-06-01 19:00:31 +01:00
Dante Ruiz	e52765b641	playback recording back through the standard inputs	2017-06-01 18:51:24 +01:00
Dante Ruiz	c686acc071	fixing build issue	2017-06-01 18:20:56 +01:00
Dante Ruiz	23a9209285	Merge branch 'master' of github.com:highfidelity/hifi into recorder-fix	2017-06-01 18:06:37 +01:00
Dante Ruiz	a1e0737928	saving work	2017-06-01 18:06:06 +01:00
samcake	257813ec38	comment the code	2017-06-01 09:19:02 -07:00
Sam Cake	03fdc1396c	Fixing the warnings	2017-05-31 23:20:10 -07:00
Sam Cake	d19956f93c	Fixing warnings	2017-05-31 22:02:47 -07:00
Dante Ruiz	cca0fa6600	fixed some input recorder design issue	2017-06-01 00:23:37 +01:00
Brad Davis	a77491ccb1	FileCache refactoring and tests	2017-05-31 13:45:59 -07:00
Ryan Huffman	4a52f4090d	Merge pull request #10552 from huffman/fix/multiple-nic-lockup ... Fix SendQueue not setting lastReceiverResponse when recv handshake ack	2017-05-30 13:05:01 -07:00
Brad Davis	765bd3890e	Improving test code for KTX library	2017-05-30 10:47:49 -07:00
Stephen Birarda	41716ec56b	Merge pull request #10554 from seefo/master ... Moved audio asset processing to a separate thread	2017-05-30 10:44:53 -07:00
samcake	882df7391b	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-26 16:47:49 -07:00
Stephen Birarda	cfbbf3183a	Merge pull request #10560 from birarda/bug/zfox-teeth ... fix issue with textures with alpha as a mask	2017-05-26 13:11:02 -07:00
seefo	1d29610dbb	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-05-26 12:49:56 -07:00
Brad Davis	952d3629ec	Merge pull request #10559 from jherico/fix_compressed_ktx_loading ... Fix compressed KTX loading	2017-05-26 12:46:11 -07:00
Stephen Birarda	07440e325f	fix force of BC3 instead of BC1a compression	2017-05-26 12:04:35 -07:00
seefo	cc57d28ccc	Made requested changes to PR10554	2017-05-26 11:49:43 -07:00
Brad Davis	f663573f19	Fix compressed KTX loading	2017-05-26 11:25:15 -07:00
Anthony Thibault	84901ba94b	Merge pull request #10542 from druiz17/arm-pucks ... Added pucks calibration for upper arm/shoulders	2017-05-26 11:17:15 -07:00
seefo	90d5b2a6d4	Removed SoundProcessor's dependence on Sound objects	2017-05-26 10:32:34 -07:00
seefo	74f0ac5b78	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-05-26 09:13:20 -07:00
Dante Ruiz	d317d9236f	made requested changes	2017-05-26 16:40:21 +01:00
Clément Brisset	efe72e1b85	Merge pull request #10530 from Atlante45/fix/default-scripts ... Ensure user never loses its running scripts	2017-05-25 18:33:11 -07:00
seefo	0e4fbe01dc	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-05-25 17:04:03 -07:00
seefo	32b5ac5020	Moved audio asset processing to a separate thread	2017-05-25 16:10:53 -07:00
Sam Gateau	5b0d2f32b4	Merge pull request #10458 from jherico/ktx_validation ... Add KTX validation routines	2017-05-25 16:02:23 -07:00
Brad Davis	aa5aba428a	PR feedback	2017-05-25 15:03:39 -07:00
Zach Fox	6616a85be0	Merge pull request #10534 from zfox23/fixCollisionSignalEmission ... Fix collision signal emission for static objects	2017-05-25 14:43:07 -07:00
Brad Hefta-Gaub	54bca1e53d	Merge pull request #10551 from Atlante45/fix/infinite-loop ... Prevent Infinite loop in FBXReader	2017-05-25 14:25:06 -07:00
Dante Ruiz	6687b99391	Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks	2017-05-25 21:59:18 +01:00
Ryan Huffman	f0c3a0ac28	Fix SendQueue not updating lastReceiverResponse when recv handshake ack	2017-05-25 13:39:47 -07:00
samcake	cba913c068	Fixing the case when the bound changes without the rest of the properties	2017-05-25 13:01:54 -07:00
Zach Fox	f2fab57187	Update conditional to handle 'other unowned' case	2017-05-25 13:01:40 -07:00
Zach Fox	b86b07c08f	Pull out ownership bidding changes	2017-05-25 13:01:40 -07:00
Zach Fox	be39874999	Changes after discussion with Brad	2017-05-25 13:01:40 -07:00
Zach Fox	f6195cdb1e	Committing checkpoint changes, then testing	2017-05-25 13:01:40 -07:00
Zach Fox	0ef507c037	Revert 'dynamicChanged' to be a 'misc' physics property	2017-05-25 13:01:40 -07:00