Commit graph

1744 commits

Author SHA1 Message Date
SamGondelman
d545ba5bc6 haze on most entities, working on skybox 2019-07-10 23:52:50 -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
981311778c comments 2019-07-03 10:41:10 -07:00
Ryan Huffman
991c13df94
Merge pull request #15672 from kencooke/audio-wasapi-qt512
BUGZ-395: Updated build of Qt WASAPI audio plugin with symbols
2019-06-04 10:10:10 -07:00
Anthony Thibault
7781efb382
Merge pull request #15669 from hyperlogic/bug-fix/new-qt-with-fix-for-qscriptengine-crash
Bug fix for crash in QScriptEngine::reportAdditionalMemoryCost()
2019-06-04 10:07:32 -07:00
SamGondelman
68d2f9581f add ability for slp files to define shader variants 2019-06-03 19:16:42 -07:00
Anthony J. Thibault
154fd393ba Bug fix for crash in QScriptEngine::reportAdditionalMemoryCost()
This fix requires a patch to qt.  This build includs a new pre-built Qt 5.12.3 with the patch applied.
See tools/qt5-builder/qtscript-crash-fix.patch to see actual patch applied.

* Touched bullet3 portfile to create new vckpg hash
* New urls for qt assets which include qscript patch hifi_vcpkg.py
* Updated tools/qt5-builder/ with qscript patch and README.md directions.

https://highfidelity.atlassian.net/browse/BUGZ-46

A qt bug was filed to hopefully get this bug fixed upstream.
https://bugreports.qt.io/browse/QTBUG-76176
2019-06-03 17:11:54 -07:00
Ken Cooke
27ced8a217 Add NSMicrophoneUsageDescription to Info.plist to allow microphone when debugging on Mac 2019-06-03 12:32:00 -07:00
Ken Cooke
4ea67ad212 Updated build of WASAPI audio plugin using Qt 5.12.3, includes Debug/Release symbols 2019-06-02 13:52:49 -07:00
Anthony Thibault
736d002f59 Apparently APPLE is UNIX in cmake. 2019-05-30 09:44:27 -07:00
Anthony Thibault
5c982855ab Added cmake messages to help debug config issues
Also remove uncessary HIFI_QT_INSTALL_ROOT env varaible from hifi_vcpkg.py
2019-05-30 09:22:53 -07:00
Anthony J. Thibault
ddf1543d68 Update mac qt build
* Reformat whitespace in README.md
* hifi_vckpg.py: Remove macos var/temp hack for vcpkg
* hifi_vckpg.py: Add ability to override HIFI_QT_INSTALL_ROOT dir with environment variable.
* hifi_vckpg.py: Update macos url for pre-built qt 5.12.3 on S3.
* cmake/ports/bullet3/portfile.cmake: add comment to force change in vcpkg hash.
* tools/qt-builder/README.md: updated formatting and added details about how to generate symbols for macos and pc
* tools/qt-builder: added prepare python scripts for symbols
* cmake/macros/SetupQt.cmake: Remove hardcoded var/temp qt cmake path
2019-05-29 17:11:24 -07:00
Anthony J. Thibault
a7874fa556 Update windows build with symbols for release qt-5.12.3
hifi_vcpkg.py will now download a new version of qt that contains release symbols.
made minor changes to bullet3/portfile.cmake to trigger a new vkpkg hash.
2019-05-23 14:10:06 -07:00
Andrew Meadows
670effd372 handle case when QT_CMAKE_PREFIX_PATH not defined on UNIX 2019-05-21 03:52:01 -07:00
Andrew Meadows
8dcc617acc obey QT_CMAKE_PREFIX_PATH for non DEV_BUILD on UNIX 2019-05-20 20:20:20 -07:00
Andrew Meadows
528a64c618 hack QT_CMAKE_PREFIX_PATH for Jenkins macos builds 2019-05-18 06:45:25 -07:00
Andrew Meadows
9e8d604373 remove debug logs 2019-05-16 16:35:16 -07:00
Andrew Meadows
3e63734123 more correct QT_VERSION detection for MacOS 2019-05-16 13:50:23 -07:00
Andrew Meadows
595edb9f6e more correct QT_VERSION detection 2019-05-16 12:29:37 -07:00
Andrew Meadows
4cf9673dbb Merge master into 22007-hifiQtBuildv2 2019-05-15 14:10:30 -07:00
Roxanne Skelly
72fe3a66f5 Debugging code to monitor the queue depth for a few critical threads 2019-05-13 15:56:55 -07:00
John Conklin II
668af7c4a3
Merge pull request #15433 from Atlante45/fix/osx-deploy-target
Dependencies have correct osx deploy target
2019-05-06 12:15:18 -07:00
NissimHadar
c0201ac2ba Corrected cmake macros. 2019-05-04 18:45:51 -07:00
NissimHadar
844fbec36f So that both Jenkins and local Mac are happy. 2019-05-04 18:09:54 -07:00
NissimHadar
50d1958c4c Reverted unneeded changes. 2019-05-04 17:30:49 -07:00
NissimHadar
604f506dec Merge branch '22007-hifiQtBuildv2' of github.com:NissimHadar/hifi into 22007-hifiQtBuildv2 2019-05-03 19:24:45 -07:00
NissimHadar
88a89de7c6 Merge branch 'master' of github.com:highfidelity/hifi into 22007-hifiQtBuildv2 2019-05-03 19:18:34 -07:00
John Conklin II
75b6705f19
Merge pull request #15464 from Atlante45/fix/cmake-warnings
Case 22370: Fix cmake 3.14 warnings
2019-05-02 11:43:19 -07:00
NissimHadar
3630ed9bec Merge branch '22007-hifiQtBuildv2' of github.com:NissimHadar/hifi into 22007-hifiQtBuildv2 2019-04-29 14:48:33 -07:00
NissimHadar
cd276d2745 Merge branch 'master' of github.com:highfidelity/hifi into 22007-hifiQtBuildv2 2019-04-29 14:37:43 -07:00
NissimHadar
c12d270f8a Use macdeployqt in post build 2019-04-29 14:33:17 -07:00
NissimHadar
f2678ddb73 Corrected both installers. 2019-04-29 12:57:08 -07:00
NissimHadar
d1a29daf36 Corrected both installers. 2019-04-29 12:56:49 -07:00
NissimHadar
53c5e966db Debugging when to use macdeployqt. 2019-04-29 12:47:39 -07:00
NissimHadar
7eaa45f5c1 Added macdeployqt to local builds. 2019-04-29 12:33:23 -07:00
Parker Richard
ae348babe4 - reverted to original installer + uninstaller graphics 2019-04-26 16:16:06 -07:00
Parker Richard
4df3a29b00 - updated console+server icons, installer+uninstaller graphics, and console notification icon 2019-04-26 14:50:18 -07:00
NissimHadar
5aff0bf3e9 Make sure vcpkg'ed version of windeployqt.exe is used. 2019-04-25 15:07:34 -07:00
NissimHadar
a4d5aa8eac Merge branch 'master' of github.com:highfidelity/hifi into 22007-hifiQtBuildv2 2019-04-25 14:26:29 -07:00
Clement
e1e7556226 Fix cmake warnings 2019-04-25 13:53:44 -07:00
NissimHadar
9b22614135 Removed test code. 2019-04-25 10:16:15 -07:00
NissimHadar
90d7948e0d TEST 2019-04-25 09:01:10 -07:00
NissimHadar
bf1d73b413 Undid testing. 2019-04-25 08:29:53 -07:00
NissimHadar
db77fda626 testing. 2019-04-25 07:46:23 -07:00
NissimHadar
91eacf7d3c Added message to know Qt path. 2019-04-24 18:02:39 -07:00
NissimHadar
c05ac9a5dd testing. 2019-04-24 17:51:27 -07:00
NissimHadar
ba9733aa03 Removed test code. 2019-04-24 17:40:08 -07:00
NissimHadar
bd40ea057b Testing windeployqt 2019-04-24 14:42:18 -07:00
NissimHadar
f4b1aedbae Minor cleanup. 2019-04-23 15:06:40 -07:00
NissimHadar
c9d128ae71 testing 2019-04-23 10:39:52 -07:00