3200 commits

Author	SHA1	Message	Date
Seth Alves	a45b5599c9	Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox	2017-05-19 17:37:03 -07:00
Clément Brisset	6e89f7d2f9	Merge pull request #10512 from Atlante45/fix/running-marker ... Fix "Reset Settings" window poping up every time	2017-05-19 17:36:00 -07:00
Seth Alves	40c8261111	Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox	2017-05-19 17:14:58 -07:00
Seth Alves	5c93dbd20d	be more careful about fixing up entities which arrived before their parents	2017-05-19 13:48:29 -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
Atlante45	c2e2682eff	Fix "Reset Settings" window poping up every time	2017-05-19 10:50:23 -07:00
Seth Alves	ec02887ae6	attempt to get imported entities into the correct octree-element	2017-05-18 13:20:44 -07:00
Brad Hefta-Gaub	fbc32e5ba1	Merge pull request #10485 from samcake/orange ... Add protections when accessing the mip bytes of a texture when provided from a KtxStorage	2017-05-18 08:47:58 -07:00
Brad Hefta-Gaub	014fd710de	Merge pull request #10490 from Atlante45/feat/settings-map ... Enable Map/List storage in the settings	2017-05-17 21:24:04 -07:00
Zach Pomerantz	e8ab780899	include details in critical variantMap parsing error	2017-05-17 21:32:13 -04:00
Stephen Birarda	2ac5fbf91d	set wireless scan interval to -1	2017-05-17 15:33:52 -07:00
samcake	ab3ea65d54	Simply add protections when accessing the mip bytes of a texture when provided from a KtxStorage	2017-05-17 12:36:12 -07:00
Atlante45	0d77977936	Enable Map/List storage in the settings	2017-05-17 12:11:15 -07:00
Brad Hefta-Gaub	764bfe94f5	Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270 ... Feature/snap turn smoothing 21270	2017-05-16 21:05:38 -07:00
Brad Hefta-Gaub	254c6e9292	Merge pull request #10441 from Atlante45/feat/launch-sandbox ... Launch the Sandbox as early as possible	2017-05-16 20:52:23 -07:00
Brad Hefta-Gaub	36c7821e1e	Merge pull request #10455 from ZappoMan/TriangleSetOptimizations ... TriangleSet optimizations - ~80% improvement in Ray picking against models	2017-05-16 20:47:50 -07:00
Atlante45	201f81f20a	Don't wait on the sandbox	2017-05-16 14:41:57 -07:00
ZappoMan	149750fe21	make the octree sparse	2017-05-14 08:36:54 -07:00
ZappoMan	5065c7c5c4	more warning fixes	2017-05-13 10:17:59 -07:00
ZappoMan	da404ce2ce	fix warning	2017-05-13 09:29:32 -07:00
Vladyslav Stelmakhovskyi	49a45f0300	Merge branch 'master' into market-crash-fix	2017-05-13 14:23:26 +02:00
Vladyslav Stelmakhovskyi	20c27fc133	Fix crash on save Map data settings from scripts	2017-05-13 14:20:28 +02:00
ZappoMan	dcb70aa504	more cleanup	2017-05-12 19:03:08 -07:00
ZappoMan	4af3c760e6	more cleanup	2017-05-12 18:57:33 -07:00
ZappoMan	f1bd06cfa0	cleanup some unneeded class	2017-05-12 18:33:28 -07:00
ZappoMan	89b6a79f68	make sure to exit early if box intersection is already larger than best triangle intersection	2017-05-12 17:56:45 -07:00
ZappoMan	eb3b27849c	only keep one copy of Triangles	2017-05-12 17:07:47 -07:00
ZappoMan	ea8330e4e3	Merge branch 'master' of https://github.com/highfidelity/hifi into TriangleSetOptimizations	2017-05-12 13:00:14 -07:00
Brad Hefta-Gaub	a88f72024d	Merge pull request #10243 from birarda/bake-textures ... Add an internal tool for domain/model/skybox KTX texture baking	2017-05-12 12:26:33 -07:00
Clément Brisset	1658ced671	Merge pull request #10437 from Atlante45/feat/faster-startup ... Use baked default skybox	2017-05-12 11:35:51 -07:00
Seth Alves	4aa683363c	back out previous changes, do compressionOptions.setPitchAlignment(4) instead	2017-05-11 16:22:12 -07:00
Atlante45	6378b96b4c	CR	2017-05-11 14:41:02 -07:00
Seth Alves	ac2bc39a27	try, try again	2017-05-11 14:10:03 -07:00
Seth Alves	a26f9c7887	make _size const	2017-05-11 13:36:05 -07:00
Atlante45	e0863aa50f	Only open files for write if necessary	2017-05-11 11:54:52 -07:00
Seth Alves	dfb9fecf17	pad MemoryStorage size to multiple of 4 rather than using a vector of uint32_t -- this gets the same alignment without needs casts	2017-05-11 07:11:40 -07:00
Seth Alves	c9868640c1	force data in MemoryStorage to be word aligned to avoid crash in glTextureSubImage2D	2017-05-10 18:14:50 -07:00
ZappoMan	a15c5999b5	first cut at octree storage of Triangle Set	2017-05-10 16:58:51 -07:00
trent	a3545661dc	Merged hifi/master into this PR and resolved merge conflicts.	2017-05-09 15:09:53 -04:00
Andrew Meadows	2835a73c6b	Merge pull request #10071 from AndrewMeadows/walk-up-steps ... avatar can walk up steps	2017-05-08 18:17:16 -07:00
Andrew Meadows	a31a861e19	fix typo: physcis --> physics	2017-05-05 09:33:50 -07:00
Seth Alves	92966377fb	Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 19:05:57 -07:00
Seth Alves	51cb579773	function to turn nestable-type into a string	2017-05-04 19:05:01 -07:00
Seth Alves	960bab6e4e	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 16:42:57 -07:00
Brad Davis	2d0bbf70ae	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
Seth Alves	69944cc76d	add a way to get a SpatiallyNestable's name without knowing what its type is	2017-05-03 21:32:49 -07:00
trent	557a8fffd7	Addressing some PR feedback; moved easeInEaseOut to Interpolate class. My function is faster than andrew's. :D	2017-05-02 19:56:47 -04:00
Brad Davis	425405f72d	Merge pull request #10245 from AndrewMeadows/avatar-renderer-002 ... more cleanup in preparation for moving Avatar class to lib	2017-05-02 10:37:22 -07:00
Anthony J. Thibault	2120e63e3a	Merge branch 'master' into feature/head-standard-action	2017-04-27 17:51:13 -07:00
Andrew Meadows	75b563d598	restore rendering of avatar receive stats	2017-04-27 13:16:50 -07:00