Samuel Gateau
0c26d3ef66
clean up etc
2019-07-05 13:23:19 +02:00
Sam Gateau
4cc3800384
COmprehensive enumeration of gpu and displays from mac
2019-07-05 12:26:42 +02:00
Sam Gateau
98f4448813
Merge branch 'master' of github.com:highfidelity/hifi into nut
2019-07-04 23:24:34 +02: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
Samuel Gateau
28fddc2fb3
full stack for windows
2019-07-04 18:13:08 +02:00
Samuel Gateau
12cc69e41c
Merge branch 'master' of github.com:highfidelity/hifi into nut
2019-07-04 01:56:06 -07:00
Samuel Gateau
8284c8d015
doing the full enumeration in windows
2019-07-04 01:55:48 -07:00
David Rowe
8fb83e98be
Doc review.
2019-07-04 20:02:42 +12:00
SamGondelman
ea1b117ca4
fix image y flip and text crash
2019-07-03 23:14:52 -07:00
Sam Gondelman
c9fbb58d27
Merge branch 'master' into uber
2019-07-03 22:39:25 -07: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
SamGondelman
8b9fcd43b1
merge with master
2019-07-03 17:58:23 -07:00
Simon Walton
597477614c
Debugging for missing Avatar Data
2019-07-03 17:51:05 -07:00
amer cerkic
9384c5b3a3
testing what happens (for mac specifically) when we specify the focus item to be the root, not NULL as sometimes happens when toggling between modal popups and the main window
2019-07-03 16:02: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
amer cerkic
e429b7a1e2
Merge branch 'master' into bugz-690
2019-07-03 14:00:27 -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
amer cerkic
39fd16fc9e
adding a null check escape to the activeItem. On right click back to root window active item becomes null instead of root item
2019-07-03 11:05:38 -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
Samuel Gateau
3be8b80eff
Merge branch 'master' of github.com:highfidelity/hifi into nut
2019-07-03 01:01:26 -07:00
Samuel Gateau
a1968bd9d0
Moving mac specific include at the correct place
2019-07-03 01:00:52 -07:00
dante ruiz
f210be32dc
updating progress indicator work
2019-07-02 20:56:49 -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
Clement
c7442e3a62
Remove QT_CMAKE_PREFIX_PATH prod hack
2019-07-02 16:00:55 -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
Sam Gateau
2c412808e7
More information from the platform on mac
2019-07-02 14:48:25 +02:00
Ryan Huffman
d29cd796ca
Add defaultScriptsOverride option
2019-07-01 23:51:34 -07:00
