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
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
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
David Kelly
91ffb003fd
Merge pull request #10908 from davidkelly/dk/hmdPreview
...
hmd preview
2017-07-10 11:14:28 -07:00
Zach Fox
fcf11915c5
Merge pull request #10930 from zfox23/spectatorCamera_noDesktopApp
...
Don't show SPECTATOR app in Desktop mode
2017-07-10 11:14:16 -07:00
Stephen Birarda
98ccfa80a2
don't add node missing from a replicated kill packet
2017-07-10 11:14:13 -07:00
Dante Ruiz
89a072cfee
fixed hmd keyboard for goto
2017-07-10 19:05:07 +01:00
Brad Hefta-Gaub
121cf76ee3
Merge pull request #10914 from sethalves/dont-think-during-mouse-move
...
Dont think during mouse move
2017-07-10 10:36:03 -07:00
Zach Fox
f170449b88
Don't show SPECTATOR app in Desktop mode
2017-07-10 10:25:37 -07:00
David Kelly
1c9c36a8c8
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreview
2017-07-10 10:22:31 -07:00
Andrew Meadows
ab6f615f96
Merge pull request #10910 from Atlante45/fix/audio-mixer-crash
...
Fix Audio Mixer crash
2017-07-10 09:55:44 -07:00
David Kelly
4843b91f47
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-10 09:50:17 -07:00
Dante Ruiz
cc86cda737
Merge branch 'master' of github.com:highfidelity/hifi into luanch-crash-fix
2017-07-10 17:49:20 +01:00
Dante Ruiz
75e1b265d5
comment out code that causes a crash on launch from fresh install
2017-07-10 17:48:53 +01:00
Andrew Meadows
96b88dccd7
Merge pull request #10913 from samcake/orange
...
Introducing the Stages to the render::Scene, Better scene update phase and getting away from the singleton model
2017-07-10 09:46:09 -07:00
LaShonda Hopper
3ee9d8b766
[Worklist #21420 ] Ran lint on edit script (details below).
...
Prior to and after addressing Worklist Item #21420 , it was observed that the
tool bar buttons popping in and out during load. Taking a while to become visible.
Ran JSHint on the edit.js script to see if something stood out.
Testing with the various lint fixes the odd loading behavior wasn't observed locally any longer.
Pushing this up for testing. This may be what @CainFoool was seeing regarding the create button
not appearing when testing a different PR as at times it took quite some time for the buttons
to load properly.
JSHint Issues Addressed:
* Resolved instance of \"Use the function form of \"use strict\"\"
** Moved use strict declaration to the file function level.
** This fixed various unknown or not defined errors.
* Resolved instances of \"\'const\' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).\"
** Switched const to var to avoid using keywords respected by only a subset of browsers.
* Resolved various multiply defined vars.
** Notable callouts being position var and properties var.
** This should fix issues where the same var was being used though the intent of use may have varied.
* Resolved instances of missing semi-colons
PreFix: 51 JSHint issues detected
PostFix: 0 JSHint issues detected.
Changes to be committed:
modified: scripts/system/edit.js
2017-07-10 12:23:28 -04:00
Sam Gateau
746812ff78
Merging with origin orange
2017-07-10 17:25:13 +02:00
Sam Gateau
0c3755483b
adding assert or checks whenever getting a scene stage
2017-07-10 12:37:26 +02:00
Sam Gateau
4edea433ce
Rename the _pipeline into _shapePipeline in the render::Args
2017-07-10 12:16:53 +02:00
Brad Davis
ee1f6dfa42
More tweaks for improved script performance
2017-07-09 21:36:46 -07:00
