Commit graph

80107 commits

Author SHA1 Message Date
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
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
Amer
93d5b2a35a
Merge pull request #16022 from amerhifi/master
bugz- 982 : adding ability to reload defaultOverride script without saving to set…
2019-08-02 12:58:40 -07:00
Andrew Meadows
ebe7581f62 check for Win7 before using SHCore.dll API 2019-08-02 11:39:54 -07:00
dante ruiz
b9106b9ade making requested changes 2019-08-02 11:26:41 -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
Anthony J. Thibault
31762a0c80 Bug fixes in seated reactions 2019-08-02 10:17:59 -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
Sabrina Shanman
ad298cb132
Merge pull request #16012 from AndrewMeadows/bugz1069
BUGZ-1069: fix crash in oven for lack of MaterialCache instance in DependencyManager
2019-08-02 09:24:08 -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
Ken Cooke
437d0ea928 Save and restore the audio gain settings 2019-08-02 06:46:34 -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
f843c01b35 added missing seated idle pose 2019-08-01 13:09:02 -07:00
Anthony J. Thibault
a2e37b7275 talking/reactions while seated, work in progress check in 2019-08-01 13:05:15 -07:00
Shannon Romano
52d317a1b2
Merge pull request #16004 from roxanneskelly/dev319
Dev319 - Show user who installed content in 'Installed Content' section of domain admin pages
2019-08-01 11:50:59 -07:00
Ken Cooke
41bcbf6dbd
Merge pull request #15936 from sethalves/webrtc
acoustic echo cancellation
2019-08-01 05:55:52 -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
Andrew Meadows
f07352ab2c add MaterialCache to oven's DependencyManager 2019-07-31 13:39:52 -07:00
Sam
7948fb266e Merge branch 'master' of github.com:highfidelity/hifi into toulouse 2019-07-31 11:46:09 -07:00
Sam
6e2ffe14a0 better ui 2019-07-31 11:44:42 -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
Andy Howell
2e8bb5f90a
Merge pull request #15997 from luiscuenca/WLAutoInstallerFix
DEV-243: WL Fix auto-installer bugs
2019-07-30 16:19:10 -07:00
David Rowe
53e8f7c5df DebugDraw JSDoc 2019-07-31 10:46:35 +12:00
luiscuenca
9fbacd49da Delete testing code 2019-07-30 14:19:26 -07:00