Commit graph

33341 commits

Author SHA1 Message Date
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
Anna
6a6b2f6d27 added tone mapping back 2019-07-26 18:55:08 -07:00
David Rowe
9e5cf5fe75 Config.h is now exposed as the Workload API 2019-07-27 11:50:07 +12:00
Anthony J. Thibault
2f949a4d4d Disable head ik while reacting
Also, split getReactions() API into two calls

* getTriggerReactions() - lists all reactions that can be triggered with MyAvatar.triggerReaction().
* getBeginReactions() - lists all reactions that can be used with MyAvatar.beginReaction() and MyAvatar.endReaction().
2019-07-26 15:26:43 -07:00
Sam Gateau
7486e906eb
Merge pull request #15983 from samcake/toulouse
BUGZ-1080: Changing the default Intel GPU platform profile from mid to low
2019-07-27 00:13:45 +02:00
Roxanne Skelly
03b146cfb2 fix issue with .json.gz files failing to upload properly 2019-07-26 13:55:59 -07:00
Anthony Thibault
5375e53ecb
Merge pull request #15974 from luiscuenca/avatarSitAPI
DEV-269: First Class Sitting API
2019-07-26 13:36:00 -07:00
Anna
0d2b2a2aef added tone mapping config 2019-07-26 12:53:18 -07:00
Anna
16595d9412 created tonemapandresample 2019-07-26 11:56:25 -07:00
Simon Walton
2ebc6e66fe Merge remote-tracking branch 'upstream/master' into scriptaudioinjector-delete-via-signal
Need 985 PR.
2019-07-26 09:53:23 -07:00
humbletim
058c81aa1a Merge branch 'hifi-master' into kpi-v1-modkit-rc 2019-07-26 01:36:52 -04:00
humbletim
6ae75ecafe segregated scripting/ plugins (re: permissions checkbox) 2019-07-26 01:31:42 -04:00
Simon Walton
a9d3413626 Delete script audio-injector wrapper when wrapped object goes 2019-07-25 17:51:01 -07:00
David Rowe
0555cf1804 Revisions and typos 2019-07-26 10:50:53 +12:00
David Rowe
bce3e9bd6b PlatformInfo API JSDoc update 2019-07-26 10:32:19 +12:00
Ryan Huffman
de233e456e
Merge pull request #15976 from huffman/feat/serverless-tutorial
DEV-266: Add serverless tutorial
2019-07-25 13:39:03 -07:00
Howard Stearns
520ba59899
Merge pull request #15980 from SimonWalton-HiFi/audio-injector-shutdown
BUGZ-985: Guard against AudioInjectorManager takedown in scripted audio injector destructor
2019-07-25 12:50:07 -07:00
Samuel Gateau
da491bc577 Changing the default Intel GPU platform profile from mid to low 2019-07-25 15:02:44 +02:00
Ryan Huffman
2ec87f4e61 Add serverless tutorial 2019-07-24 16:38:03 -07:00
Simon Walton
53cf915e8d Guard for AudioInjectorManager existance; clear an audio interface pointer 2019-07-24 14:51:41 -07:00
Anna
1b0d8ee603 removed typo 2019-07-24 13:37:33 -07:00
luiscuenca
6e4d1bde8e
Fix code and warnings 2019-07-24 13:16:53 -07:00
Anna
27586727db make tonemapandresampletask run on android 2019-07-24 11:38:47 -07:00
Shannon Romano
a8842bf521
Merge pull request #15968 from annabrewer/android-crash-fix
BUGZ-996: Android app crashes on startup
2019-07-24 09:33:50 -07:00
Shannon Romano
1883e1d482
Merge pull request #15969 from Atlante45/fix/ess-crash
BUGZ-1015: Don't store unused cpuident data arrays
2019-07-24 09:05:47 -07:00
Shannon Romano
2942bfaad0
Merge pull request #15939 from SamGondelman/shader
Condense directional light shaders using slp defines
2019-07-24 09:01:49 -07:00
Anna
ca24693f39 applying android crash fix for testing purposes 2019-07-23 16:03:20 -07:00
Anna
2051a9953c change bounds checking to check if index is strictly less than 0 2019-07-23 16:00:11 -07:00
Anna
1df43fc83a Merge branch 'master' of github.com:highfidelity/hifi into combine-tone-map-resample 2019-07-23 15:41:01 -07:00
Shannon Romano
849a25f576
Merge pull request #15966 from jherico/fix/bugz-987
BUGZ-987: fix depth testing of HUD layer 3D objects
2019-07-23 15:00:54 -07:00
Anna
a6c569dd78 fixed index out of bounds checking when getting cpu, gpu or display in PlatformInstance.cpp 2019-07-23 14:45:12 -07:00
Clement
7f9ad4ac25 Don't store unused cpuident data arrays 2019-07-23 14:23:12 -07:00
luiscuenca
e7e864121f
Merge branch 'master' into avatarSitAPI 2019-07-23 14:22:42 -07:00
luiscuenca
9cec979552
Add sit API to MyAvatar 2019-07-23 14:20:54 -07:00
Shannon Romano
266230a53c
Merge pull request #15963 from hyperlogic/feature/avatar-reaction-api
Initial version of Avatar Reaction API
2019-07-23 13:13:31 -07:00
Brad Davis
449f3d00f9 BUGZ-987: fix depth testing of HUD layer 3D objects 2019-07-23 12:09:12 -07:00
humbletim
c5b2514e0e fix linux build warning; remove unnecessary code 2019-07-23 12:13:49 -04:00
David Rowe
8c92f972e5 Merge branch 'master' into DOC-124
# Conflicts:
#	interface/src/scripting/Audio.h
2019-07-23 12:53:35 +12:00
David Rowe
8a6a4041d9 Tidy key light property's shadow values JSDoc 2019-07-23 11:28:57 +12:00
Shannon Romano
4f922e350e
Merge pull request #15913 from ctrlaltdavid/DOC-102
DOC-102: Overlays JSDoc Update
2019-07-22 16:24:53 -07:00
David Rowe
39ae575ef3 Tidy entities' "unlit" properties 2019-07-23 11:02:43 +12:00
Shannon Romano
1594e25c4e
Merge pull request #15950 from ctrlaltdavid/DOC-121
DOC-121: AvatarBookmarks JSDoc
2019-07-22 15:43:57 -07:00
Shannon Romano
8e708b29de
Merge pull request #15934 from ctrlaltdavid/DOC-62
DOC-62: Reticle JSDoc
2019-07-22 15:32:48 -07:00
David Rowe
0a32386f45 Merge branch 'master' into DOC-102 2019-07-20 09:13:52 +12:00
David Rowe
cf9e563458 Miscellaneous JSDoc fixes noticed in passing 2019-07-19 08:37:10 +12:00
Shannon Romano
ae729dcc87
Merge pull request #15940 from jherico/fix/bugz-753
BUGZ-753: bad skyboxes on Intel GPUs
2019-07-17 14:38:04 -07:00
Anthony Thibault
ecae92724e Added reaction api 2019-07-17 14:28:39 -07:00
Roxanne Skelly
4f9d62696c DEV-262 - Improve logging on failure to load resource 2019-07-17 12:58:17 -07:00
Anna
45d1672edd remove testing variables 2019-07-16 15:44:29 -07:00