Commit graph

79542 commits

Author SHA1 Message Date
luiscuenca
6a7b9c0202
Delete install directory right before installing and keep a copy of config.json 2019-07-05 13:59:35 -07:00
Shannon Romano
7b3fa22d0c
Merge pull request #15886 from luiscuenca/waitForInterface
BUGZ-874: Don't shut down launcher's splash screen until interface's window is shown
2019-07-05 10:31:57 -07:00
luiscuenca
07983cd642
Don't shut down launcher until interface window is shown 2019-07-05 09:02:34 -07:00
Shannon Romano
ab376d59db
Merge pull request #15865 from ctrlaltdavid/DOC-105
DOC-105: Pointers JSDoc revision
2019-07-04 12:02:52 -07:00
David Rowe
8fb83e98be Doc review. 2019-07-04 20:02:42 +12:00
Shannon Romano
a87072a23d
Merge pull request #15879 from luiscuenca/WLcloseInterface
BUGZ-845: Shut down interface when executing the Windows Launcher
2019-07-03 18:06:01 -07:00
Shannon Romano
22e9628e77
Merge pull request #15662 from SamGondelman/uber2
DEV-203: Add ability for .slp files to define shader variants
2019-07-03 18:03:56 -07:00
luiscuenca
dcbb0f5db5
Shut down interface when executing the Windows Launcher 2019-07-03 15:22:41 -07:00
Sam Gondelman
00441f1899
Merge pull request #15875 from SamGondelman/load
BUGZ-910: Return entity load priority operator to proper state after safe landing
2019-07-03 14:20:03 -07:00
Zach Fox
86ccb89c0c
Merge pull request #15878 from zfox23/SUI/aboutAudio
BUGZ-911: Place selected audio I/O information in About tab and in 'Copy to Clipboard' clipboard text
2019-07-03 13:34:56 -07:00
Zach Fox
1f54f3c159 BUGZ-911: Place selected audio I/O information in About tab and in 'Copy to Clipboard' clipboard text 2019-07-03 12:49:23 -07:00
SamGondelman
981311778c comments 2019-07-03 10:41:10 -07:00
Sam Gateau
1a71a63a8b
Merge pull request #15867 from SamGondelman/unlit
BUGZ-661: Add unlit property to text entities
2019-07-03 18:43:26 +02:00
Shannon Romano
9d150437da
Merge pull request #15871 from luiscuenca/WLimproveErrors
BUGZ-882: Improve error handling on Windows Launcher
2019-07-03 09:39:34 -07:00
Amer
f97cde46bf
Merge pull request #15868 from amerhifi/bugz-103
case BUGZ-103: HMD Mouse rendering
2019-07-03 09:17:23 -07:00
Shannon Romano
f670803939
Merge pull request #15876 from annabrewer/secondary-camera-curve
Removed secondary camera tone mapping compensation
2019-07-03 09:11:56 -07:00
Anna
75c5a99ee2 removed secondary camera tone mapping compensation during 360 screenshot 2019-07-02 17:59:30 -07:00
Zach Fox
ba7ed32135
Merge pull request #15874 from MiladNazeri/nameTagInBodyFix
[Bugz-893] :: Name tag in body fix
2019-07-02 16:56:46 -07:00
Gayathri
1e4e8b41cb
Merge pull request #15870 from RebeccaStankus/webTablet
BUGZ 887 Error in Webtablet.js
2019-07-02 16:43:13 -07:00
milad
c7f5a5064d removed bad log 2019-07-02 16:41:24 -07:00
milad
83546de9da removed distance check for redraw to prevent nametag in user's body 2019-07-02 16:40:23 -07:00
SamGondelman
4973563c20 return entity load priority operator to proper state 2019-07-02 16:29:19 -07:00
luiscuenca
1f6c4dc375
Avoid saving error log twice 2019-07-02 15:31:28 -07:00
luiscuenca
b877d20219
Improve error handling on Windows Launcher 2019-07-02 15:22:00 -07:00
RebeccaStankus
d840723fe3 Fixed space before function params 2019-07-02 15:08:34 -07:00
RebeccaStankus
0670147bf8 Fixed paths to included files and collision with 'clamp' 2019-07-02 14:24:02 -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
amer cerkic
75beb95a97 Since switching to system mouse due to eco mode trailing mouse issues, this in turn caused hmd mode to render a blank mouse. Added a mouse setting functionality on activeplugin change lambda so taht when in hmd mode it uses either reticle mouse, if selected, or arrow. Othewise if non hmd use system mouse. 2019-07-02 10:31:31 -07:00
SamGondelman
fa416adaf6 adding unlit property to text, fixing transparency, normals, other cleanup 2019-07-02 10:28:36 -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
David Rowe
5c29eb04b3 Typo 2019-07-02 16:19:32 +12:00
David Rowe
c6fd726111 Typos etc. 2019-07-02 16:12:47 +12:00
David Rowe
b7e92e0994 LaserPointers API JSDoc update 2019-07-02 16:12:47 +12:00
David Rowe
e109c8f6d3 Picks and RayPick API JSdoc updates per Pointers API JSDoc 2019-07-02 16:12:47 +12:00
David Rowe
f2cf3bd05c Revise Pointers API JSDoc 2019-07-02 16:12:47 +12: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