22707 commits

Author	SHA1	Message	Date
Thijs Wenker	712aff7ad6	base scale attachment on the natural dimensions	2017-05-23 17:53:08 +02:00
Chris Collins	207c13c3c3	Merge pull request #10528 from AndrewMeadows/payload-gets-weak-pointer ... MeshPartPayload keeps weak pointer to Model	2017-05-22 21:54:40 -07:00
Chris Collins	978eb0dfa9	Merge pull request #10492 from ctrlaltdavid/21359 ... Fix eye behavior in recording playback	2017-05-22 21:53:13 -07:00
Chris Collins	b0efb6d956	Merge pull request #10525 from seefo/master ... Added refreshing of Account Managers access token	2017-05-22 21:42:16 -07:00
Sam Gateau	e4a516dcbf	Merge pull request #10497 from AndrewMeadows/crashfix-null-rig ... fix crash for Zone with 'compoundURL' property	2017-05-22 18:18:08 -07:00
Brad Hefta-Gaub	3aeb8ae5e1	Merge pull request #10526 from birarda/bug/entity-server-script-whitelist ... make server entity scripts respect the script whitelist	2017-05-22 17:58:04 -07:00
Andrew Meadows	f7db877b7f	payload keeps weak pointer to Model	2017-05-22 17:29:15 -07:00
seefo	a638704a8c	Modified AccountManager code to better meet style guidelines	2017-05-22 17:01:37 -07:00
Brad Davis	3995f539cf	Merge pull request #10500 from Atlante45/feat/bc7 ... Add BC7 compression support	2017-05-22 16:47:27 -07:00
Stephen Birarda	cecbf43129	make server entity scripts respect script whitelist	2017-05-22 16:17:01 -07:00
David Rowe	9cb990a3aa	Simplify head simulation methods	2017-05-23 09:53:42 +12:00
Brad Davis	a5112ce52a	Merge pull request #10520 from jherico/texture_ping_pong ... Prevent ping-ponging of texture quality when oversubscribed	2017-05-22 14:52:52 -07:00
seefo	e77e900812	Added refreshing of Account Manager's access token ... Changed indentention style to match guidelines	2017-05-22 14:46:44 -07:00
David Rowe	9f83ca518f	Merge branch 'master' into 21359	2017-05-23 09:18:10 +12:00
anshuman64	bfb44693a3	Merge pull request #10482 from ctrlaltdavid/21361 ... Fix AC playback script not logging	2017-05-22 12:58:20 -07:00
Brad Davis	afee753570	Prevent ping-ponging of texture quality when oversubscribed	2017-05-22 09:52:18 -07:00
Seth Alves	4142d8c686	actions shouldn't change locked entities	2017-05-21 11:05:18 -07:00
Seth Alves	381de7a1e2	tabs	2017-05-21 08:42:53 -07:00
Seth Alves	c68efc2ed0	treat locked like other properties that affect simulation	2017-05-21 08:29:35 -07:00
Seth Alves	2512b39848	don't dirty motion-type if lock value isn't actually changing	2017-05-20 14:14:33 -07:00
Seth Alves	8f38ea8c6a	force locked entities to be static in bullet	2017-05-20 11:54:42 -07:00
David Rowe	a279d581ae	Fix code order	2017-05-20 12:56:23 +12:00
David Rowe	768415695d	Tidying	2017-05-20 12:43:47 +12:00
David Rowe	d9baa337d8	Fix call order	2017-05-20 12:41:50 +12: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
David Rowe	597312ff45	Reinstate missing guards	2017-05-20 12:08:01 +12:00
Clément Brisset	fa3ef25f3e	Merge pull request #10481 from marko8904/new_landing_in_welcome ... changing the location in welcome to which a user is sent on the first run	2017-05-19 16:45:14 -07:00
Andrew Meadows	f80e7a3743	less obfuscation	2017-05-19 15:58:54 -07:00
Andrew Meadows	bb4d366c40	use SmartPointer for Zone _model	2017-05-19 15:33:23 -07:00
David Rowe	0d6513c7dc	Merge branch 'master' into 21359	2017-05-20 10:11:25 +12:00
Ryan Huffman	26247e8653	Add check for valid mutableData in assignMipData	2017-05-19 15:00:53 -07:00
Andrew Meadows	7b879a7964	Model has a Rig rather than a RigPointer	2017-05-19 13:24:16 -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
Atlante45	c2e2682eff	Fix "Reset Settings" window poping up every time	2017-05-19 10:50:23 -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
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
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
David Rowe	3aebe96afe	Merge branch 'master' into 21359	2017-05-19 09:03:11 +12:00
Atlante45	a8b1a29a4a	Add support for BC7 compression	2017-05-18 13:11:41 -07:00
Ryan Huffman	6d2d838510	Fix ktx image size in progrssively loaded cubemaps ... The size being written was the full image size (size of all faces), when it should have been the face size.	2017-05-18 11:46:14 -07:00
Andrew Meadows	8d3285f733	verify _rig is valid in Model::deleteGeometry()	2017-05-18 11:11:50 -07:00
David Kelly	c2b140cc03	Merge pull request #10489 from davidkelly/dk/sequenceNumberForAvatarIdentity ... Switch from timestamp to sequence id for avatar identity	2017-05-18 10:09:42 -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
David Rowe	f6c1fa4213	Merge branch 'master' into 21359	2017-05-18 16:40:20 +12: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
Seth Alves	b05cb4af3b	fix nan	2017-05-17 20:51:34 -07:00
David Rowe	26e390fa89	Tidy code setting head orientation	2017-05-18 13:55:06 +12:00