Commit graph

79748 commits

Author SHA1 Message Date
Zach Fox
243733028b
Merge pull request #15891 from zfox23/SUI/audioIOAboutSwitch
BUGZ-923: Fix an edge case in Audio I/O devices in Settings -> About
2019-07-05 12:59:56 -07:00
Zach Fox
afd5da07b0
Merge pull request #15892 from zfox23/PALLogSpam
BUGZ-917: Fix log spam in NameCard.qml
2019-07-05 12:59:13 -07:00
Zach Fox
38ad93a7ed BUGZ-917: Fix log spam in NameCard.qml due to errant line of code 2019-07-05 12:24:05 -07:00
Zach Fox
4223800af7 BUGZ-923: Fix an edge case in Audio I/O devices in Settings -> About 2019-07-05 12:17:28 -07:00
Zach Fox
eb79752455 BUGZ-930: No more auto-LOD adjustment for SimplifiedUI users 2019-07-05 12:00:17 -07:00
Sabrina Shanman
47a863cb11
Merge pull request #15882 from SamGondelman/imagey
BUGZ-661: Fix Image Entity Y flip and Text Entity shutdown crash
2019-07-05 11:57:59 -07:00
luiscuenca
a94eb4d44b
Allow the launcher window to be moved 2019-07-05 11:09:36 -07:00
Seth Alves
708979a30c use the correct gl format when creating the initial platform window 2019-07-05 10:48:57 -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
Samuel Gateau
1aa067db74 address warning 2019-07-05 18:54:33 +02:00
luiscuenca
07983cd642
Don't shut down launcher until interface window is shown 2019-07-05 09:02:34 -07:00
Sam Gateau
11f036246e Implement the ppi scaling in sync with the platform tier 2019-07-05 17:52:44 +02:00
Samuel Gateau
6ef652038b EXpose the master index for cpu, gpu and display and adjust the profuiler to support it / remove unsupported deferred for macs since now it is fixed 2019-07-05 16:15:19 +02:00
Samuel Gateau
9d9b80dec0 remove cruft on the win side and live with a crappy ppiDesktop 2019-07-05 15:02:51 +02:00
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
732a7b0a89
fix build error 2019-07-03 22:43:35 -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
SamGondelman
72f52b069e cleanup, fix shadow qml 2019-07-03 16:21:47 -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 Gondelman
0d9f639331
Merge branch 'master' into bias 2019-07-03 10:20:16 -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