55370 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	5c93dbd20d	be more careful about fixing up entities which arrived before their parents	2017-05-19 13:48:29 -07:00
Andrew Meadows	7b879a7964	Model has a Rig rather than a RigPointer	2017-05-19 13:24:16 -07:00
Seth Alves	936d0e2d50	be more careful about fixing up entities which arrived before their parents	2017-05-19 12:13:43 -07:00
Zach Fox	5e8f120138	Merge pull request #10510 from zfox23/snapshots_ImproveUploadRobustness ... Ensure snapshots without story_ids get uploaded	2017-05-19 11:57:21 -07:00
Ryan Huffman	64bf5784e6	Fix FileStorage to not close files after they are opened ... This is particularly an issue with KTX file reading/writing where we do both concurrently.	2017-05-19 11:16:20 -07:00
Ryan Huffman	c36b85bb05	Add notes to KtxStorage::maybeOpenFile	2017-05-19 11:11:00 -07:00
Seth Alves	735e4b7d05	trying to get child collision hulls to be in the right place after import	2017-05-19 10:59:59 -07:00
Anthony J. Thibault	6ae2e6778e	ensure left and right arm flexCoeff are the same.	2017-05-19 10:51:09 -07:00
Atlante45	c2e2682eff	Fix "Reset Settings" window poping up every time	2017-05-19 10:50:23 -07:00
Seth Alves	7220fe0ad8	set more physics flags dirty when an entity parent is found	2017-05-19 10:40:24 -07:00
Anthony J. Thibault	621d94eb91	removed temp comments	2017-05-19 10:38:16 -07:00
Zach Fox	6765451cc8	Ensure snapshots without story_ids get uploaded	2017-05-19 10:36:31 -07:00
Marko Kudjerski	986d63cdbb	making sure that the first time landing in *welcome domain is updated for dev builds too	2017-05-19 10:17:02 -07:00
Marko Kudjerski	303bb05b3d	changing the location in welcome to which a user is sent on the first run	2017-05-19 10:17:02 -07:00
Seth Alves	77ce8a19cf	call entityChanged after settings flags	2017-05-19 10:11:02 -07:00
Seth Alves	0c12baa258	call entityChanged after settings flags	2017-05-19 09:57:42 -07:00
Seth Alves	99dfd9ded1	Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox	2017-05-19 08:26:02 -07:00
Chris Collins	76a025aade	Merge pull request #10507 from Atlante45/merge-back ... Merge Stable back into master	2017-05-19 06:58:10 -07:00
Ken Cooke	746b41e509	Fix typo in comments	2017-05-18 17:30:07 -07:00
Atlante45	ee9b98ffd7	Merge branch 'stable' of https://github.com/highfidelity/hifi	2017-05-18 17:11:45 -07:00
Ken Cooke	205b9d4aec	Fix compiler warnings	2017-05-18 16:49:02 -07:00
Ryan Huffman	eb9acad42e	Update content set URL for RC40	2017-05-18 16:36:01 -07:00
Anthony J. Thibault	e99001d86c	debug draw ik chains, bug fix for flex coef on tips ... And opened up hip constraints.	2017-05-18 16:29:55 -07:00
Zach Fox	48200fbd07	Merge pull request #10501 from zfox23/snapshots_disableWhileProcessing ... Prevent another GIF from being captured while one is processing	2017-05-18 15:53:57 -07:00
Ryan Huffman	72af4219b8	Merge pull request #10499 from huffman/fix/ktx-progressive-image-size ... Fix ktx image size in progrssively loaded cubemaps	2017-05-18 15:26:52 -07:00
Andrew Meadows	17b6cf29df	check for valid resource pointer before use	2017-05-18 15:12:59 -07:00
Seth Alves	4007133423	collision hulls are still not always in the right place	2017-05-18 14:59:26 -07:00
Chris Collins	625bcdfd7e	Merge pull request #10498 from highfidelity/RC-39.3-HOTFIX ... Build 39.3 Hotfix for T-Pose avatars	2017-05-18 14:57:57 -07:00
Dante Ruiz	e4c79926c0	trying to improve puck lost	2017-05-18 22:46:25 +01:00
Seth Alves	1b0eeb9c2c	try harder to put things in place when their parent entities are discovered	2017-05-18 14:35:39 -07:00
Ken Cooke	18ed3dd6ed	Remove debug code	2017-05-18 14:30:25 -07:00
Zach Fox	8efac1e7f1	Prevent another GIF from being captured while one is processing	2017-05-18 14:30:08 -07:00
Ken Cooke	6f2a84a084	Add stand-alone DC blocking filter	2017-05-18 14:26:35 -07:00
Ken Cooke	c1cd26b473	New log-domain noise gate with adaptive threshold	2017-05-18 14:21:56 -07:00
Zach Pomerantz	c5a0a1af2f	Merge pull request #10429 from zzmp/audio/close-device ... Close audio device when switching outputs	2017-05-18 17:18:53 -04:00
Clément Brisset	55b5f08714	Merge pull request #10465 from Atlante45/fix/domain-settings ... Fix domain settings not getting cleared on re-assignment	2017-05-18 14:16:35 -07:00
Ken Cooke	106dd6ce6a	Fast fixed-point log2 approximation	2017-05-18 14:15:10 -07:00
Seth Alves	ef556fae9b	when an entity's parent wasn't known and then becomes known, patch up the rigid-body and the render-item bounds	2017-05-18 14:13:33 -07:00
Ken Cooke	cad9eeb8ba	Refactor the peak limiter (output is bit-exact)	2017-05-18 14:13:24 -07:00
David Rowe	3aebe96afe	Merge branch 'master' into 21359	2017-05-19 09:03:11 +12:00
David Rowe	602e04dc60	Remove temporary fix	2017-05-19 09:02:23 +12:00
Dante Ruiz	984f9e1ba5	Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter	2017-05-18 21:23:06 +01:00
Dante Ruiz	78f6d2e850	fix low velocity filter	2017-05-18 21:22:42 +01:00
Seth Alves	f35796259b	Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox	2017-05-18 13:20:50 -07:00
Seth Alves	ec02887ae6	attempt to get imported entities into the correct octree-element	2017-05-18 13:20:44 -07:00
Atlante45	9044cb40d5	Compress Default Skybox with BC7	2017-05-18 13:13:40 -07:00
Atlante45	a8b1a29a4a	Add support for BC7 compression	2017-05-18 13:11:41 -07:00
samcake	9c154122d3	Introdicing the format factor and merging with master becasue of protocol change...	2017-05-18 13:08:13 -07:00
samcake	396924b4a5	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-18 13:06:05 -07:00
David Kelly	df5928c04a	remove clockSkew, reference new version for Avatar packets	2017-05-18 11:47:53 -07:00