Commit graph

80355 commits

Author SHA1 Message Date
Ryan Huffman
83bc5e3fd6 Add build tags to Windows launcher 2019-08-23 08:44:37 -07:00
Shannon Romano
4d71891763
Merge pull request #16072 from luiscuenca/improveSphereCollapsing
BUGZ-1156: Improve sphere collapsing mode
2019-08-22 16:10:53 -07:00
Andy Howell
f5767168ed
Merge pull request #16035 from MiladNazeri/emojiAppAdd
Using my superpowers to get this in the build.
2019-08-22 16:10:22 -07:00
Howard Stearns
26256c383a
Merge pull request #16081 from SimonWalton-HiFi/avatar-thrashing
DEV-336: Fixes for avatar-verify failures with rapid avatar selection
2019-08-22 15:58:24 -07:00
Zach Fox
fb95d1b2d9
Merge pull request #16088 from zfox23/clipPTT
BUGZ-1327: Fix PTT icon when PTTing and clipping
2019-08-22 14:02:08 -07:00
Zach Fox
44ac3f3a7a Don't use entity creation library (reduce risk); use remote URL for broadcast image entity URLs 2019-08-22 13:58:35 -07:00
Zach Fox
7c4a0545c4 BUGZ-1327: Fix PTT icon when PTTing and clipping 2019-08-22 12:51:34 -07:00
Zach Fox
a086d6fe6d Fix triggered reactions not showing their icon in the emote indicator 2019-08-22 11:54:28 -07:00
Zach Fox
177590614e Fix emote bar always visible on MacOS; small logic cleanup 2019-08-22 11:44:09 -07:00
Shannon Romano
e328fc3766
Merge pull request #16087 from mattr1x/add-mac-user-agent-launcher
Add platform to Mac Launcher's user-agent string
2019-08-22 11:30:44 -07:00
Shannon Romano
36132677cd
Merge pull request #16083 from huffman/feat/win-launcher-useragent-version
DEV-418: Add version to UserAgent on Win launcher
2019-08-22 11:30:22 -07:00
Zach Fox
63d27fb002 Much smaller emoji wrt filesize; Fix emoji toolbar not sticking to window on MacOS 2019-08-22 11:00:15 -07:00
Zach Fox
330b8ceb91 Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-22 10:24:00 -07:00
Matt Hardcastle
fa8db8c6ee Add platform to Mac Launcher's user-agent string 2019-08-22 09:10:38 -07:00
Ryan Huffman
a73f69c62a Add platform to UserAgent on win launcher 2019-08-22 09:09:07 -07:00
Ryan Huffman
cc5565d30f Add version to UserAgent on Win launcher 2019-08-21 16:13:31 -07:00
Shannon Romano
33070b4579
Merge pull request #16082 from mattr1x/add-mac-user-agent-launcher
DEV-417: Add User-Agent string to macOS Launcher
2019-08-21 15:38:46 -07:00
Shannon Romano
3b3bce059b
Merge pull request #16080 from roxanneskelly/bugz1275
BUGZ-1275 Additional Grapics API info was added to the system info, which overflowed the amount of info that could be sent in a packet.
2019-08-21 15:34:31 -07:00
Simon Walton
3d2e5dc816 Change method name for consistency 2019-08-21 14:19:57 -07:00
Simon Walton
cf21bc438e Remove unused function and debugging variable 2019-08-21 14:00:13 -07:00
Matt Hardcastle
c987106d96 Add User-Agent string to macOS Launcher
Before this change, the mac HQ launcher didn't set a User-Agent string.
This change adds a User-Agent header – HQLauncher/$version – to each
HTTP request the mac launcher makes.

The approach I took was to add the User-Agent header to each HTTP
request. There is room for improvement. Most of the session
initialization could be rolled up into a helper class that sets the
User-Agent headers and other configuration parameters. Making that
change would be too much overhead for this quick task.

Jira: https://highfidelity.atlassian.net/browse/DEV-417
2019-08-21 13:29:56 -07:00
Simon Walton
9d0cd83ca4 Better handling of challenge timer 2019-08-21 11:59:04 -07:00
Zach Fox
3766ca8660 Add help/attributions popup to emoji popup window 2019-08-21 11:05:55 -07:00
Shannon Romano
3fa64acca2
Merge pull request #16016 from AndrewMeadows/safelandings-revenge
BUGZ-1139: try to prevent MyAvatar from getting stuck in the floor
2019-08-21 10:28:31 -07:00
Simon Walton
61668d3480 Handle concurrent verify operations better; other improvements 2019-08-20 18:03:46 -07:00
Andrew Meadows
54c69001b9 clarify safeLanding retry rate 2019-08-20 17:33:29 -07:00
Andrew Meadows
7084908df3 add isStuck logging, add assert because singleton 2019-08-20 17:33:29 -07:00
Andrew Meadows
4f0c2c5ee6 remove incorrect assert 2019-08-20 17:33:29 -07:00
Andrew Meadows
434af8bdfb remove support for sub-contactAddecCallbacks from PhysicsEngine 2019-08-20 17:33:29 -07:00
Andrew Meadows
dba7cadcae remove cruft 2019-08-20 17:33:29 -07:00
Andrew Meadows
42d2d4bbe5 fix warning in VisualStudio 2019-08-20 17:33:29 -07:00
Andrew Meadows
113d132d8e use pairwise collision filtering to help unstuck MyAvatar 2019-08-20 17:33:29 -07:00
Andrew Meadows
7cf0899d59 more correct safeLanding trigger 2019-08-20 17:33:29 -07:00
Andrew Meadows
027a9d34d4 fix warning on windows about signed conversion of unsigned int 2019-08-20 17:33:29 -07:00
Andrew Meadows
32400a6baf improved isStuck detection and MyAvatar::safeLanding() trigger 2019-08-20 17:33:29 -07:00
Andrew Meadows
9382fb8745 more versatile contactAddedCallback support 2019-08-20 17:33:29 -07:00
Andrew Meadows
c8c704eb57 revert last change 2019-08-20 17:33:29 -07:00
Andrew Meadows
6d7565a568 CharacterController don't fight MyaAvatar::safeLanding() 2019-08-20 17:33:29 -07:00
Roxanne Skelly
8ac185af11 Additional Grapics API info was added to the system info, which
overflowed the amount of info that could be sent in a packet.
2019-08-20 16:33:29 -07:00
Ryan Huffman
de476d0569
Merge pull request #16075 from huffman/fix/mouse-look-stuck-on-macos
BUGZ-374: Fix Mac getting stuck in mouse look
2019-08-20 16:25:02 -07:00
Zach Fox
bc18ca21a3
Merge pull request #16079 from zfox23/fixGoToGrey
Remove unused TabletAddressDialog internal property, fixing BUGZ-1294
2019-08-20 15:35:43 -07:00
Zach Fox
5869ed3f20 Remove Emote App bar when in HMD mode and re-enable conditionally; don't allow keyboard shortcuts to work in HMD 2019-08-20 15:21:12 -07:00
Zach Fox
7f45a7b45c Show a not found message when the user searches for nonexistent emoji 2019-08-20 15:11:17 -07:00
Zach Fox
1cb4a31e09 Reticle update rate limiter; end reactions on shutdown 2019-08-20 15:02:36 -07:00
Zach Fox
cc9c9ec443 Fixup signal handling causing app errors; add keyboard navigation to emoji window 2019-08-20 14:52:19 -07:00
Zach Fox
8b79dc3020 Fix clapping silence issue 2019-08-20 14:22:13 -07:00
Zach Fox
58d83b6455 Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd 2019-08-20 14:17:30 -07:00
RebeccaStankus
0be3f133de Removed some Milad notes 2019-08-20 14:17:00 -07:00
Zach Fox
70b3f44f8c Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-20 14:04:35 -07:00
RebeccaStankus
a78284871e more CR feedback changes 2019-08-20 13:59:41 -07:00