25708 commits

Author	SHA1	Message	Date
John Conklin II	b7069fff71	Merge pull request #13382 from SamGondelman/particleFix ... Fix Particle Entities	2018-06-22 13:27:11 -07:00
Sam Gondelman	44a7d04b2a	Merge pull request #13426 from SamGondelman/avatarPriority ... Highest loading priorities for avatars and attachments	2018-06-22 11:22:10 -07:00
Sam Gondelman	850e2d5cf5	Merge branch 'master' into particleFix	2018-06-21 17:32:24 -07:00
John Conklin II	aa630e02cf	Merge pull request #13269 from wayne-chen/BillboardableWarning-case-14709 ... Billboardable::pointTransformAtCamera div by zero asan warning	2018-06-21 10:04:38 -07:00
SamGondelman	8f411ad6c8	CR	2018-06-20 16:13:10 -07:00
Andrew Meadows	4424a8df11	Merge pull request #13303 from highfidelity/workload ... workload project part 1	2018-06-20 15:39:01 -07:00
SamGondelman	8014f61243	loading priorities for avatars and attachments	2018-06-20 12:29:28 -07:00
Andrew Meadows	24bae8eddc	Merge pull request #13425 from sabrina-shanman/crash-strafe ... Fix crash when walking sideways	2018-06-20 11:13:20 -07:00
sabrina-shanman	a8b2da14cf	Format numeric constant in strafe crash commit to match coding standards	2018-06-20 08:45:12 -07:00
sabrina-shanman	45fdf3d68f	Fix crash when walking sideways	2018-06-19 17:23:00 -07:00
Brad Davis	787fb1b9bd	Fix crash in display plugin caused by audio device changed	2018-06-19 16:13:57 -07:00
Zach Fox	fa3fae09b2	Merge pull request #13416 from zfox23/MS15154_removeButtonFocusState ... Fix MS15154: Remove focused button color	2018-06-19 13:10:11 -07:00
Zach Fox	a4d47a0248	Merge pull request #13408 from zfox23/MS16012_emptyHistoryFix ... Fix MS16012: Correct the criteria used to determine empty txn history	2018-06-19 12:01:51 -07:00
Zach Fox	1ea3b85a5d	Merge pull request #13418 from zfox23/MS16052_PNG50 ... Implement MS16052: Use quality '50' when saving PNG Snapshots	2018-06-19 11:52:10 -07:00
Zach Fox	97e4d2eb46	Merge pull request #13404 from zfox23/MS15545_fixWebBackButton ... Fix MS15545: Fix PAL/GoTo WebView's Back Button	2018-06-19 11:25:27 -07:00
Zach Fox	3ef41664dc	Implement MS16052: Use quality '50' when saving PNG Snapshots	2018-06-19 10:32:01 -07:00
Zach Fox	d056fa6c93	Fix MS15154: Remove focused button color	2018-06-19 09:56:24 -07:00
Andrew Meadows	44c3620b6e	remove cruft	2018-06-18 17:45:58 -07:00
John Conklin II	9ace80c709	Merge pull request #13407 from AndrewMeadows/0.69.0-colliding-avatars ... RC69: avatars collide again (again)	2018-06-18 15:21:47 -07:00
John Conklin II	a47038d81f	Merge pull request #13381 from hyperlogic/feature/crashpad-thread-id ... Add main & render thread ids to crashpad annotations	2018-06-18 15:21:04 -07:00
Sam Gateau	56a1137f7b	Merge pull request #13312 from SamGondelman/overlayPipelines ... Fix layered overlay rendering and highlight	2018-06-18 14:35:03 -07:00
Zach Fox	ad1da3e225	Fix MS16012: Correct the criteria used to determine empty txn history	2018-06-18 14:26:46 -07:00
Andrew Meadows	a18ba36dd2	merge 'master' into 'workload'	2018-06-18 13:40:08 -07:00
Andrew Meadows	085130e3c9	avatars collide again again	2018-06-18 13:17:32 -07:00
Zach Fox	84ed07cdb4	Merge pull request #13405 from zfox23/MS16007_supportPngSnapshots ... Implement MS16007: Add support for PNG snapshots	2018-06-18 13:10:45 -07:00
Wayne Chen	07e689f086	removing compute/check for u	2018-06-18 13:02:53 -07:00
Zach Fox	e83b76781b	Be a bit more specific in the docs	2018-06-18 11:47:26 -07:00
Zach Fox	614b512411	Add docs	2018-06-18 11:43:31 -07:00
Howard Stearns	69d1b85d32	Merge pull request #13393 from howard-stearns/fix-concurrency-drill-down ... fix concurrency drillDown	2018-06-18 11:39:30 -07:00
Elisa Lupin-Jimenez	9c488ff05e	Merge pull request #13331 from gcalero/breakpad_android ... Breakpad integration for android Interface	2018-06-18 11:32:05 -07:00
Elisa Lupin-Jimenez	c08df9e39f	Merge pull request #13400 from kitely/parse-snapshot-fix ... Don't call parseSnapshotData() in a static manner	2018-06-18 11:26:29 -07:00
Zach Fox	dbf3ade04f	Implement MS16007: Add support for PNG snapshots	2018-06-18 11:22:05 -07:00
Wayne Chen	e381022910	checking for NaN in cross products from vec3 positions	2018-06-18 11:21:53 -07:00
Gabriel Calero	3eecb2f379	Apply code conventions	2018-06-18 14:42:08 -03:00
Wayne Chen	ed7f008517	checking edge case of if input vectors are zero	2018-06-18 10:31:11 -07:00
Andrew Meadows	6d422e4678	Merge 'master' into 'workload'	2018-06-18 10:30:13 -07:00
Zach Fox	f307f1d97a	Fix MS15545: Fix PAL/GoTo WebView's Back Button	2018-06-18 10:19:00 -07:00
Elisa Lupin-Jimenez	b255cf0ba9	Merge pull request #13389 from AndrewMeadows/misc-001 ... crash fixes, removing unnecessary writes, and misc cleanup	2018-06-18 09:19:22 -07:00
Oren Hurvitz	d8ea47b78f	Don't call parseSnapshotData() in a static manner. ... Shouldn't call non-static methods in a static manner. (Some compilers don't even allow this, although apparently Visual Studio 2017 does.)	2018-06-17 14:18:25 +03:00
Gabriel Calero	583c46b3a0	Merge remote-tracking branch 'upstream/master' into breakpad_android	2018-06-15 21:21:03 -03:00
Gabriel Calero	20c147ef11	Fix compilation error	2018-06-15 21:12:38 -03:00
howard-stearns	97fa22b69b	fix concurrency drillDown	2018-06-15 16:57:21 -07:00
Gabriel Calero	1cdd8c2f3c	Fix compilation error	2018-06-15 20:39:24 -03:00
Gabriel Calero	20727378e2	Rename crash handler files	2018-06-15 20:32:10 -03:00
John Conklin II	2655dd77b6	Merge pull request #13368 from zfox23/MS15501_CreateModelKeyboard ... MS15501: Fix keyboard in Create -> Model in HMD	2018-06-15 15:34:02 -07:00
Anthony J. Thibault	2feecf6db8	removed unnecessary setting of 'username' annotation.	2018-06-15 14:56:10 -07:00
Anthony J. Thibault	8ddcff6070	Set username annotation more reliably.	2018-06-15 14:47:02 -07:00
John Conklin II	2483c45f40	Merge pull request #13350 from sabrina-shanman/bulletcollisionrenderonly ... Remove functionality for rendering collision models directly in the Model class	2018-06-15 14:46:40 -07:00
Andrew Meadows	be0899c41d	remove unnecessary writes to appease Xcode's static analyzer	2018-06-15 11:44:22 -07:00
Anthony J. Thibault	24689224ce	removed redundant machine_fingerprent crashpad annotation.	2018-06-15 11:40:45 -07:00