Commit graph

77712 commits

Author SHA1 Message Date
Roxanne Skelly
029eab73cb Lambda capture was referencing something on the local stack
which may go out of scope when lambda was called.
2019-04-04 16:00:15 -07:00
ingerjm0
3dbb2b1812 Fix build error for template changes 2019-04-04 15:08:39 -07:00
Ryan Huffman
b9c81a3899
Merge pull request #15322 from huffman/fix/interactive-window-shutdown-crash
Case 18299: Fix ScriptEngine not being destroyed on its own thread
2019-04-04 15:00:50 -07:00
Sam Gateau
bda54c71ea
Merge pull request #15324 from AndrewMeadows/avoid-nan-model-scale
Case 22054: flat models can introduce nan into geometry
2019-04-04 14:51:19 -07:00
Wayne Chen
3f85e064b8
initialize transform outside of switch statement 2019-04-04 14:46:06 -07:00
Wayne Chen
a2084259fa
Merge pull request #27 from wayne-chen/locomotionCRFeedback
adding precheck procedure
2019-04-04 13:56:20 -07:00
Wayne Chen
c18b00ebec adding precheck procedure 2019-04-04 13:55:35 -07:00
Wayne Chen
56f0ef80ee
Merge pull request #26 from wayne-chen/locomotionCRFeedback
fixing typo
2019-04-04 13:47:59 -07:00
Wayne Chen
819bf9212c fixing typo 2019-04-04 13:47:13 -07:00
Sam Gondelman
85bf1da0a1
Merge pull request #15266 from SamGondelman/stencil
Case 20060: Grab correct stencil masks from display plugins
2019-04-04 13:36:25 -07:00
Wayne Chen
bcbff6ace4
Merge pull request #25 from wayne-chen/locomotionCRFeedback
more code feedback
2019-04-04 13:30:13 -07:00
Ryan Huffman
cf3a9b1d48 Fix ScriptEngine not being destroyed on its own thread 2019-04-04 13:28:13 -07:00
Wayne Chen
ec4ad02192 more code feedback 2019-04-04 13:26:34 -07:00
NissimHadar
8eb428bc77
Merge pull request #15313 from NissimHadar/22021-specificThresholdsPerGPUVendor-v3.2.0
Case 22021: specific thresholds per GPU vendor v3.2.0
2019-04-04 12:42:26 -07:00
Wayne Chen
2a11738ef6
Merge pull request #24 from wayne-chen/locomotionCRFeedback
code review feedback/formatting issues
2019-04-04 12:05:36 -07:00
Wayne Chen
4f738a5b42 code review feedback/formatting issues 2019-04-04 12:03:48 -07:00
NissimHadar
4f97899045 Moved position of GPU vendor combo. 2019-04-04 11:31:06 -07:00
Shannon Romano
65a039e228
Merge pull request #15312 from roxanneskelly/Case19858
Case 19858 - crashpad_handler is duplicated outside of the Interface/…
2019-04-04 11:27:20 -07:00
Sam Gateau
eee5f87dcd
Merge pull request #15264 from Zvork/hdr
Case 22045: Added support for OpenEXR files (mostly for skyboxes)
2019-04-04 10:32:11 -07:00
Angus Antley
9afbf76ec1 removed unnecessary getFauxJointIndex call, this is handled in getJointIndex 2019-04-04 10:22:24 -07:00
Angus Antley
72264203db corrected the lock positions to cover the getJointIndex calls 2019-04-04 10:08:50 -07:00
Andrew Meadows
72ac35c6f7 avoid nan in Model::_scale 2019-04-04 08:28:03 -07:00
David Rowe
1bc38cab28 Camera JSDoc polish 2019-04-04 18:03:14 +13:00
r3tk0n
17e559f8e8 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-03 16:17:00 -07:00
r3tk0n
283ec97bb9 Fix desktop movement. 2019-04-03 16:09:13 -07:00
Sam Gateau
0d8169bd35
Merge pull request #15311 from danteruiz/double-avatars
Case 21415: Avatars stay behind after they disconnect
2019-04-03 16:07:35 -07:00
Sam Gateau
5730e92871
Merge pull request #15317 from jherico/fix/21911_alt
Case 21730:  Restore composite framebuffer to display plugins
2019-04-03 16:02:47 -07:00
NissimHadar
3ba5f8e574 Use place holder instead of RCC file.
(cherry picked from commit 709515dd74)
(cherry picked from commit 4e4526fbb2)
2019-04-03 15:25:34 -07:00
SamGondelman
2b376f7881 handle weird material name case 2019-04-03 14:26:45 -07:00
David Rowe
2a17ad3da5 AvatarList and AvatarManager JSDoc 2019-04-04 10:11:54 +13:00
Roxanne Skelly
75671be2de Case 22025 - Create temporary placename doesn't appear when no places are listed 2019-04-03 13:57:37 -07:00
maspring
05cab9a3cc
Merge pull request #15122 from raveenajain/gltf_skinning
Case 21502: skinned gltf
2019-04-03 13:45:41 -07:00
Brad Davis
44fc0d21db Revert "Remove _compositeFramebuffer from display plugins"
This reverts commit cb311408c6.
2019-04-03 13:43:39 -07:00
r3tk0n
8b670110a9 Fix omitted return in MyAvatar::scaleMotorSpeed 2019-04-03 13:06:22 -07:00
Angus Antley
857a4ab739 enabled MyAvatar.get and .set rotation 2019-04-03 13:04:55 -07:00
r3tk0n
874fb6b6d7 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-04-03 12:42:33 -07:00
r3tk0n
ac2971894b Fix sprint mode scalar. 2019-04-03 11:42:40 -07:00
Roxanne Skelly
1e4398c950 Revert "Temporary crashpad debugging"
This reverts commit df0996cdc9.
2019-04-03 11:31:35 -07:00
SamGondelman
cf7230f023 fix non-embedded textures 2019-04-03 11:26:07 -07:00
Shannon Romano
451b2eb391
Merge pull request #15308 from roxanneskelly/Case20410
Case 20410 - Automatic Content Archives doesn't restore correctly with old Tutorial content set
2019-04-03 11:07:16 -07:00
Sam Gondelman
1cc2cd3194
Merge pull request #15237 from SamGondelman/particleShapes
Case 21859: Particle Entity emitter shapes, including model
2019-04-03 11:03:33 -07:00
Shannon Romano
f2ff5bebc7
Merge pull request #15275 from howard-stearns/ddv-all
DDV all, including domainUnlimited
2019-04-03 11:03:16 -07:00
Roxanne Skelly
df0996cdc9 Temporary crashpad debugging 2019-04-03 10:17:12 -07:00
Sam Gateau
d0bf102695
Merge pull request #15314 from AndrewMeadows/more-correct-collision-groups
Case 20991: more correct collision group during grabs
2019-04-03 09:38:30 -07:00
r3tk0n
ec37ad7dc6 Address Wayne and Angus' comments on github. 2019-04-03 09:38:14 -07:00
unknown
8dbdee4262 better fix for trailing key events 2019-04-03 09:08:29 -07:00
unknown
e2387b053b Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleContinualTranslateFix 2019-04-03 08:33:26 -07:00
NissimHadar
facf8a9305
Merge pull request #15287 from NissimHadar/21893-enableTheUrlCommandLineParameterOnAndroid
Case 21893: Remove disabling of --url for Android.
2019-04-03 07:50:31 -07:00
NissimHadar
813d467f49 Ready. 2019-04-03 07:43:07 -07:00
Andrew Meadows
1860e61a30 more correct collision group during grabs 2019-04-03 07:42:56 -07:00