Shannon Romano
c73dab1051
Merge pull request #16068 from ctrlaltdavid/DOC-95
...
DOC-95: Fix callback functions' display in JSDoc
2019-08-19 15:43:48 -07:00
RebeccaStankus
022d1aee8e
Added check to remove persisting reticle entities on script startup
2019-08-19 15:36:21 -07:00
Zach Fox
b40d5658e3
Moved a timer from JS to QML; progress circle on Emote Indicator
2019-08-19 15:12:48 -07:00
Zach Fox
fd287654f4
Fixup keyboard shortcuts; Modify tooltips
2019-08-19 14:19:25 -07:00
Ryan Huffman
afc9863e17
Merge pull request #16070 from huffman/fix/mac-launcher-read-stdout
...
BUGZ-1293: Fix mac launcher not correctly reading interface version
2019-08-19 14:12:09 -07:00
Jamil Akram
a3919af747
Merge pull request #16062 from dooglifeSF/animation_json_tuning
...
Tuning pass on anim-graph, using the new blend modes and engine features
2019-08-19 14:02:37 -07:00
Zach Fox
14a04dfb1a
Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd
2019-08-19 13:52:35 -07:00
RebeccaStankus
e690d4f7ef
Limited distance to rez a point reticle
2019-08-19 13:40:50 -07:00
RebeccaStankus
4787785660
first version of pointing reticle
2019-08-19 13:19:01 -07:00
Zach Fox
072261f551
Merge pull request #16074 from zfox23/helpQuickFixes
...
BUGZ-1295: Fix typo in Help > Controls > Turn Right
2019-08-19 13:15:10 -07:00
Zach Fox
36dffb7dc8
Merge pull request #16073 from zfox23/micIconFix
...
Fix some engine bugs that fix muted state in all UIs including simplifiedUI
2019-08-19 13:09:43 -07:00
Zach Fox
35a2cb7f27
BUGZ-1295: Fix typo in Help > Controls > Turn Right
2019-08-19 13:08:42 -07:00
Simon Walton
abad9868ae
Log when avatar data becomes avatar-failed
2019-08-19 12:12:10 -07:00
luiscuenca
32a43d5549
Remove unused variable
2019-08-19 12:08:46 -07:00
Zach Fox
05abff1c0b
Merge pull request #16071 from zfox23/helpApp1
...
Help App: Phase 1
2019-08-19 11:16:44 -07:00
Zach Fox
ca2cdfc533
Fix some engine bugs that fix muted state in all UIs including simplifiedUI
2019-08-19 11:13:11 -07:00
Zach Fox
42705c2fea
Combine conditional statements
2019-08-19 11:04:54 -07:00
luiscuenca
08e367ffb8
Improve sphere collapsing
2019-08-19 10:53:22 -07:00
Zach Fox
2b86947d4a
Mipmap images; better padding
2019-08-19 10:32:08 -07:00
Ryan Huffman
b8887aa01e
Fix mac launcher not correctly reading interface version
...
The logic to convert the interface output assumed that the output would
be null terminated, but it was not.
2019-08-19 10:02:38 -07:00
Ryan Huffman
73c120b154
Add mac launcher logging around latest build
2019-08-19 10:00:29 -07:00
Ryan Huffman
5916fb42ac
Fix mac launcher not correctly reading interface version
...
The logic to convert the interface output assumed that the output would
be null terminated, but it was not.
2019-08-19 09:59:16 -07:00
Ryan Huffman
5ae6a323ac
Cleanup macos launcher download spam
2019-08-19 09:58:22 -07:00
RebeccaStankus
44d0e0ba1a
Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd
2019-08-19 09:16:19 -07:00
David Rowe
11f8387a5a
Fix typo noticed in passing
2019-08-17 16:56:35 +12:00
David Rowe
dbb964d415
Report type of callback as "function" in JSDoc
2019-08-17 16:56:01 +12:00
Simon Walton
2fafb6822d
Remove identity-resend hack - shouldn't be required now
2019-08-16 18:03:20 -07:00
Simon Walton
150b4e45d4
More robust handling of the avatar verify-failed property
2019-08-16 17:30:28 -07:00
Ryan Huffman
8642f2aaf8
Fix mac launcher not handling networking failures when requesting builds
2019-08-16 17:07:35 -07:00
Ryan Huffman
322ba3ad55
Add env variable to adjust builds URL in mac launcher
2019-08-16 17:07:35 -07:00
Ryan Huffman
1e65908e43
Add build tags to Mac launcher
2019-08-16 17:07:35 -07:00
RebeccaStankus
0699433df8
Emoji app updates emoteIndicator
2019-08-16 16:34:08 -07:00
Zach Fox
3de9f44bf3
It's working
2019-08-16 16:00:30 -07:00
Zach Fox
4c006c50aa
Controls almost done
2019-08-16 15:53:30 -07:00
Zach Fox
3b138fe031
Merge pull request #16067 from zfox23/fixMutedBanner
...
Fix BUGZ-1263 and probably BUGZ-1273: Fix input device muted banner
2019-08-16 14:57:42 -07:00
Zach Fox
30d552919a
Merge branch 'master' of github.com:highfidelity/hifi into helpApp1
2019-08-16 14:06:58 -07:00
Zach Fox
a274e5c2b1
Fix BUGZ-1263 and probably BUGZ-1273: Fix input device muted banner
2019-08-16 12:31:50 -07:00
Zach Fox
301dca6937
Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd
2019-08-16 12:14:52 -07:00
Zach Fox
c13697803d
Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd
2019-08-16 12:14:44 -07:00
RebeccaStankus
18a9f3fbfb
Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd
2019-08-16 12:09:17 -07:00
Zach Fox
4ac0c5902d
52px emojis and custom emoji
2019-08-16 12:08:30 -07:00
RebeccaStankus
2357934d49
Working tooltips
2019-08-16 12:08:26 -07:00
Howard Stearns
65ee21bb01
Merge pull request #16063 from Atlante45/fix/requesjs
...
BUGZ-1242: Fix linux specific script engine crash
2019-08-16 11:52:14 -07:00
Anthony J. Thibault
381f7c6bc4
Avatar sitting bug fixes
...
* Added seatedToIdle transition, to make transition quicker to better match the capsule physics.
* Made switching into and out of instantly set animVar for the animation graph, previously it was delayed by 100 ms.
* Created "isNotSeated" anim var for exiting the seated state.
* MyAvatar::beginSit & MyAvatar::endSit no longer calls goToPosition, instead MyAvatar::slamPosition is called.
* MyAvatar::slamPosition will cause the AvatarTransit class to NOT play the teleport anticipation/reaction animation.
Note: This does not prevent other clients from interpolating the position when entering the seat, but it prevents the teleport reaction animation from playing.
* Disable leg IK in HMD mode while seated.
2019-08-16 10:57:03 -07:00
Simon Walton
85da916a3b
Merge pull request #16061 from SimonWalton-HiFi/entities-scriptengine-takedown
...
BUGZ-984: Wait for client entity-scripts to unload when shutting down
2019-08-16 10:12:38 -07:00
Zach Fox
b06b0b51df
Mipmap the emoteIndicator Image
2019-08-16 10:07:22 -07:00
Zach Fox
92c5ca2d75
Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd
2019-08-16 09:58:44 -07:00
RebeccaStankus
73941f1ece
Fixed bug with emote indicator icon not restoring
2019-08-16 09:46:46 -07:00
RebeccaStankus
c64da85344
Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd
2019-08-16 09:11:03 -07:00
David Rowe
ed6407d2bd
Fix callback functions' display in JSDoc
2019-08-16 21:07:34 +12:00
