milad
44e518f5a1
working fix
2019-09-03 18:06:25 -07:00
Sam Gateau
df0eb901a2
REverting the change in the jittering sequence length
2019-09-03 17:01:03 -07:00
dooglifeSF
6b3dfd6d56
sitting emote raised hand 03 wip
2019-09-03 16:53:36 -07:00
Sam Gateau
03c5dfad3d
propagating the Bloom on off correctly and fixing the problem where Luci prevents from seeing the zone and finally, update the luci.js with the newer version
2019-09-03 16:28:32 -07:00
Howard Stearns
9e5f26cf4c
Merge pull request #16130 from Atlante45/fix/avatar-mixer-crash
...
BUGZ-1405: Add context object to timer connection
2019-09-03 14:40:46 -07:00
Clement
86b635d80a
Add context object to timer connection
2019-09-03 13:40:02 -07:00
Sam Gateau
cda2943b9a
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-09-03 12:01:12 -07:00
Shannon Romano
5f4b2a0080
Merge pull request #16109 from sethalves/fix-saccade-override
...
apply fake eye saccades if eye joints aren't overridden
2019-09-03 11:34:02 -07:00
Zach Fox
d88c43614c
Merge pull request #16129 from RebeccaStankus/feetPosition
...
Feet position
2019-09-03 11:04:17 -07:00
amer cerkic
fe3879db4d
Merge branch 'master' of https://github.com/highfidelity/hifi
2019-09-03 10:57:45 -07:00
Jamil Akram
a9d8f105ae
Merge pull request #16112 from dooglifeSF/Anim_memory_reduction
...
Anim memory reduced ~10mb by removing static channels
2019-09-03 10:08:02 -07:00
RebeccaStankus
a34a533c07
Added defaults for some params
2019-09-03 10:06:17 -07:00
Matt Hardcastle
cba258b8c4
Error handling for Launcher's update
...
Before this change the update helper app in the Mac version of HQ
Launcher silently ignored errors. This change adds error handling to aid
troubleshooting.
2019-09-03 09:18:32 -07:00
Shannon Romano
29b9800498
Merge pull request #16123 from MattHardcastle/dont-cache-thunder
...
Don't cache when fetching Thunder's build info
2019-09-02 22:00:34 -07:00
jennaingersoll
037ad36262
Merge pull request #16103 from ctrlaltdavid/DOC-64
...
DOC-64: ScriptDiscoveryService API JSDoc
2019-08-30 22:35:39 -07:00
RebeccaStankus
37304f57ea
Merge branch 'master' of github.com:highfidelity/hifi into feetposition
2019-08-30 14:20:58 -07:00
amerhifi
08ca702c82
remove space
2019-08-30 14:16:11 -07:00
amerhifi
a5923ac9aa
adding unpinnable options to any dlg process and main app so that user cannot accidentaly pin the launcher
2019-08-30 14:15:03 -07:00
RebeccaStankus
5fadfa5275
Updated property in MyAvatar.h
2019-08-30 13:52:02 -07:00
Bradley Austin Davis
8e3b337a6e
Merge pull request #16120 from jherico/fix/bugz-1365
...
BUGZ-1365: prevent server scripts from accessing local files in HTML controls
2019-08-30 13:10:09 -07:00
Bradley Austin Davis
29424ca971
Merge pull request #16113 from jherico/fix/bugz-1363
...
BUGZ-1363: crash when checking for web content restrictions
2019-08-30 13:09:49 -07:00
Zach Fox
a72198632a
Merge pull request #16126 from zfox23/statusIndicatorUseDomainID
...
BUGZ-1386: Update simplifiedStatusIndicator to use domainID as org name instead of location.hostname
2019-08-30 12:44:22 -07:00
Zach Fox
c561bca79c
BUGZ-1386: Update simplifiedStatusIndicator to use domainID as org name instead of location.hostname
2019-08-30 11:37:52 -07:00
RebeccaStankus
a33bc3722d
Add feetPosition to avatar properties
2019-08-30 11:10:27 -07:00
Matt Hardcastle
f91ec8fbf5
Call Interface "High Fidelity" on macOS
2019-08-30 09:18:36 -07:00
Brad Davis
82a49d4641
Fix android build
2019-08-29 20:19:49 -07:00
Matt Hardcastle
b8d2e73cf7
Don't cache when fetching Thunder's build info
...
I was mistaken when I added the EphemeralSession to stop local caching.
Using an EphermeralSession doesn't stop Foundation from caching a
request. Setting a request cache policy controls caching.
2019-08-29 16:49:21 -07:00
luiscuenca
3da2a6038d
Const ajustments
2019-08-29 16:27:54 -07:00
Anthony J. Thibault
c814176d6a
Fix initialization order of members warning
2019-08-29 16:16:19 -07:00
Howard Stearns
c4c29dd093
Merge pull request #16116 from SimonWalton-HiFi/efficient-remaining-token-time
...
BUGZ-1274: Use UTC with QDateTime rather than local time in AccountManager
2019-08-29 15:20:30 -07:00
Howard Stearns
0b83438ee8
Merge pull request #16119 from howard-stearns/do-not-unzip-or-parse-entities-backup-on-message-thread
...
do not unzip or parse entities-backup on message thread
2019-08-29 15:20:19 -07:00
luiscuenca
265b6f57a1
Try to mitigate the effect of background mic noise when simulating talking
2019-08-29 15:19:17 -07:00
Brad Davis
6aa967f29f
fixing test code
2019-08-29 14:11:22 -07:00
Brad Davis
31340d278a
Add test for local file access
2019-08-29 13:45:43 -07:00
Brad Davis
428a58710d
BUGZ-1365: Ensure that by default web views can't access local content
2019-08-29 13:44:49 -07:00
Howard Stearns
5ff0c5800e
do not unzip or parse entities-backup on message thread
2019-08-29 12:56:14 -07:00
Shannon Romano
b7873a6194
Merge pull request #16114 from huffman/feat/win-launcher-thunder-override
...
DEV-457: Add HIFI_THUNDER_URL to win32 launcher
2019-08-29 10:53:35 -07:00
Brad Davis
36be00bf97
Fix android build again
2019-08-29 10:25:57 -07:00
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
3695a5e633
Merge pull request #16105 from amerhifi/bugz-186
...
CASE DEV-186: HQ Launcher/Interface Icons and wording need to be standardized
2019-08-28 15:58:10 -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
Andrew Meadows
a9fe2bf415
Merge pull request #16111 from jherico/fix/android_build_deps
...
Remove android build dependency on jherico/hifi fork
2019-08-28 14:54:40 -07:00
