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
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
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
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
Anna
f52376563d
remove redundant getRenderTexturePipeline() override from HMD display plugin
2019-07-01 11:14:54 -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
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
Sam Gondelman
e2bf3d7138
remove unused constant
2019-06-28 15:11:22 -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
Simon Walton
225f65f4fb
Log message tweaks
...
Also don't need std in std::move, somehow.
2019-06-28 11:30:09 -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
Anna
9b85c7f1ac
Merge branch 'master' of github.com:highfidelity/hifi into gamma-simplification
2019-06-28 09:47:17 -07:00
David Rowe
2d6d3eb4fe
Doc review
2019-06-28 17:05:36 +12:00
Simon Walton
9b894456e9
Change address for sequence-number hash also
2019-06-27 17:29:17 -07:00
Brad Davis
8bcde84d89
Disable remote QML unless whitelisted
2019-06-27 16:37:56 -07:00
Simon Walton
1265531f79
Plumb down change of destination address
2019-06-27 15:52:39 -07:00
raveenajain
3a60bc6a13
clang braces fix
2019-06-27 11:52:43 -07:00
raveenajain
d6fb7f8a6f
arrays for bias calcs
2019-06-27 10:42:14 -07:00
raveenajain
309e59ca8b
Merge branch 'master' of https://github.com/highfidelity/hifi into nitpick_shadows
2019-06-27 09:42:03 -07:00
raveenajain
04afbde188
cascade loop, fine tune calc
2019-06-27 09:41:39 -07:00
Simon Walton
50965f1916
Handle remote public-address changes
2019-06-26 18:04:41 -07:00
Anna
6b79b275a9
fixed reinhard and filmic curves
2019-06-26 18:00:49 -07:00
Anna
24b6d64e34
removed extraneous code for hmd
2019-06-26 17:27:53 -07:00
Anna
6f5b37ec87
removed extraneous conversion to SRGB and back during deferred rendering
2019-06-26 16:36:04 -07:00
raveenajain
534794d7ff
move bias init from config to run
2019-06-26 15:42:11 -07:00
Anna
59505ab20f
fixed color banding on rift
2019-06-26 09:29:06 -07:00
Brad Hefta-Gaub
06bb09ff58
Merge pull request #15841 from SimonWalton-HiFi/accountmanager-quit-signal
...
BUGZ-789: Use a queued signal to quit from AccountManager::saveLoginStatus()
2019-06-25 17:20:41 -07:00
Shannon Romano
2af701235a
Merge pull request #15815 from annabrewer/snapshot-gamma
...
BUGZ-765: Snaps Photos are Dark
2019-06-25 15:26:00 -07:00
Simon Walton
b4e1c2264c
Use a queued signal to quit from AccountManager::saveLoginStatus()
2019-06-25 14:47:58 -07:00
Sam Gateau
48f9c33bdd
Merge pull request #15822 from samcake/yellow
...
BUGZ-664: Introduce scaling of rendering for forward renderer
2019-06-25 14:27:17 -07:00
Andrew Meadows
20376c9542
Merge pull request #15823 from ctrlaltdavid/DOC-79
...
DOC-79: Entities JSDoc Update
2019-06-25 14:18:13 -07:00
Andrew Meadows
adce2a6fd0
Merge pull request #15838 from kencooke/render-blendshape-optim-avx2
...
Fix Mac crash caused by PR#15825
2019-06-25 13:54:39 -07:00
Ken Cooke
4c5c61231d
Only use QVector resize when actually needed
2019-06-25 12:57:55 -07:00
Ken Cooke
0a34745ff9
Use QVector resize() instead of reserve() to silence Debug builds about size not being set.
...
Causes unneeded default initialization, but no obvious way to avoid.
2019-06-25 12:53:07 -07:00
Ken Cooke
b079e3283e
BUGFIX: use unaligned loads
2019-06-25 11:48:41 -07:00
Sam Gateau
9470467c31
Ad the check for nsight to avoid the COmpositeHUD pass
2019-06-25 11:28:01 -07:00
Sam Gateau
4dcfa59997
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-06-25 11:14:09 -07:00
