Commit graph

80473 commits

Author SHA1 Message Date
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
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
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
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
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
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
sabrina-shanman
67a06b3a74 Attempt to fix crash from script running too late 2019-08-28 14:28:12 -07:00
Andrew Meadows
b7ae55ca3e smaller CCD proxy for MyAvatar 2019-08-28 11:33:51 -07:00
Ryan Huffman
5fe7be403b Add HIFI_THUNDER_URL to win32 launcher 2019-08-28 11:16:03 -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
Anthony Thibault
1a1e8297e6
Merge pull request #16077 from dooglifeSF/tweak_sit_pose
Sit pose reworked and new sit emote variants added.
2019-08-28 09:06:31 -07:00
Brad Davis
65bc599f16 Remove android build dependency on jherico/hifi fork 2019-08-28 09:00:31 -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
Zach Fox
796bfb5d67
Merge pull request #16107 from zfox23/emoteTrayLock
BUGZ-1342: Add lock icon to Emote tray when it's locked open; Make tray close when unlocking it
2019-08-27 14:44:21 -07:00
amerhifi
58e814e2f6 addressing Huffmans comment 2019-08-27 23:31:41 +02: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
Zach Fox
4098dd9999 BUGZ-1342: Add lock icon to Emote tray when it's locked open; Make tray close when unlocking it 2019-08-27 12:59:57 -07:00
amerhifi
7a1828e0cb removed interface name from shortcut 2019-08-27 21:41:45 +02:00
amerhifi
42357904cd fixed icon name spacing 2019-08-27 20:13:15 +02:00
amerhifi
335dea43df changing app name to high fidelity and changing icons to the new logo 2019-08-27 20:08:21 +02: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
Shannon Romano
3134332513
Merge pull request #16098 from hyperlogic/feature/backtrace-shutdown-flag
Added "shutdown" crash annotation and crash menu option
2019-08-27 10:57:07 -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
e98cdab294 Moved CrashHelper.h include to the appropriate place. 2019-08-26 17:05:08 -07:00
Andrew Meadows
43cd543226
Merge pull request #16084 from sabrina-shanman/test-profile
(DEV-359) Per-profile test reference images (C++ component)
2019-08-26 16:36:01 -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
Zach Fox
5edf251714
Merge pull request #16102 from RebeccaStankus/emoteTimeout
Restore emote indicator after reaction emote
2019-08-26 15:41:43 -07:00
Shannon Romano
7d7db56782
Merge pull request #16094 from huffman/fix/win-launcher-button-labels
DEV-396: Fix login and next button labels in launchers
2019-08-26 15:40:33 -07:00
RebeccaStankus
abd4f24770 Added unload check that timeout is not running 2019-08-26 15:15:25 -07:00
RebeccaStankus
96dbd4620d pull clear timeout into a separate function 2019-08-26 15:08:18 -07:00
RebeccaStankus
f66b696721 Clear timeout on selecting a different emote 2019-08-26 14:39:38 -07:00
sabrina-shanman
e0b4734917 Add missing bullet point when test.md step has image with unknown test filter 2019-08-26 14:37:37 -07:00
sabrina-shanman
ad1a98b85a Trim else after return 2019-08-26 14:30:47 -07:00
sabrina-shanman
388a70502e Fix indexing typo in joinVector 2019-08-26 14:28:04 -07:00
RebeccaStankus
c3dfc4e8d8 Restore emote indicator after reaction emote 2019-08-26 14:23:27 -07:00
Shannon Romano
ccfd3e2fb1
Merge pull request #16101 from roxanneskelly/bugz1276
BUGZ-1276 - crash in soloNodeOfType
2019-08-26 14:07:35 -07:00