Commit graph

80093 commits

Author SHA1 Message Date
Clement
29d017bb65 CR 2019-08-08 13:49:15 -07:00
Clement
b2704da9ef Don't manage _sendData's memory 2019-08-07 15:04:20 -07:00
Clement
ec9d13700d Break JS circular ref to help garbage collect 2019-08-07 13:19:53 -07:00
Clement
0b72e4dc60 Make XML HTTP requests script owned
This was causing them to leak every time
2019-08-07 13:18:39 -07:00
Sabrina Shanman
0728df8a8f
Merge pull request #16025 from sabrina-shanman/picks_debug
(BUGZ-1059) Improve debug API for picks/pointers
2019-08-07 12:01:26 -07:00
Brad Hefta-Gaub
9702fb48b6
Merge pull request #16039 from zfox23/enterEntityOnReload
Fix BUGZ-1197 (and others): Ensure enterEntity is emitted when avatar is inside entity and script is reloaded
2019-08-07 11:49:44 -07:00
Zach Fox
b45e670d21 Fix BUGZ-1197 (and others): Ensure enterEntity is emitted when avatar is inside entity and script is reloaded 2019-08-07 13:55:16 -04:00
sabrina-shanman
66dbb08b01 Be explicit about pickType/pointerType being returned when getting script parameters 2019-08-07 10:44:43 -07:00
sabrina-shanman
3985261c91 Remove locks on getters/setters for PickQuery::_scriptParameters 2019-08-07 10:14:35 -07:00
sabrina-shanman
4cb925e973 Fix jsdoc for getPointerScriptParameters 2019-08-07 10:04:44 -07:00
sabrina-shanman
8cde93973d Disambiguate pick and pointer types in the returned properties 2019-08-07 09:56:23 -07:00
Shannon Romano
ba7f9f410b
Merge pull request #16036 from luiscuenca/WLFixAutoCopy
BUGZ-1185: WL Fix update process
2019-08-06 18:16:04 -07:00
luiscuenca
ecd078f6d3
Retry self copy if the old launcher is still shutting down. 2019-08-06 16:39:31 -07:00
Shannon Romano
93d5d9bd3f
Merge pull request #15988 from ctrlaltdavid/DOC-98
DOC-98, DOC-114: PlatformInfo API changes JSDoc
2019-08-06 13:22:36 -07:00
Shannon Romano
9e0e6f9d5e
Merge pull request #16003 from ctrlaltdavid/DOC-84
DOC-84: Update JSDoc with glTF
2019-08-06 13:22:04 -07:00
Shannon Romano
8c981140b0
Merge pull request #16005 from ctrlaltdavid/DOC-61
DOC-61: Render API JSDoc
2019-08-06 13:18:17 -07:00
Zach Fox
8b85bbfe67
Merge pull request #16034 from zfox23/masterGPU
BUGZ-1103: Use 'Master GPU' information in About screen
2019-08-06 12:31:54 -07:00
jennaingersoll
f487d094fe
Merge pull request #15959 from ctrlaltdavid/DOC-124
DOC-124: Tidy JSDoc from some recent API changes
2019-08-06 11:57:28 -07:00
Zach Fox
2a4c0a3ecd BUGZ-1103: Use 'Master GPU' information in About screen 2019-08-06 14:13:31 -04:00
Shannon Romano
f02b76fed0
Merge pull request #16011 from ctrlaltdavid/DOC-60
Case 22106: DebugDraw JSDoc
2019-08-06 10:47:43 -07:00
Shannon Romano
9d3d5b7701
Merge pull request #15992 from hyperlogic/feature/reaction-fixes
Refined reaction and sitting animations
2019-08-06 09:15:44 -07:00
David Rowe
2939610eae Fix link to TextEffect type 2019-08-06 11:00:24 +12:00
David Rowe
1abf0eb207 Merge branch 'master' into DOC-124
# Conflicts:
#	libraries/entities/src/EntityItemProperties.cpp
2019-08-06 10:59:50 +12:00
David Rowe
8ea4ee6d48 Doc review 2019-08-06 10:42:17 +12:00
Andy Howell
7aaecd9cdc
Merge pull request #16030 from danteruiz/fix-updater
fix updater typo
2019-08-05 15:42:00 -07:00
David Rowe
26a04e56eb Merge branch 'master' into DOC-98 2019-08-06 10:33:12 +12:00
Ken Cooke
6fd3214f48
Merge pull request #16029 from kencooke/audio-device-format-robustness
BUGZ-1171: Fix audio output not working (alternate fix)
2019-08-05 14:19:46 -07:00
Zach Fox
26e0a5dfd8
Merge pull request #16028 from zfox23/shieldIcon_master
RC84: Fix BUGZ-1131: Add Shield icon back to HUD for Metaverse users
2019-08-05 13:36:58 -07:00
sabrina-shanman
30482c2db4 Give the pointer its own copy of the script parameters in case its pick is deleted 2019-08-05 13:36:15 -07:00
dante ruiz
7ab8a6b8d1 fixing typo 2019-08-05 13:16:08 -07:00
David Rowe
f97417932c Fix typo 2019-08-06 08:08:08 +12:00
David Rowe
419044021b Merge branch 'master' into DOC-61 2019-08-06 08:03:12 +12:00
Anthony J. Thibault
640c058591 Code review feedback 2019-08-05 12:52:42 -07:00
Ken Cooke
86adc6099b Attempt audio device format with native sample rate and channels forced to 2/1 before failing 2019-08-05 12:14:45 -07:00
Zach Fox
34bc71fba9 Fix BUGZ-1131: Add Shield icon back to HUD for Metaverse users 2019-08-05 15:12:29 -04:00
sabrina-shanman
715f6a4473 Mark BaseNestableTransformNode::toVariantMap with override 2019-08-05 12:02:24 -07:00
Brad Hefta-Gaub
e1ef003523
Merge pull request #16024 from amerhifi/master
case BUGZ-1168: adding default script location setting for defaultscriptoverride run…
2019-08-05 11:34:41 -07:00
sabrina-shanman
0bd00c3554 Fix not being able to use both QVector<unsigned int> and QVector<glm::uint32> in scripting 2019-08-05 10:31:13 -07:00
sabrina-shanman
27cf080ad6 Simplify getting nestable pointer in BaseNestableTransformNode::toVariantMap 2019-08-05 09:52:01 -07:00
Anthony J. Thibault
704a2d2ac9 Merge branch 'master' into feature/reaction-fixes 2019-08-05 09:43:32 -07:00
Anthony J. Thibault
649ef6c721 Added sitting idle variation and removed rejected emote variations. 2019-08-05 09:42:01 -07:00
Andy Howell
a0d52f6f24
Merge pull request #15985 from danteruiz/auto-updater
DEV-264: Lilypad Launcher (Mac): Auto-update Launcher
2019-08-05 09:36:01 -07:00
sabrina-shanman
f188a3589e Fix function signature for BaseNestableTransformNode::toVariantMap 2019-08-05 09:35:47 -07:00
sabrina-shanman
64fb046a33 Simplify naming for script functions to get list of picks/pointers 2019-08-05 09:25:32 -07:00
Anthony J. Thibault
a8d7f06862 warning fixes 2019-08-04 11:03:21 -07:00
David Rowe
5576bf7e09 Update PlatformInfo JSDoc with recent graphicsAPIs addition 2019-08-03 12:19:36 +12:00
David Rowe
e2748a861a Merge branch 'master' into DOC-98
# Conflicts:
#	libraries/platform/src/platform/backend/Platform.cpp
2019-08-03 11:22:23 +12:00
sabrina-shanman
20fa78e51d Fix some dates and no newline at EOF 2019-08-02 16:13:07 -07:00
sabrina-shanman
f7c324c017 Improve pick/pointer debugging. Use unsigned int in Graphics api for compatibility 2019-08-02 16:10:39 -07:00
Shannon Romano
7322ad78f5
Merge pull request #16023 from AndrewMeadows/fix-shcore-win7
BUGZ-1145: check for Win7 before using SHCore.dll API
2019-08-02 15:43:30 -07:00