Zach Fox
a27644ae4d
Magic numbers
2017-07-11 15:52:12 -07:00
Zach Fox
51c22eb7db
Also re-enable spectator camera after switching domains
2017-07-11 15:38:10 -07:00
Zach Fox
1001097f92
Fix button state
2017-07-11 15:29:00 -07:00
rick@ghostpunch.com
8cf60df5b0
Address #21402 Added a handler to Sit.js script for the onLoadComplete signal to which re-applys the siting animation rol overrides. This works around a bug that shows up if the user switches avatars while the current avatar has overloaded anim roles.
2017-07-11 18:24:19 -04:00
Zach Fox
b0639be8bd
Use function pointers correctly
2017-07-11 15:23:50 -07:00
Zach Fox
c4a4623ba8
Workaround the bug where Avatar Entities can't get deleted after switching domains
2017-07-11 15:18:08 -07:00
Andrew Meadows
1fe7718b9f
restore wasted byte count when unable to fit stats
2017-07-11 15:02:45 -07:00
Liv
62be0af32d
string pass on Chat.js
2017-07-11 14:57:11 -07:00
Andrew Meadows
782155e9ea
Merge pull request #10876 from Atlante45/fix/ac-crash
...
Fix AC crash (buffer overflow)
2017-07-11 14:26:08 -07:00
Seth Alves
ead461dca7
Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers
2017-07-11 14:25:12 -07:00
Seth Alves
3670a04d8e
switch bare pointers to AudioInjector objects to be QSharedPointers
2017-07-11 14:24:58 -07:00
Andrew Meadows
badbe98097
minor cleanup and constency for packet stats
2017-07-11 14:21:49 -07:00
Seth Alves
d05b353942
Merge pull request #10940 from druiz17/qt-mouse-events
...
Fix tablet scrolling for QT 5.9 and QT 5.6
2017-07-11 14:06:53 -07:00
Andrew Meadows
3226d33830
use cached OctreeSendThread::_nodeUuid
2017-07-11 14:02:16 -07:00
Andrew Meadows
15879b2832
+ OctreeSendThread::traverseTreeAndSendContents()
...
this abstracts a portion of OctreeSendThread::packetDistributor()
which will make it easier to split apart the tree traversal
from the sending of packets
also cleaned up some of the packet stats tracking
2017-07-11 13:53:08 -07:00
Andrew Meadows
9d111d1f92
remove unused OctreeSendThread::_nodeMissingCount
2017-07-11 13:42:35 -07:00
Dante Ruiz
2f192fd48a
added scroll fix for qt 5.6
2017-07-11 21:19:06 +01:00
Dante Ruiz
01ca192613
fixed tablet scrolling
2017-07-11 21:16:13 +01:00
David Kelly
8fd02c1d0c
Merge pull request #10938 from davidkelly/dk/hmdPreviewFix
...
fix hmd preview image
2017-07-11 12:27:18 -07:00
David Kelly
e2426c538e
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/noPreviewAfterDismissing
2017-07-11 11:01:58 -07:00
David Kelly
e1df3feb5c
fix hmd preview
2017-07-11 10:54:35 -07:00
Zach Fox
5bec6cc7f5
Merge pull request #10936 from zfox23/spectatorCamera_activeButtonWhenOn
...
Make Spectator Camera icon active when Camera is on
2017-07-11 10:31:29 -07:00
Zach Fox
2e8bd3c9cb
Make Spectator Camera icon active when Camera is on
2017-07-11 10:16:55 -07:00
Andrew Meadows
a5cd11cea7
remove more crufty comments
2017-07-11 10:11:24 -07:00
Andrew Meadows
ca3f0ceecb
remove crufty comments
2017-07-11 10:02:18 -07:00
Andrew Meadows
076ae28bed
one less strand of spaghetti when counting packets
2017-07-11 09:52:39 -07:00
NeetBhagat
e08e9d6821
The current scale of avatar should not be more than domain's max_avatar_scale and not less than domain's min_avatar_scale.
2017-07-11 20:42:00 +05:30
NeetBhagat
1a47383d4f
Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big
2017-07-11 19:23:46 +05:30
Sam Gateau
1f2f539507
Merge branch 'orange' of https://github.com/samcake/hifi into hobbes
2017-07-11 10:26:26 +02:00
Andrew Meadows
b74aad32ed
minor cleanup in OctreeSendThread::packetDistributor()
2017-07-10 18:27:40 -07:00
Anthony J. Thibault
b0177c2522
remove comment, it does indeed work
2017-07-10 16:25:37 -07:00
Anthony J. Thibault
1cdc0071f3
Fixed issue with hips and chest not ramping off properly.
2017-07-10 16:17:25 -07:00
Zach Fox
ea62ef165c
Fix image container background
2017-07-10 16:13:45 -07:00
Zach Fox
5ce409e2e2
Merge pull request #10935 from zfox23/spectatorCamera_tabletButtonFix
...
Ensure tablet button shows up; protections for controller mapping; Ensure instructions show
2017-07-10 15:52:21 -07:00
Zach Fox
5823efce76
Cleanup
2017-07-10 15:51:27 -07:00
Zach Fox
4a74522884
Ensure tablet button shows up; protections for controller mapping
2017-07-10 15:16:16 -07:00
Atlante45
c32f4ab0d3
CR
2017-07-10 14:24:53 -07:00
Seth Alves
4a35ad105b
Merge pull request #10615 from amvmoody/21358
...
WL 21358 Create a Laser Pointer app
2017-07-10 14:21:54 -07:00
Chris Collins
24edbc5c43
Merge pull request #10934 from Atlante45/new-master
...
Stable => Master
2017-07-10 13:46:36 -07:00
Zach Fox
78d12f27ed
Merge pull request #10933 from zfox23/spectatorCamera_forceMonoPreview
...
Force Mono Preview when using Spectator Camera
2017-07-10 13:29:22 -07:00
Atlante45
d28fc5603d
Merge branch 'stable'
2017-07-10 13:28:25 -07:00
David Kelly
339cfed3c4
Merge pull request #10932 from davidkelly/dk/noPreviewAfterDismissing
...
Ensure spectator camera preview is up when reopening tablet
2017-07-10 13:28:01 -07:00
Zach Fox
303a3d1e4c
Force Mono Preview when using Spectator Camera
2017-07-10 13:27:45 -07:00
David Kelly
fcf4bfd59a
spacing issue
2017-07-10 13:25:33 -07:00
David Kelly
b87d69b15d
Insure spectator camera preview is up when reopening tablet
2017-07-10 13:16:08 -07:00
Stephen Birarda
f6d0122550
Merge pull request #10791 from birarda/bug/adding-dead-upstream-agent
...
don't add missing replicated node from kill packet
2017-07-10 12:53:21 -07:00
Chris Collins
a1a0e411ce
Merge pull request #10923 from highfidelity/RC-47
...
Beta Release 47 - Includes up to Developer Release 6825
2017-07-10 12:53:20 -07:00
druiz17
78ba2102f4
Merge pull request #10931 from druiz17/fix-goto-hmd-keyboard
...
Fixed goto hmd keyboard not entering text
2017-07-10 12:50:01 -07:00
Seth Alves
d957b970dd
Merge pull request #10918 from misslivirose/feat-add-skeleton-changed-signal
...
Add signal for avatar skeleton changing
2017-07-10 11:35:24 -07:00
Seth Alves
9b5dfc8d3a
Merge pull request #10929 from druiz17/luanch-crash-fix
...
Fixed crash when launching interface from fresh install
2017-07-10 11:31:59 -07:00
