Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-28 00:16:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
81088 commits 6 branches 1 tag 1.1 GiB
Commit graph

33489 commits

Author SHA1 Message Date
Anthony J. Thibault
52ed0bcb71 additive blending work 2019-08-29 10:17:51 -07:00
Shannon Romano
b4d0c87654
Merge pull request #16117 from ctrlaltdavid/BUGZ-1316 
BUGZ-1316: Fix crashes in Assets API
 2019-08-29 09:07:37 -07:00
Brad Davis
af22ab55bb PR feedback 2019-08-29 08:46:46 -07:00
David Rowe
fb818c0726 Fix crash in Assets.setBakingEnabled() when callback undefined 2019-08-29 13:33:22 +12:00
David Rowe
746f97a0e0 Fix crash in Assets.getAsset() when callback undefined 2019-08-29 13:33:04 +12:00
Anthony J. Thibault
16a20a5ead AddAbsolute now works! added blendType to AnimClip 2019-08-28 18:19:35 -07:00
Simon Walton
784903fe33 Use UTC with QDateTime rather than local time 2019-08-28 17:57:09 -07:00
Shannon Romano
f63fc15d4f
Merge pull request #16115 from sabrina-shanman/crash_shutdown_running-script 
Attempt to fix crash from script running too late
 2019-08-28 15:54:10 -07:00
Shannon Romano
e07e8abc0d
Merge pull request #16106 from AndrewMeadows/less-MyAvatar-mesh-tuneling-2 
BUGZ-1325 prevent MyAvatar from pushing through mesh barrier
 2019-08-28 15:51:42 -07:00
sabrina-shanman
437f6b4096 Only say we're throwing a script error when we mean it 2019-08-28 14:58:57 -07:00
David Rowe
d52bb66048 Add missing JSDoc 2019-08-29 09:38:43 +12:00
sabrina-shanman
67a06b3a74 Attempt to fix crash from script running too late 2019-08-28 14:28:12 -07:00
Anthony J. Thibault
adda7774d3 WIP checkpoint addAbsolute still broken 2019-08-28 14:08:21 -07:00
Andrew Meadows
b7ae55ca3e smaller CCD proxy for MyAvatar 2019-08-28 11:33:51 -07:00
Brad Davis
5a6e2e5daf Add caching to the restricted value 2019-08-28 10:13:32 -07:00
Brad Davis
954773124a BUGZ-1363: crash when checking for web content restrictions 2019-08-28 09:56:45 -07:00
Andrew Meadows
1beafbdd35 comment cleanup and final tuning 2019-08-28 09:48:15 -07:00
Shannon Romano
e4bcbf60ed
Merge pull request #16110 from ctrlaltdavid/BUGZ-1357 
BUGZ-1357: Fix crashes in ScriptDiscoveryService API
 2019-08-28 09:10:29 -07:00
David Rowe
8c735ed6ae Fix ScriptDiscoveryService.scriptsModel.parent() crash for invalid index 2019-08-28 16:32:52 +12:00
David Rowe
757a4f908b Fix ScriptDiscoveryService.scriptsModel.data() crash for invalid row 
Also fixes unexpected data for invalid column > 1.
 2019-08-28 16:32:22 +12:00
Andrew Meadows
6be3750b38 use collision brake feedback to prevent tunneling 2019-08-27 20:28:56 -07:00
Seth Alves
f331b76c51 apply fake eye saccades if eye joints aren't overridden (rather than if HasProceduralEyeFaceMovement is true) 2019-08-27 16:59:31 -07:00
Seth Alves
1979e1dbc7 apply fake eye saccades if eye joints aren't overridden (rather than if HasProceduralEyeFaceMovement is true) 2019-08-27 16:47:01 -07:00
Andrew Meadows
1314430f04 more checks to prevent thrusting through mesh 2019-08-27 13:51:54 -07:00
Shannon Romano
55238200f1
Merge pull request #16104 from luiscuenca/fixRandomAnim 
DEV-327: Prevent AnimRandomSwitch from repeating same animation twice in a row.
 2019-08-27 13:00:39 -07:00
luiscuenca
55b54b02a0
Restate evaluation count on AnimContext 2019-08-27 10:59:03 -07:00
luiscuenca
acbeb326a7
Set activation when switching random states 2019-08-27 10:57:22 -07:00
luiscuenca
7f1f6dba31
Implement activation on nodes and use it to trigger random states 2019-08-27 10:25:35 -07:00
Anthony J. Thibault
ed3ba876a8 AddRelative blending support (Absolute is still not working) 2019-08-26 17:02:15 -07:00
Bradley Austin Davis
07ee9e901f
Merge pull request #16099 from jherico/fix/wake_crash 
BUGZ-1264: Support platform independent sleep/wake notifications
 2019-08-26 16:20:50 -07:00
Sabrina Shanman
0f5ef9ecb3
Merge pull request #16097 from AndrewMeadows/less-MyAvatar-mesh-tunelling 
BUGZ-1325: prevent MyAvatar from tunneling through mesh at high speeds
 2019-08-26 16:16:10 -07:00
David Rowe
3e795d9b99 Typos and improvements 2019-08-27 10:03:26 +12:00
David Rowe
c19c1c9a5d Scripts API JSDoc fixes 2019-08-27 09:24:01 +12:00
David Rowe
fff2a15960 ScriptsModel and ScriptsModelFilter classes' JSDoc 2019-08-27 09:24:01 +12:00
David Rowe
e1e74a2c34 ScriptDiscoveryService API JSDoc 2019-08-27 09:24:00 +12:00
Shannon Romano
ccfd3e2fb1
Merge pull request #16101 from roxanneskelly/bugz1276 
BUGZ-1276 - crash in soloNodeOfType
 2019-08-26 14:07:35 -07:00
Roxanne Skelly
82522b04ab missing space 2019-08-26 13:20:56 -07:00
Roxanne Skelly
b4679aa44a BUGZ-1276 - crash in soloNodeOfType 
This is suspected to be a race condition during shutdown
where a static destructor may be called before the ScriptEngine
thread stops running.  On OSX there is the possability of this.
 2019-08-26 13:05:19 -07:00
Shannon Romano
7466c3f2ca
Merge pull request #16095 from SimonWalton-HiFi/change-of-local-interface 
BUGZ-1317: Improved handling of local-interface addresses
 2019-08-26 11:57:57 -07:00
Brad Davis
e1bf3f2540 PR feedback 2019-08-26 11:51:33 -07:00
Brad Davis
dfd78a2662 Support platform independent sleep/wake notifications 2019-08-24 13:16:48 -07:00
Andrew Meadows
8135021b25 watch for tunneling events and interfere before stuck 2019-08-23 17:54:52 -07:00
Clement
a607984d4e Fix debug builds 2019-08-23 17:04:54 -07:00
Simon Walton
d9558e35c3 Fix typo in last commit; remove useless call of getGuessedLocalAddress; logging tweak 2019-08-23 13:19:31 -07:00
Andrew Meadows
b33e5a60c2
Merge pull request #16086 from AndrewMeadows/opaque-polylines 
BUGZ-1170: improved render bounding box for PolyLines; use opaque pipeline when possible
 2019-08-23 11:41:19 -07:00
Shannon Romano
74363a4382
Merge pull request #16065 from luiscuenca/fixDuplicatedJoint 
BUGZ-186: Make sure joint names are unique
 2019-08-23 10:55:58 -07:00
Simon Walton
c262b7a3b8 Merge branch 'master' into change-of-local-interface 2019-08-23 09:36:04 -07:00
Anthony J. Thibault
f1afc9e873 Bug fix & rename isRelative to relativeFlag 2019-08-23 08:46:14 -07:00
luiscuenca
07d17343bf
fix warnigns 2019-08-23 07:21:19 -07:00
Simon Walton
6a9e299981 Prefer non-link-local interface addresses; don't change port on initial address change from TCP probe 2019-08-22 17:34:41 -07:00
Shannon Romano
4d71891763
Merge pull request #16072 from luiscuenca/improveSphereCollapsing 
BUGZ-1156: Improve sphere collapsing mode
 2019-08-22 16:10:53 -07:00
luiscuenca
4b1b61ae5b
Keep new offset rotation method and resolve duplicates at the end 2019-08-22 13:16:32 -07:00
Zach Fox
330b8ceb91 Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-22 10:24:00 -07:00
Andrew Meadows
8957cc5b2b render opaque PolyLines with opaque pipepline 2019-08-22 08:13:11 -07:00
Andrew Meadows
81eaf157a6 tighter bounding box when rendering PolyLines 2019-08-22 08:13:11 -07:00
Anthony Thibault
001e4bc952 AnimClip now supports relative animations. 
Relative animations are animations that are rotation deltas from some base reference pose.
They are calculated by multiplying each frame of each joint the inverse of that joints in the base reference pose.
It is intended for use with additive blending.

Added the following fields to AnimClip node.

* isRelative (boolean)
* baseURL (string)
* baseFrame (int)
 2019-08-21 16:11:10 -07:00
Shannon Romano
3b3bce059b
Merge pull request #16080 from roxanneskelly/bugz1275 
BUGZ-1275 Additional Grapics API info was added to the system info, which overflowed the amount of info that could be sent in a packet.
 2019-08-21 15:34:31 -07:00
David Rowe
2ad1d7a2a2 Fix typos 2019-08-22 10:27:17 +12:00
David Rowe
942347158a Collapse some function signatures' JSDoc 2019-08-22 10:16:56 +12:00
David Rowe
11e72c638b Assets API compression methods JSDoc 2019-08-22 09:47:25 +12:00
Sam Gateau
fff98ed66a Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-08-21 09:27:41 -07:00
Sam Gateau
e1e4d9ac6c Exposing the AA mode of the AA job 2019-08-20 18:15:35 -07:00
David Rowe
5f3081784c Assets API methods that include mappings JSDoc 2019-08-21 12:36:37 +12:00
Andrew Meadows
54c69001b9 clarify safeLanding retry rate 2019-08-20 17:33:29 -07:00
Andrew Meadows
7084908df3 add isStuck logging, add assert because singleton 2019-08-20 17:33:29 -07:00
Andrew Meadows
4f0c2c5ee6 remove incorrect assert 2019-08-20 17:33:29 -07:00
Andrew Meadows
434af8bdfb remove support for sub-contactAddecCallbacks from PhysicsEngine 2019-08-20 17:33:29 -07:00
Andrew Meadows
dba7cadcae remove cruft 2019-08-20 17:33:29 -07:00
Andrew Meadows
42d2d4bbe5 fix warning in VisualStudio 2019-08-20 17:33:29 -07:00
Andrew Meadows
113d132d8e use pairwise collision filtering to help unstuck MyAvatar 2019-08-20 17:33:29 -07:00
Andrew Meadows
7cf0899d59 more correct safeLanding trigger 2019-08-20 17:33:29 -07:00
Andrew Meadows
027a9d34d4 fix warning on windows about signed conversion of unsigned int 2019-08-20 17:33:29 -07:00
Andrew Meadows
32400a6baf improved isStuck detection and MyAvatar::safeLanding() trigger 2019-08-20 17:33:29 -07:00
Andrew Meadows
9382fb8745 more versatile contactAddedCallback support 2019-08-20 17:33:29 -07:00
Roxanne Skelly
8ac185af11 Additional Grapics API info was added to the system info, which 
overflowed the amount of info that could be sent in a packet.
 2019-08-20 16:33:29 -07:00
David Rowe
817bc6cd43 Assets API base functionality JSDoc 2019-08-21 09:50:23 +12:00
Zach Fox
70b3f44f8c Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-20 14:04:35 -07:00
luiscuenca
4ced14c908
Fix warnings 2019-08-20 13:39:04 -07:00
Anthony Thibault
2b74e2a7fa
Merge pull request #16066 from hyperlogic/bug-fix/sit-bug-fixes 
Avatar sitting bug fixes
 2019-08-20 11:09:25 -07:00
Sam Gateau
6cd37ef73c Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-08-20 09:41:08 -07:00
luiscuenca
a9ebe22072
improve algorithm and fix issues 2019-08-20 09:15:36 -07:00
RebeccaStankus
e48e733343 Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-20 09:01:18 -07:00
Sam Gateau
c5bd9ecf4f REfreshing the antialiasing qml na dconfig of the Jitter Job 2019-08-19 18:14:29 -07:00
Shannon Romano
1569c4049f
Merge pull request #16069 from SimonWalton-HiFi/nonverified-avatar-more-robust 
BUGZ-1247: Better handling of other-avatar verify-failed appearance
 2019-08-19 17:32:27 -07:00
Zach Fox
083470e4fe Ensure that geometryChanged is emitted after docked widget is resized 2019-08-19 16:48:40 -07:00
Simon Walton
abad9868ae Log when avatar data becomes avatar-failed 2019-08-19 12:12:10 -07:00
luiscuenca
32a43d5549
Remove unused variable 2019-08-19 12:08:46 -07:00
luiscuenca
08e367ffb8
Improve sphere collapsing 2019-08-19 10:53:22 -07:00
Sam Gateau
aeb407698d bloom ui 2019-08-18 22:15:20 -07:00
Simon Walton
150b4e45d4 More robust handling of the avatar verify-failed property 2019-08-16 17:30:28 -07:00
Anthony J. Thibault
381f7c6bc4 Avatar sitting bug fixes 
* Added seatedToIdle transition, to make transition quicker to better match the capsule physics.
* Made switching into and out of instantly set animVar for the animation graph, previously it was delayed by 100 ms.
* Created "isNotSeated" anim var for exiting the seated state.
* MyAvatar::beginSit & MyAvatar::endSit no longer calls goToPosition, instead MyAvatar::slamPosition is called.
* MyAvatar::slamPosition will cause the AvatarTransit class to NOT play the teleport anticipation/reaction animation.
  Note: This does not prevent other clients from interpolating the position when entering the seat, but it prevents the teleport reaction animation from playing.
* Disable leg IK in HMD mode while seated.
 2019-08-16 10:57:03 -07:00
Simon Walton
85da916a3b
Merge pull request #16061 from SimonWalton-HiFi/entities-scriptengine-takedown 
BUGZ-984: Wait for client entity-scripts to unload when shutting down
 2019-08-16 10:12:38 -07:00
luiscuenca
260ee59585
Make sure joint names are unique 2019-08-15 16:57:17 -07:00
luiscuenca
2ef1c6458a
Fix joint indexing when duplicated joint on skeleton 2019-08-15 14:53:30 -07:00
Anthony Thibault
4d2e7eaaba
Merge pull request #16059 from luiscuenca/fixMultisphereCrash 
BUGZ-1156: Allow collapsing of all multi spheres
 2019-08-15 10:40:29 -07:00
Brad Hefta-Gaub
b0b406adda
Merge pull request #16015 from HifiExperiments/renderUpdate 
BUGZ-902: Drastically reduce locking and branching necessary for render updates
 2019-08-15 09:35:17 -07:00
Shannon Romano
d9f78499ef
Merge pull request #16053 from samcake/toulouse 
BUGZ-1173, BUGZ-1175: On Windows, Fix black edges on whiteboard lines in Forward and more issues in GL41Backend
 2019-08-15 09:34:03 -07:00
Brad Hefta-Gaub
1e5c81c251
Merge pull request #16058 from jherico/fix/bugz-1119 
BUGZ-1119: workaround for race condition crash in QML rendering
 2019-08-15 09:32:31 -07:00
Simon Walton
9aacd136b8 Add blocking to script unload for client entity-scripts 2019-08-14 13:51:40 -07:00
Sam Gateau
eb24667218 Remove useless variable 2019-08-14 11:54:39 -07:00
Sam Gateau
a5e2cacb98 Apply the new tiering rule for macos: if intel gpu go low, else stick to mid 2019-08-14 11:45:27 -07:00
Sam Gateau
859016bf37 Addressing review comments 2019-08-14 10:28:42 -07:00
luiscuenca
02e730a4d9
fix size_t warning 2019-08-14 08:08:32 -07:00
Sam Gateau
5c085bd08d CLean the code of the task::COnfig changes 2019-08-13 18:58:35 -07:00
Sam Gateau
4a93b23d83 Address the procedural to populate all reflection versions with user uniforms bindings and make EnigneInspector works correctly 2019-08-13 18:47:57 -07:00
luiscuenca
1570c59a45
Allow collapsing of all multi spheres 2019-08-13 16:06:44 -07:00
Brad Davis
3e862950a8 BUGZ-1119: workaround for race condition crash in QML rendering 2019-08-13 15:47:59 -07:00
Sam Gateau
224e9590ec avoid using explicit dialects when we want just a default one 2019-08-13 15:45:24 -07:00
Sam Gateau
9a1e1a001a Merge branch 'master' of github.com:highfidelity/hifi into toulouse 2019-08-13 10:00:59 -07:00
Sam Gateau
0b470b9ab8 Fixing the bad location assignment on gl41 on windows with Austin's help 2019-08-13 00:22:17 -07:00
Clement
90aeb636bd Delete reply after the callback is executed 2019-08-12 17:21:22 -07:00
Ryan Huffman
6f76098a2c
Merge pull request #16051 from Atlante45/feat/add-version-to-oven 
DEV-352: Add --version to the Oven
 2019-08-12 15:45:09 -07:00
Brad Davis
a01f115357 Disable use of DSA to load cubemaps 2019-08-12 10:34:37 -07:00
Brad Davis
44e2037e15 Quiet warnings, add convenience function 2019-08-12 10:34:07 -07:00
Sam Gateau
9139edc8b1 Maybe fixed the problem, cannot render the gl41 version properly 2019-08-12 00:44:14 -07:00
Sam Gateau
53642763c9 Merge branch 'master' of https://github.com/highfidelity/hifi into toulouse 2019-08-11 21:57:36 -07:00
Sam Gateau
a96ef7b5f0 Exloring the why.... 2019-08-09 18:34:36 -07:00
Shannon Romano
1011880698
Merge pull request #16049 from sabrina-shanman/ourLODEInvestigation 
(BUGZ-1112) Make 20:20 vision equal seeing 1m cube from 400 meters away
 2019-08-09 17:28:46 -07:00
Clement
97038a7196 Fix tracing warning spam 2019-08-09 17:20:41 -07:00
Anthony Thibault
1b225a777a
Merge pull request #16048 from luiscuenca/rotationOnlyInterpolationFix 
DEV-332: Ramp on and off Head IK to make reactions smoother
 2019-08-09 16:18:12 -07:00
sabrina-shanman
07ea79689e Fix build warnings 2019-08-09 13:34:55 -07:00
Shannon Romano
29cc7e848e
Merge pull request #16044 from SimonWalton-HiFi/count-dropped-packets 
BUGZ-1161: Report count of dropped packets in Socket::checkForReadyReadBackup()
 2019-08-09 13:16:42 -07:00
Sam Gateau
fe08609b0c Merge branch 'master' of github.com:highfidelity/hifi into toulouse 2019-08-09 11:25:03 -07:00
Anthony Thibault
c2fbfd70c4
Merge pull request #16045 from hyperlogic/feature/reaction-intro-loop-outro 
Higher quality standing and seated reactions
 2019-08-09 11:16:49 -07:00
Simon Walton
4de720a456 Enable the event-queue hack on Linux in addition to Windows 2019-08-09 11:12:33 -07:00
luiscuenca
73b3419c75
store rotations when interpolating 2019-08-09 11:02:20 -07:00
luiscuenca
e3ec87a8f8
Add in/out interpolation between RotationOnly and Unknown types 2019-08-09 10:46:48 -07:00
Simon Walton
dbc2a67758 Log event-queue size on readRead timeout 2019-08-09 09:46:09 -07:00
Shannon Romano
1993ff6277
Merge pull request #15922 from SimonWalton-HiFi/min_threadpool_2 
BUGZ-993: Bump minimum threadpool size to 2
 2019-08-09 09:20:55 -07:00
Shannon Romano
5e5c5a27ab
Merge pull request #16041 from Atlante45/fix/oom 
BUGZ-830: Fix memory leak in the ESS
 2019-08-09 09:03:56 -07:00
Sam Gateau
67a13ee7cd Exploring differences in the polyline rendering 2019-08-08 17:10:46 -07:00
sabrina-shanman
1571c2be27 Fix LOD math 2019-08-08 13:03:20 -07:00
Simon Walton
99e1178d9c Move getRequiredThreadCount override from OculusBaseDisplayPlugin to HmdDisplayPlugin 2019-08-08 11:14:02 -07:00
Anthony J. Thibault
f1c47db53c set idleOverlayAlpha animVar for backward compatibility with older graphs 2019-08-08 11:12:42 -07:00
Sam Gateau
c10607a06d Merge branch 'master' of github.com:highfidelity/hifi into toulouse 2019-08-08 10:11:15 -07:00
Simon Walton
77740f1a63 Report no. of packets dropped in checkForReadyReadBackup() 2019-08-08 09:57:00 -07:00
Anthony J. Thibault
5d405cac3b Merge branch 'master' into feature/reaction-intro-loop-outro 2019-08-08 09:56:45 -07:00
Anthony Thibault
ab63aecf29
Merge pull request #16042 from luiscuenca/randomAnimDif 
DEV-327: Prevent AnimRandomSwitch from repeating same animation twice in a row
 2019-08-08 09:38:22 -07:00
Ken Cooke
f445737550
Merge pull request #16040 from kencooke/audio-webrtc-improvements 
Better detection of audio clipping during echo cancellation
 2019-08-08 09:17:58 -07:00
luiscuenca
597cff335a
Reserve vector size 2019-08-08 08:40:00 -07:00
luiscuenca
3a22db0a13
Last state for all node types 2019-08-08 06:25:04 -07:00
sabrina-shanman
9c16fcfdef Make the LOD half angle the definitive LOD variable 2019-08-07 17:23:04 -07:00
luiscuenca
473af995d6
Fix warnings 2019-08-07 16:53:08 -07:00
Sam Gateau
c01ab954e3 Merge branch 'master' of github.com:highfidelity/hifi into toulouse 2019-08-07 16:39:11 -07:00
luiscuenca
74eacf2346
Make sure random switch does not repeat previous state 2019-08-07 15:08:44 -07:00
Clement
b2704da9ef Don't manage _sendData's memory 2019-08-07 15:04:20 -07:00
Shannon Romano
a097d567ca
Merge pull request #16017 from roxanneskelly/bugz1046 
BUGZ-1046 - send entity packets reliably for initial query
 2019-08-07 14:16:19 -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
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
Roxanne Skelly
2e5127fa98 Merge branch 'master' of https://github.com/highfidelity/hifi into bugz1046 2019-08-07 10:40:23 -07:00
sabrina-shanman
3985261c91 Remove locks on getters/setters for PickQuery::_scriptParameters 2019-08-07 10:14:35 -07:00
sabrina-shanman
8cde93973d Disambiguate pick and pointer types in the returned properties 2019-08-07 09:56:23 -07:00
Anthony J. Thibault
b306ed69d6 Bugfix for evaluateBoth interpType. 
It wouldn't pick the correct starting frame of the state being switched to.
Also, interping out of a evaluateBoth interp uses a snapshot.
 2019-08-06 17:40:28 -07:00
sabrina-shanman
0d5260bccc More LOD renaming with focus on angles 2019-08-06 16:35:41 -07:00
sabrina-shanman
bc3acfa3c0 Clean up and re-name to reflect what uses octreeSizeScale and what uses 
visibilityDistance
 2019-08-06 15:46:10 -07:00
Simon Walton
0f6ad43531 Set desktop reserved threads to 1; HMD reserved threads to 2 2019-08-06 15:34:13 -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
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
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
Sam Gateau
eb616452ec An afternounwatchign code 2019-08-05 17:54:46 -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
David Rowe
26a04e56eb Merge branch 'master' into DOC-98 2019-08-06 10:33:12 +12:00
Sam Gateau
3a053c32f4 Merge branch 'master' of github.com:highfidelity/hifi into toulouse 2019-08-05 14:26:18 -07: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
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
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
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
Ken Cooke
ccfe6bda63 Detect clipping prior to echo cancellation (overload of the uncancelled raw input will cause echo leakage!) 2019-08-05 10:34:03 -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
Sam Gateau
d55f143300 Merge branch 'master' of github.com:highfidelity/hifi into toulouse 2019-08-05 09:49:14 -07:00
Anthony J. Thibault
704a2d2ac9 Merge branch 'master' into feature/reaction-fixes 2019-08-05 09:43:32 -07:00
HifiExperiments
1b84244210 merge with master 2019-08-05 09:35:56 -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
amerhifi
cf3fc5b135 Merge branch 'master' of https://github.com/highfidelity/hifi 2019-08-02 14:41:12 -07:00
MiladNazeri
ae7b415152
Merge pull request #16008 from HifiExperiments/text 
Supporting text effects + fonts on Text Entities
 2019-08-02 14:25:28 -07:00
amerhifi
a37ef7d80e adding default script location setting for defaultscriptoverride runs. Prevents the second interface run to have no ui 2019-08-02 13:00:43 -07:00
Andrew Meadows
ebe7581f62 check for Win7 before using SHCore.dll API 2019-08-02 11:39:54 -07:00
amerhifi
0ee9de7ed8 lambda space 2019-08-02 11:24:21 -07:00
amerhifi
d05f1ac87f adding ability to reload defaultOverrdie script without saving to settings: 2019-08-02 11:23:33 -07:00
MiladNazeri
76e9f8896c
Merge pull request #16021 from kencooke/audio-volume-control-persist 
BUGZ-352: Persist the audio volume settings across sessions
 2019-08-02 10:34:44 -07:00
Bradley Austin Davis
543f07b6ae
Merge pull request #16018 from jherico/fix/dev-279 
DEV-279: Add rendering API information to the platform JSON object
 2019-08-02 10:16:06 -07:00
Anthony J. Thibault
c8e4536bba Hooked up variations of seated while talking and stubs for reactions while seated. 2019-08-02 10:11:38 -07:00
Shannon Romano
166d29bd3b
Merge pull request #16019 from sethalves/bugz-1158 
BUGZ-1158: fix uninitialized variables
 2019-08-02 09:38:48 -07:00
Sam
d84bebcc28 Merge branch 'master' of github.com:highfidelity/hifi into toulouse 2019-08-02 09:36:58 -07:00
Anthony J. Thibault
aad6958b68 Don't evaluate overPoses if alpha is 0.0. 2019-08-02 09:36:20 -07:00
Brad Davis
020fd20169 Fixing caplitalizatoin 2019-08-02 09:01:08 -07:00
Ken Cooke
0b97f2bbc0 Track the desired audio-mixer gains when not connected 2019-08-02 07:14:43 -07:00
David Rowe
789f9c7d67 Merge branch 'master' into DOC-124 
# Conflicts:
#	interface/src/scripting/Audio.h
 2019-08-02 20:34:09 +12:00
HifiExperiments
029a494beb try to fix android shader build error 2019-08-01 21:29:01 -07:00
Brad Davis
8878731826 Fixing unused vars 2019-08-01 17:44:42 -07:00
Shannon Romano
2f6d79fb45
Merge pull request #15920 from annabrewer/combine-tone-map-resample 
BUGZ-965: Standardize and shorten deferred/forward and desktop/android pipelines
 2019-08-01 17:39:38 -07:00
Brad Davis
c85b0572e5 fixing function name 2019-08-01 17:17:47 -07:00
Brad Davis
06ad461c32 PR feedback 2019-08-01 16:57:54 -07:00
Seth Alves
f1dee1e7f8 fix uninitialized variables 2019-08-01 14:50:21 -07:00
Brad Davis
bfe42215aa DEV-279: Add rendering API information to the platform JSON object 2019-08-01 14:29:03 -07:00
Anthony J. Thibault
a2e37b7275 talking/reactions while seated, work in progress check in 2019-08-01 13:05:15 -07:00
Ken Cooke
41bcbf6dbd
Merge pull request #15936 from sethalves/webrtc 
acoustic echo cancellation
 2019-08-01 05:55:52 -07:00
HifiExperiments
62bb4e1d46 simplify render update check, threadsafety 2019-07-31 21:02:21 -07:00
Roxanne Skelly
a991b6d619 BUGZ-1046 - send entity packets reliably for initial query 2019-07-31 16:59:21 -07:00
Anthony J. Thibault
727c04791c Added linear to stringToEasingType() 2019-07-31 15:18:59 -07:00
Anthony J. Thibault
ec08139a46 Support for EvaluteBoth interpType and easing 2019-07-31 15:00:38 -07:00
Sam
7948fb266e Merge branch 'master' of github.com:highfidelity/hifi into toulouse 2019-07-31 11:46:09 -07:00
HifiExperiments
7b29f0f718 reduce locking necessary for render updates 2019-07-31 11:21:29 -07:00
Howard Stearns
63a70b02b7
Merge pull request #15990 from SimonWalton-HiFi/scriptaudioinjector-delete-via-signal 
BUGZ-984: Delete script audio-injector wrapper when wrapped object is deleted
 2019-07-30 16:57:26 -07:00
David Rowe
53e8f7c5df DebugDraw JSDoc 2019-07-31 10:46:35 +12:00
Kalila R
8b6cce5889 Moved getTypeAsString function from public to protected 2019-07-30 17:26:49 -04:00
Seth Alves
27b574cf14 disable webrtc for android 2019-07-30 14:09:34 -07:00
Ken Cooke
8c6cee4e4d Bypass WebRTC processing when not enabled. 
Note: WebRTC processing with all features disabled still holds locks and performs resampling in the callback.
 2019-07-30 14:09:33 -07:00
Ken Cooke
e6e8491098 Improved WebRTC error reporting 2019-07-30 14:09:33 -07:00
Ken Cooke
bd0849fd4f Allow AEC with device sample rate up to 96KHz 2019-07-30 14:09:32 -07:00
Ken Cooke
5c86c22076 Move WebRTC far-end FIFO into AudioClient.h 2019-07-30 14:09:32 -07:00
Seth Alves
8ec4505b95 add an on/off control for audio echo cancelation to Audio Settings page. It's not yet hooked to anything. 2019-07-30 14:09:32 -07:00
Seth Alves
c1cadf670e update webrtc library, enable for android 2019-07-30 14:09:31 -07:00
Ken Cooke
569c76c8ba Baseline AEC using WebRTC, always enabled. 
Audio streams are hooked as close as possible to device input/output, re-buffering as needed.
 2019-07-30 14:09:31 -07:00
Ken Cooke
c3b9e4806a Fix longstanding bug in Audio Scope feature that records output to WAV 2019-07-30 14:09:30 -07:00
Ken Cooke
80aeeaa3e0 Refactor the audio output callback, to expose the final output (far-end) needed for AEC 2019-07-30 14:09:30 -07:00
Seth Alves
32d5ab7b1f Make WebRTC library available 2019-07-30 14:09:30 -07:00
Anna
4e4f8866cd fix android/mac build error 2019-07-30 13:15:26 -07:00
Anna
f58400950a made color format for resolve FB a parameter, reverted name of tonemapping task to preserve back compatibility 2019-07-30 11:57:01 -07:00
Anna
0cd532a47b cleaning up 2019-07-30 10:08:38 -07:00
HifiExperiments
078ca7edea supporting text effects + fonts on text entities 2019-07-30 09:59:45 -07:00
Anna
458b3f18df changes from cr 2019-07-29 18:25:36 -07:00
Anna
379a262b07 bug fix in deferred, finish merging android & windows forward 2019-07-29 18:15:54 -07:00
David Rowe
e5c58d5ba5 Fix JSDoc typo noticed in passing 2019-07-30 11:37:20 +12:00
Anna
d3107efb82 added optional output buffer to ToneMapAndResampleTask 2019-07-29 16:27:54 -07:00
David Rowe
ade85ad8c0 Update API JSDoc with glTF 2019-07-30 10:41:07 +12:00
Shannon Romano
f29284198c
Merge pull request #15978 from roxanneskelly/bugz829 
BUGZ-829 DEV-168 - domain backup/content management improvements
 2019-07-29 15:28:49 -07:00
Anna
3a437cf190 fix on android, merge android and windows forward pipelines 2019-07-29 14:59:15 -07:00
Anna
2fca77867b broken on android again somehow 2019-07-29 13:45:08 -07:00
Anna
db49a0b9d6 fixed some typos from merge 2019-07-29 11:55:12 -07:00
Anna
0cc8c1f434 making my changes work on android 2019-07-29 10:43:20 -07:00
Sam
767f413a2c merging the various job/task/switch congif into one 2019-07-29 00:07:16 -07:00
Anna
8aef9db4b9 works on android! 2019-07-26 20:09:18 -07:00