Commit graph

80673 commits

Author SHA1 Message Date
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
dooglifeSF
c6f72e0e77 Merge branch 'master' into Anim_memory_reduction 2019-08-27 09:52:16 -07:00
Anthony J. Thibault
e98cdab294 Moved CrashHelper.h include to the appropriate place. 2019-08-26 17:05:08 -07:00
Anthony J. Thibault
ed3ba876a8 AddRelative blending support (Absolute is still not working) 2019-08-26 17:02:15 -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
David Rowe
3e795d9b99 Typos and improvements 2019-08-27 10:03:26 +12: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
David Rowe
c19c1c9a5d Scripts API JSDoc fixes 2019-08-27 09:24:01 +12:00
David Rowe
233a1528df Add support for examples in API description section 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
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
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
sabrina-shanman
bc2cc11c06 Fix build warnings 2019-08-26 12:35:18 -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
a613be9536 Allow a user to limit the number of cores used when building 2019-08-26 11:51:42 -07:00
Brad Davis
e1bf3f2540 PR feedback 2019-08-26 11:51:33 -07:00
Shannon Romano
53a06ee74f
Merge pull request #16100 from mattr1x/add-thunder-env-launcher
Add HIFI_THUNDER_URL environment variable
2019-08-26 11:41:03 -07:00
sabrina-shanman
e4369feec5 Factor out directory parsing from md file output 2019-08-26 11:33:03 -07:00
Shannon Romano
3a24f58149
Merge pull request #16096 from Atlante45/fix/debug-builds
Fix debug builds
2019-08-26 11:31:28 -07:00
sabrina-shanman
1ae66c6c10 Show expected images side-by-side rather than creating one MD file per
image set
2019-08-26 10:57:57 -07:00
sabrina-shanman
5e3777999d Revert unfinished alternative implementation 2019-08-26 10:57:49 -07:00
sabrina-shanman
acd07e904f Output profile-specific md files corresponding to profile images 2019-08-26 10:57:24 -07:00
Zach Fox
83ef260941
Merge pull request #16093 from zfox23/emoteTweaks
BUGZ-1346: Tons of changes to Emote/Emoji system
2019-08-26 10:15:03 -07:00
Matt Hardcastle
ce25ee5377 Add HIFI_THUNDER_URL environment variable 2019-08-26 09:10:19 -07:00
Zach Fox
497edf6068 Add a comment 2019-08-26 09:03:10 -07:00
Brad Davis
dfd78a2662 Support platform independent sleep/wake notifications 2019-08-24 13:16:48 -07:00
Anthony J. Thibault
d410cb4fda Added "shutdown" crash annotation and crash menu option 2019-08-24 11:12:28 -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