Commit graph

1783 commits

Author SHA1 Message Date
Dale Glass
ec86a1a57f Move to kasenvr repos
The highfidelity github repos will probably be going away on
Jan 15, 2020.
2019-12-30 20:24:15 +01:00
kasenvr
b572b6595e
Merge pull request #19 from daleglass/kasen/core
Change asset URLs to Athena S3 bucket.
2019-12-18 14:34:11 -05:00
Dale Glass
ac5a70fca0 Change asset URLs to Athena S3 bucket.
This uses a variable that can be overriden with an environment variable.
This makes it easy for the community to create alternate asset hosts.

Due to vcpkg using a clean environment, variables can't be easily passed
to cmake scripts run by vcpkg. This was worked around by writing the data
that needs to be passed into temporary files and reading it from the
vcpkg ports.
2019-12-18 17:36:01 +01:00
51332b8437 Fix the fix for SDL2 2019-12-16 18:22:01 -06:00
669c01c5a3 Update SDL2 CONTROL file to fix linux build 2019-12-16 17:21:16 -06:00
12e5712f41 Upgrade vcpkg port files for SDL2 from 2.0.8 to 2.0.10. Fixes patch errors.
Signed-off-by: Marcus Llewellyn <marcus.llewellyn@gmail.com>
2019-12-08 09:46:58 -06:00
Kasen IO
0b46c53df1 Merge branch 'kasen/core' into v0860-kasen-release+freshstart 2019-12-01 19:59:59 -05:00
Bradley Austin Davis
69e586cc54 Fix codesign 2019-11-04 16:42:03 -08:00
Maia Hansen
651b3e90d3
Merge pull request #16393 from kencooke/audio-wasapi-qt5.12.3-fix
DEV-2521: Volume of other programs is reduced by approx 50%
2019-10-23 15:02:44 -07:00
Maia Hansen
cf79f4807c
Merge pull request #16385 from jherico/fix/DEV-2425
DEV-2425: web video playback on OSX
2019-10-23 10:25:30 -07:00
Ken Cooke
e1fa10b4de Updated Qt 5.12.3 WASAPI plugin.
Reverted patch that applied "eCommunications" role to our audio streams.
2019-10-22 14:14:41 -07:00
Bradley Austin Davis
5bf2365a5e Update Qt URL and force vcpkg hash change 2019-10-22 08:25:13 -07:00
Ken Cooke
6101f54d4b Rebase WASAPI audio plugin on Qt 5.12.3 2019-10-18 06:11:00 -07:00
Clement
2f8c3f2f24 Add bullet patch for clang 8 compatibility 2019-10-10 15:52:36 -07:00
Seth Alves
fc0874a182 new version of webrtc library for osx 2019-10-04 09:42:36 -07:00
Ken Cooke
97dab24a69 Fix Android clang warnings due to unused compiler flags 2019-09-26 15:45:26 -07:00
Seth Alves
8875453585 remove old/unused eyetracker code 2019-09-17 09:43:32 -07:00
Shannon Romano
65d0bb1342
Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc
Kasen Plugin Infrastructure v½ Codename "Modkit Mini"
2019-09-11 13:04:01 -07:00
Brad Davis
790ac6a483 Removing debugging popups 2019-09-10 20:40:59 -07:00
Brad Davis
9be475bff8 Trying to fix client-only build 2019-09-10 18:43:34 -07:00
Brad Davis
967e7db0bb Don't break sandbox builds 2019-09-10 16:29:45 -07:00
Brad Davis
a49fe4844b BUGZ-1167: remove unwanted binaries from bad client-only installers 2019-09-10 12:31:15 -07:00
dante ruiz
f80fb39447 Lowercase interface
Launcher expects a lower-cased "Interface". This ensures that it's
created lower-cased on case sensitive filesystems.
2019-09-06 11:19:54 -07:00
Brad Davis
7c84d897ba Fix webrtc link errors in debug builds 2019-09-05 14:16:52 -07:00
humbletim
271fac4bca Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge 2019-09-05 09:46:21 -04:00
amerhifi
7a1828e0cb removed interface name from shortcut 2019-08-27 21:41:45 +02:00
Brad Davis
a613be9536 Allow a user to limit the number of cores used when building 2019-08-26 11:51:42 -07:00
Kalila R
28b27a1e48 Merge branch 'v0.83.0-rc' into kasen/core 2019-08-03 15:27:23 -04:00
Seth Alves
27b574cf14 disable webrtc for android 2019-07-30 14:09:34 -07:00
Seth Alves
c1cadf670e update webrtc library, enable for android 2019-07-30 14:09:31 -07:00
Seth Alves
32d5ab7b1f Make WebRTC library available 2019-07-30 14:09:30 -07:00
humbletim
058c81aa1a Merge branch 'hifi-master' into kpi-v1-modkit-rc 2019-07-26 01:36:52 -04:00
humbletim
6ae75ecafe segregated scripting/ plugins (re: permissions checkbox) 2019-07-26 01:31:42 -04:00
Ryan Huffman
2ec87f4e61 Add serverless tutorial 2019-07-24 16:38:03 -07:00
Matt
34908e54ef
Merge pull request #15873 from Atlante45/feat/qt-5.12.3-upgrade
BUGZ-820: Remove QT_CMAKE_PREFIX_PATH prod hack
2019-07-12 10:24:06 -07:00
SamGondelman
bda87aa13f trying to fix android 2019-07-11 16:39:23 -07:00
SamGondelman
9539664749 add haze to skybox 2019-07-11 11:00:30 -07:00
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
Clement
c7442e3a62 Remove QT_CMAKE_PREFIX_PATH prod hack 2019-07-02 16:00:55 -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