David Rowe
4c8f281383
Typos etc.
2019-06-22 14:16:17 +12:00
David Rowe
b2b7a6ae99
Merge branch 'master' into DOC-79
2019-06-22 12:11:22 +12:00
David Rowe
eb227c6b9a
Document Entities entity methods
2019-06-22 11:59:07 +12:00
Sam Gateau
e0d0124caa
Merge pull request #15817 from SamGondelman/cube
...
BUGZ-734: Possible fix for black shape issue
2019-06-21 16:13:36 -07:00
Shannon Romano
13615eb9ff
Merge pull request #15818 from sabrina-shanman/crash_scriptengine_thread
...
(BUGZ-619) Fix potential crash when ending script on main thread
2019-06-21 15:08:42 -07:00
MiladNazeri
11a0c671e5
Merge pull request #15795 from zfox23/SUI/fixLasers
...
BUGZ-657; BUGZ-713: Add a copy of the most default JS files because lots of system scripts depend on them being in the default scripts location
2019-06-21 15:01:24 -07:00
Shannon Romano
33c99da71e
Merge pull request #15816 from roxanneskelly/bugz761
...
BUGZ-761 Add locks to OctreeEditPacketSender to protect various members
2019-06-21 14:39:41 -07:00
David Rowe
e3f971a304
Update Entities examples to have a delay after creation before editing
2019-06-22 09:23:07 +12:00
sabrina-shanman
4fafa2135a
Fix potential crash when ending script on main thread
2019-06-21 14:20:15 -07:00
Zach Fox
8044b33d65
This also works
2019-06-21 13:44:31 -07:00
Zach Fox
022a47d3ec
Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers
2019-06-21 13:41:31 -07:00
David Rowe
0bee5edc47
Fix documentation of Material's albedo and emissive property values
2019-06-22 08:41:30 +12:00
Zach Fox
5067fd4cd2
OK this is definitely working
2019-06-21 13:41:11 -07:00
SamGondelman
8409119ad0
possible fix for black shape issue
2019-06-21 12:58:49 -07:00
Roxanne Skelly
001eae784a
Add locks to OctreeEditPacketSender to protect various members
2019-06-21 11:42:27 -07:00
Zach Fox
21454f6256
Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers
2019-06-21 09:44:54 -07:00
amer cerkic
67e42148ef
Merge branch 'master' of https://github.com/highfidelity/hifi
2019-06-21 09:43:33 -07:00
David Rowe
3c53cb2e90
Add missing grabDelegetToParent property to JSDoc
2019-06-21 15:21:16 +12:00
David Rowe
52860adc1c
Add callEntityMethod() and similar examples
2019-06-21 14:27:51 +12:00
Anthony Thibault
64a77d07e0
Merge pull request #15814 from hyperlogic/bug-fix/twitchy-finger-fix
...
Disable handTouch.js to prevent finger twitching
2019-06-20 17:03:39 -07:00
David Rowe
a858314898
Remainder of Entities signals' JSDoc
2019-06-21 11:25:10 +12:00
Anthony J. Thibault
3a6d8dc383
Disable handTouch.js to prevent finger twitching
...
This PR disables handTouch.js.
handTouch.js allows the fingers to animate on the surface of an object.
However, it can sometimes detect collisions with walls or tables when the avatar is standing next to them.
We will more properly fix handTouch.js in a future PR, but for now we will disable the functionality.
Also, a small bug fix was made to the Rig to prevent the idleOverlayAlpha from exceeding the 0.0 to 1.0 range.
This can cause the fingers to bend incorrectly for a moment.
Also, three new items were added to the Developer > Show Animation Stats panel.
* Joint Override Count: displays the current count of joints that are overriden by MyAvatar.setJointRotation() JS API calls.
* Flow: displays if flow is active of disabled.
* Network Graph: displays if the network anim graph, used for teleportation, is enabled or disabled.
https://highfidelity.atlassian.net/browse/BUGZ-154
2019-06-20 15:52:36 -07:00
Andy Howell
447f0ca55c
Merge pull request #15807 from AndrewMeadows/fix-crash-bugz512-redux
...
BUGZ-512: fix MacOS crash in FakeAudioInputStream on domain-change and shutdown
2019-06-20 15:42:33 -07:00
amer cerkic
30e295d1a0
push to talk causes fun, removing tttt
2019-06-20 15:12:20 -07:00
amer cerkic
1218f7e014
moved audioclient stop to dtor
2019-06-20 15:10:21 -07:00
Andy Howell
4cc6eae478
Merge pull request #15809 from samcake/nut
...
BUGZ-776 : Detect AMD gpu on more than one possible token
2019-06-20 15:08:41 -07:00
Shannon Romano
7645fcfaa1
Merge pull request #15805 from SamGondelman/shared
...
BUGZ-777: Clean up SharedObject code
2019-06-20 14:35:58 -07:00
Sam Gateau
bde50aa21c
Detect AMD gpu on more than one possible token...
2019-06-20 14:24:04 -07:00
Zach Fox
d49205be74
Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers
2019-06-20 09:45:49 -07:00
Andrew Meadows
1ea0dba083
use weak_ptr for fade-out-finished lambda
2019-06-20 09:29:48 -07:00
Andrew Meadows
87d7a0a72f
recover the Good Parts from first attempt to fix bugz-512
2019-06-20 09:29:48 -07:00
Sam Gateau
a66bd04810
Merge pull request #15803 from SamGondelman/setPipeline
...
BUGZ-703: Possible fix for do_setPipeline crash and other Mac fixes
2019-06-20 09:27:16 -07:00
Andrew Meadows
b23badf374
Merge pull request #15804 from samcake/wall
...
DEV-146, BUGZ-747: Add one call in PlatformInfo::getPlatform() returning the complete description of the platform
2019-06-20 09:07:19 -07:00
David Rowe
0945bdaac7
Remainder of Entities methods' JSDoc
2019-06-20 15:11:01 +12:00
Shannon Romano
77d91fce33
Merge pull request #15802 from annabrewer/unreachable-code
...
Small warning fix
2019-06-19 18:06:34 -07:00
Shannon Romano
80b118560d
Merge pull request #15801 from SimonWalton-HiFi/recording-playback-null-url
...
A null recording clip should be considered an error
2019-06-19 17:58:46 -07:00
SamGondelman
50df5e0bc5
small cleanup to shared object etc.
2019-06-19 16:56:45 -07:00
Sam Gateau
8f04eaae1d
Merge branch 'master' of github.com:highfidelity/hifi into wall
2019-06-19 16:53:04 -07:00
Sam Gateau
53094ef70c
One more pass of clean up on the platform api, returning the complete description in a single call, adding the version of the OS and deprecating legacy PlatformInfo calls
2019-06-19 16:52:33 -07:00
SamGondelman
fb8cc27fef
Merge remote-tracking branch 'upstream/master' into shared
2019-06-19 16:52:04 -07:00
SamGondelman
f2e3218ec0
possible fix for do_setPipeline crash and other mac fixes
2019-06-19 16:34:38 -07:00
Shannon Romano
c7a5d35436
Merge pull request #15799 from roxanneskelly/bugz516a
...
BUGZ-516 - add OS type to connect message for logging
2019-06-19 16:08:13 -07:00
Anna
c215831df8
fixed potential unreachable code warnings
2019-06-19 15:41:53 -07:00
Bradley Austin Davis
e848aca193
Merge pull request #15800 from jherico/fix/gl_context_create_2_0
...
BUGZ-402: Don't request an OpenGL 2.0 context via the dock widget
2019-06-19 15:20:50 -07:00
Simon Walton
7701710aa5
Consider a NetworkClipLoader resource with null URL to be failed
2019-06-19 15:02:16 -07:00
Shannon Romano
12357e5ced
Merge pull request #15797 from annabrewer/gamma-correction-correction
...
BUGZ-271: Android gamma correction is too high
2019-06-19 14:39:09 -07:00
Brad Davis
abb71ba604
Don't request an OpenGL 2.0 context via the dock widget
2019-06-19 14:10:53 -07:00
Roxanne Skelly
2ed5e8aefb
add OS type to connect message
2019-06-19 13:53:38 -07:00
Anna
00820b9a9b
Merge branch 'master' of github.com:highfidelity/hifi into gamma-correction-correction
2019-06-19 13:49:55 -07:00
Zach Fox
8fdfdbaae4
Another attempt, still not working
2019-06-19 13:31:21 -07:00
