Clement
c7442e3a62
Remove QT_CMAKE_PREFIX_PATH prod hack
2019-07-02 16:00:55 -07:00
Shannon Romano
a3ec365f6c
Merge pull request #15862 from annabrewer/display-simplification
...
BUGZ-838, BUGZ-850, BUGZ-853: Muted sign displays backwards in second person view, Fix lossy/duplicate color format conversions, Adjust wearables screen is flipped
2019-07-02 11:31:53 -07:00
Zach Fox
a3f0b2c217
Merge pull request #15869 from MiladNazeri/darkNametagFix
...
[Dev-897] :: add unlit property to nametags
2019-07-02 10:52:02 -07:00
milad
ccc4b0d9e1
added unlit property
2019-07-02 10:33:19 -07:00
jennaingersoll
938b9e25f9
Merge pull request #15861 from jennaingersoll/signal-fix
...
DOC-66: Show deprecated notices for signals.
2019-07-02 10:21:56 -07:00
Shannon Romano
df34e2f86d
Merge pull request #15864 from hyperlogic/bug-fix/dependency-manager-shutdown-issues
...
Fix for DependencyManager crash on shutdown on Mac
2019-07-02 08:24:11 -07:00
Shannon Romano
2f07d35eb7
Merge pull request #15863 from SimonWalton-HiFi/public-address-change2
...
BUGZ-894: Propagate a Node's public address change, part 2
2019-07-02 08:23:34 -07:00
Anthony Thibault
6c66f5a37b
Fix for DependencyManager crash on shutdown on Mac
...
On Mac, it is possible to crash when shutting down, it is not clear if this is due to
shutting down the app on another thread during logout or something that can happen
during normal shutdown, because it is so difficult to reproduce.
However, from looking at the stack traces it is possible for a [NSApplication terminate:]
event to get processed while Appliction::aboutToQuit() is calling ScriptEngine::waitTillDoneRunning()
This causes AppKit to invoke the static destructors too early. Which in turn, causes the
DependencyManager destructor to fire while there are still many dependencies running.
Unfortunatly, the order of destruction is not determinstic, causing them to get shutdown
in an incorrect order.
To workaround this, we delay the call to QCoreApplication::processEvents() as late as possible,
in the Application destructor. Theoretically, this will be a safe time for the static destructors
to be invoked, because it is after all of the DependencyManager's dependencies have been
manually destroyed.
However, this is only a speculative fix, because this is so difficult to reproduce.
2019-07-01 17:37:57 -07:00
Sabrina Shanman
043aee4f78
Merge pull request #15859 from AndrewMeadows/fix-safe-landing
...
BUGZ-787: fix SafeLanding to load correct set of objects before enabling physics simulation
2019-07-01 17:05:19 -07:00
Anna
f44bc52d58
implemented requested changes, fixed math error in filmic curve
2019-07-01 17:05:13 -07:00
Simon Walton
6253adf749
Hook-up remote address-change to Connection class
2019-07-01 16:36:05 -07:00
Shannon Romano
c6cab2c2f4
Merge pull request #15860 from howard-stearns/network-card-info
...
add network card info to platform info
2019-07-01 16:18:41 -07:00
Andrew Meadows
4bbfd7cad1
more correct bounding sphere around avatar for SafeLanding query
2019-07-01 15:53:42 -07:00
Anna
95f2dfa551
added horizontal flip back to mirror mode
2019-07-01 15:31:26 -07:00
Howard Stearns
36e526d1cd
cr feedback
2019-07-01 15:23:00 -07:00
Howard Stearns
ce26611e1f
CR comments
2019-07-01 15:11:54 -07:00
ingerjm0
292dce3e88
DOC-66: Show deprecated notices for signals.
2019-07-01 14:38:56 -07:00
Howard Stearns
08ebd51559
Merge branch 'master' of github.com:highfidelity/hifi
2019-07-01 14:37:42 -07:00
Howard Stearns
0db69ecc20
add network card info to platform data
2019-07-01 14:36:48 -07:00
Andrew Meadows
0d8fdf51c5
fix safe landing to load proper set of objects
2019-07-01 14:18:19 -07:00
Zach Fox
b8485361ce
Merge pull request #15858 from zfox23/PTTDuckingSlider
...
DEV-194: Iterate on PTT Ducking Slider design
2019-07-01 12:00:17 -07:00
Zach Fox
73db19464f
DEV-194: Iterate on PTT Ducking Slider design
2019-07-01 11:28:48 -07:00
Anna
f52376563d
remove redundant getRenderTexturePipeline() override from HMD display plugin
2019-07-01 11:14:54 -07:00
Dante Ruiz
ec4bd95950
Merge pull request #15854 from danteruiz/issues-launchers
...
BUGZ-692: Laucner is not movable & BUGZ-831 handle org and credentials erros.
2019-07-01 11:07:07 -07:00
Anna
e6abaf76f3
Merge branch 'master' of github.com:highfidelity/hifi into display-simplification
2019-07-01 10:56:47 -07:00
Anna
787359fdfb
fixed ui flipping issue
2019-07-01 10:52:03 -07:00
Brad Hefta-Gaub
191086c57a
Merge pull request #15857 from PrestonB1123/webcamPermissions
...
DEV-193: Disallow mic and webcam access always.
2019-07-01 09:54:58 -07:00
Brad Hefta-Gaub
0ef9110f2b
Merge pull request #15853 from SimonWalton-HiFi/public-address-change
...
BUGZ-762: Propagate a Node's public address change to Connection class
2019-06-28 16:12:01 -07:00
Shannon Romano
07fdbeaa0a
Merge pull request #15855 from SamGondelman/forward
...
BUGZ-661: Fix text entity rendering in deferred vs. forward
2019-06-28 15:59:09 -07:00
dante ruiz
12477f3df1
making requested changes
2019-06-28 15:37:21 -07:00
Shannon Romano
89f654175c
Merge pull request #15856 from PrestonB1123/defaultShortcuts
...
DEV-173: Re-enable shortcuts
2019-06-28 15:29:53 -07:00
Preston Bezos
ef674a5934
removed permission for qml to access webcam and mic
2019-06-28 15:23:50 -07:00
Sam Gondelman
e2bf3d7138
remove unused constant
2019-06-28 15:11:22 -07:00
Preston Bezos
1315677aec
fixed doc and removed log spam
2019-06-28 15:02:33 -07:00
Preston Bezos
b9deb7bb58
formatting
2019-06-28 14:42:48 -07:00
Preston Bezos
09830dd40c
removed white space
2019-06-28 14:41:07 -07:00
Preston Bezos
d1470d3323
readded ctrl+n and ctrl+b as shortcuts with a default script
2019-06-28 14:33:03 -07:00
SamGondelman
a5b92a6c7b
fix layered rendering of group culled sub items
2019-06-28 14:24:33 -07:00
Shannon Romano
7ff751567b
Merge pull request #15848 from jherico/fix/dev-175-source
...
DEV-175: QML content URL validation, whitelist trusted sources
2019-06-28 14:18:56 -07:00
SamGondelman
c76d267c2a
separate text into two render items
2019-06-28 13:53:44 -07:00
dante ruiz
6a5c9097c9
finished adding error checking for launcher
2019-06-28 13:35:24 -07:00
Sabrina Shanman
0b6dfe3f7c
Merge pull request #15846 from AndrewMeadows/avoid-SafeLanding-event-flood
...
BUGZ-868: Avoid SafeLanding signal-slot connection resource leak
2019-06-28 13:29:31 -07:00
Shannon Romano
934c482b90
Merge pull request #15852 from raveenajain/bias_distance_sliders
...
BUGZ 598: related debugger scripting update
2019-06-28 11:40:59 -07:00
Simon Walton
225f65f4fb
Log message tweaks
...
Also don't need std in std::move, somehow.
2019-06-28 11:30:09 -07:00
Brad Hefta-Gaub
8082ff8529
Merge pull request #15850 from zfox23/PTTAttenuationOption
...
BUGZ-858: Implement 'Reduce Other Volume While Pushing-to-Talk' option
2019-06-28 11:08:11 -07:00
Brad Davis
e3393a8ee5
Apply URL validation to top level window QML
2019-06-28 10:43:03 -07:00
Shannon Romano
67901166ba
Merge pull request #15851 from ctrlaltdavid/DOC-79
...
DOC-79: Entities JSDoc Update - Doc Review
2019-06-28 10:12:05 -07:00
raveenajain
17d127ecf3
modify shadow debugger for new bias input
2019-06-28 10:07:49 -07:00
Anna
9b85c7f1ac
Merge branch 'master' of github.com:highfidelity/hifi into gamma-simplification
2019-06-28 09:47:17 -07:00
Zach Fox
5cc6efc831
CR feedback
2019-06-28 09:07:58 -07:00
