David Rowe
8dd8ebcbaf
Merge branch 'master' into feature/eye-tracking-option
...
# Conflicts:
# plugins/openvr/src/ViveControllerManager.cpp
2020-07-11 08:14:13 +12:00
David Rowe
5ce60a9ab7
Include deveoper guidelines doc in Vive PRO Eye's SRanipal package
2020-06-27 07:24:38 +12:00
David Rowe
0f324ee9ae
Merge branch 'v2020.2.2-rc' into feature/openvr-linux
...
# Conflicts:
# plugins/openvr/CMakeLists.txt
# plugins/openvr/src/ViveControllerManager.cpp
2020-06-19 16:27:53 +12:00
kasenvr
13451bd275
Merge pull request #384 from JulianGro/rebrand
...
Rebranding stuff
2020-06-18 17:12:47 -04:00
David Rowe
ec81ac8750
Merge branch 'master' into feature/openvr-linux
2020-06-16 08:30:29 +12:00
David Rowe
4e57d53dde
Merge branch 'master' into feature/vive-pro-eye-tracking
2020-06-14 10:51:25 +12:00
motofckr9k
3d05cdd61e
Merge remote-tracking branch 'refs/remotes/kasen/master'
...
Conflicts:
BUILD_WIN.md
CODING_STANDARD.md
LICENSE
cmake/installer/installer-header.bmp
cmake/installer/installer.ico
cmake/installer/uninstaller-header.bmp
interface/resources/images/about-vircadia.png
interface/resources/images/vircadia-logo.svg
interface/resources/qml/LoginDialog.qml
interface/resources/qml/dialogs/TabletLoginDialog.qml
interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
interface/src/Application.cpp
pkg-scripts/athena-server.spec
scripts/system/more/app-more.js
scripts/system/more/css/styles.css
scripts/system/more/more.html
2020-06-10 02:49:13 +02:00
kasenvr
585fb1939f
Merge pull request #429 from daleglass/upgrade_opus
...
Use newer opus to fix illegal instruction in libopusCodec.so
2020-06-07 22:54:53 -04:00
Kasen IO
db1ff76ba5
Update installer/uninstall icons.
2020-06-07 17:15:11 -04:00
Dale Glass
7dd5a2773c
Use newer opus to fix illegal instruction in libopusCodec.so
...
This will build the very latest Opus available (May 30 2020). The absolute
minimum version of Opus is commit 927de8453c502586c03e25c169ec08f2a93ebc02,
released on April 21, 2020.
This incorporates a fix for xiph/opus#154
2020-06-07 12:51:38 +02:00
Kasen IO
cefda3f7f2
Update packaging parameters for Vircadia.
2020-06-01 22:48:38 -04:00
David Rowe
343c6a4027
Fix Linux targeting
2020-05-23 19:46:26 +12:00
David Rowe
b72d5bf80c
Build OpenVR plugin on Linux
2020-05-23 14:53:43 +12:00
motofckr9k
d406b81b47
Big rebrand
2020-05-22 20:35:27 +02:00
David Rowe
7634478aba
Merge branch 'master' into feature/vive-pro-eye-tracking
2020-05-22 08:52:08 +12:00
kasenvr
a9b56b5f3a
Merge pull request #335 from kasenvr/feature/openvr-update
...
Update to latest OpenVR SDK
2020-05-20 14:03:05 -04:00
Thijs Wenker
eb1bf12494
Fix linux PR builds
2020-05-18 14:07:38 +02:00
David Rowe
63ba8400f7
Merge branch 'master' into feature/vive-pro-eye-tracking
2020-05-16 11:23:38 +12:00
daleglass
8846e0e517
Merge pull request #317 from sethalves/fix-glm-warning
...
Don't let Linux build of glm with clang-9 fail due to stray semicolon
2020-05-13 22:37:41 +02:00
David Rowe
42036b2746
Merge branch 'master' into feature/openvr-update
2020-05-09 07:25:40 +12:00
David Rowe
5c7e6446d0
Update to build using latest OpenVR SDK package
2020-05-04 21:03:13 +12:00
Seth Alves
da6b59f3f2
Don't let Linux build of glm with clang-9 fail due to stray semicolon
2020-04-26 21:54:05 +00:00
Seth Alves
10830cf68c
recover from rebase errors
2020-04-26 14:50:43 -07:00
Seth Alves
2fdbd0ab78
update urls for vive eye and hand tracking libraries, fix cmake for same
2020-04-26 12:27:18 -07:00
Seth Alves
a0031c6f10
eye and hand tracking for htc vive pro
2020-04-26 12:24:45 -07:00
Thijs Wenker
53bb62756f
fix more links
2020-04-19 22:50:51 +02:00
Thijs Wenker
466e1a7ce3
- disable osx GHA build for now
...
- fix tbb issue, the repo moved to another location which changed the hash of the source
2020-04-19 22:50:50 +02:00
Thijs Wenker
3ea3330bea
enable tbb for osx
2020-04-19 22:50:49 +02:00
Thijs Wenker
98e79fd698
update zlib port
2020-04-19 22:50:49 +02:00
Thijs Wenker
48ee437c00
cmake -D VCPKG_BUILD_TYPE could be set to either release debug or release in order to build vcpkg in a specific build type, otherwise it will build with debug and release
2020-04-19 22:50:49 +02:00
Thijs Wenker
997eb14ddc
release mode proof portfiles
2020-04-19 22:50:48 +02:00
a8c8c775f3
Re-enable and update code signing in installer template
2020-04-18 12:32:08 -05:00
David Rowe
88ee66abad
Further work-arounds for "?" in URLs
2020-04-13 11:02:50 +12:00
David Rowe
7ba1ccb8b2
Fix Linux cmake warning
...
Credit: Dale Glass <dale@daleglass.net>
2020-04-12 13:42:20 +12:00
David Rowe
1254557814
Fix Linux cmake problem
...
Credit: Dale Glass <dale@daleglass.net>
2020-04-12 13:24:35 +12:00
David Rowe
b92bd1773a
Fix copying PolyVox libraries to cmake binary directory
2020-04-11 20:24:10 +12:00
David Rowe
d99dad3fcb
Fix files not removed in master merge
2020-04-11 15:40:11 +12:00
David Rowe
1a4bb41f22
Fix up quazip configuration
2020-04-10 09:34:00 +12:00
David Rowe
a8b4f22fc6
Update new build URLs
2020-04-09 16:54:14 +12:00
David Rowe
ffeb37e7aa
Merge remote-tracking branch 'hifi/master' into merge-hifi-master
...
# Conflicts:
# CMakeLists.txt
# README.md
# cmake/externals/glad32es/CMakeLists.txt
# cmake/externals/glad41/CMakeLists.txt
# cmake/externals/glad45/CMakeLists.txt
# cmake/externals/polyvox/CMakeLists.txt
# cmake/externals/quazip/CMakeLists.txt
# cmake/externals/vhacd/CMakeLists.txt
# cmake/init.cmake
# cmake/ports/hifi-deps/CONTROL
# cmake/ports/sdl2/CONTROL
# cmake/ports/sdl2/disable-hidapi-for-uwp.patch
# cmake/ports/sdl2/enable-winrt-cmake.patch
# cmake/ports/sdl2/fix-arm64-headers.patch
# cmake/ports/sdl2/fix-x86-windows.patch
# cmake/ports/sdl2/portfile.cmake
# cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
# cmake/ports/tbb/portfile.cmake
# hifi_vcpkg.py
# interface/src/avatar/MyAvatar.h
# libraries/avatars-renderer/src/avatars-renderer/Avatar.h
# libraries/avatars/src/AvatarData.h
# libraries/entities-renderer/src/RenderableEntityItem.h
# libraries/entities/src/EntityItem.cpp
# libraries/entities/src/EntityItem.h
# libraries/fbx/src/GLTFSerializer.cpp
# libraries/graphics-scripting/src/graphics-scripting/Forward.h
# libraries/networking/src/AddressManager.cpp
# libraries/networking/src/DomainHandler.h
# libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
# libraries/render-utils/src/HighlightEffect.cpp
# libraries/render-utils/src/MeshPartPayload.cpp
# libraries/render-utils/src/Model.cpp
# libraries/render-utils/src/RenderShadowTask.cpp
# libraries/script-engine/src/WebSocketClass.cpp
2020-04-09 16:46:27 +12:00
acbc8a889f
Fix updated TBB library hash in vcpkg portfile
2020-03-18 19:15:33 -05:00
Dale Glass
39f23b52c3
Force dynamic build on Linux, fixes #151
2020-02-05 23:30:04 +01:00
Thijs Wenker
dcb575a178
Merge pull request #86 from MarcusLlewellyn/opus-plugin
...
Add support for the Opus audio plugin.
2020-01-31 01:04:47 +01:00
a0fd53ae24
Change installer name from Beta to Alpha
2020-01-17 14:58:40 -06:00
Thijs Wenker
26bebba8dd
fix opus library linking in cmake
...
Signed-off-by: Marcus Llewellyn <marcus.llewellyn@gmail.com>
2020-01-13 12:27:24 -06:00
d030d82355
Cosmetic change for TargetOpus.cmake
2020-01-10 12:17:22 -06:00
4e41c0710d
Fix VCPKG Opus CONTROL failure on Linux
...
VCPKG on Linux really, really does not like the "Homepage:" line.
2020-01-09 16:43:11 +01:00
3d8d359c35
Initial work on Opus audio plugin
...
This commit is made up of changes to VCPKG and CMake to include the Opus libraries, as well as a skeleton project for an Opus audio plugin.
2020-01-09 16:43:11 +01:00
77e49421bc
Fix installer failing when signing certifcate is not available.
...
This commit comments out the code signing portion of the installer for now. Also a few minor cosmetic changes
2020-01-05 18:44:17 -06:00
97a5149b89
Merge remote-tracking branch 'upstream/kasen/core' into Winstall-brand
2019-12-30 15:58:03 -06:00
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
986cb05f7b
Fix typo
...
Tomato, Tohmahto, Athena, Athenay
2019-12-29 17:40:51 -06:00
12633e8ee0
Change how analytics was disable
...
Rather than comment out the body od the GoogleAnalytics macro, it now has each invokation of the macro commented our.
2019-12-26 17:21:43 -06:00
f614f6f290
Stuff I forgot in last commit for NSIS
2019-12-22 15:44:25 -06:00
b512eec6f8
Make changes to NSIS installer
...
Changes names to Project Athena.
Disables downloading of compaign packages.
Disables slideshow during install.
2019-12-22 15:44:02 -06:00
a547f4c771
Change installer images
2019-12-22 14:42:59 -06:00
9b542736f7
Remove Google Analytics from installer
2019-12-22 14:23:28 -06: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
Simon Walton
16b6c6305b
Fix formatting issues in cmake file
2019-12-10 09:46:35 -08: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
Simon Walton
82ed358323
Merge remote-tracking branch 'upstream/master' into linux-actions-builds
...
Also merge in Linux PR build
2019-12-05 16:19:12 -08:00
Brad Davis
f39088fb0b
Github Actions master builds
2019-12-03 10:56:04 -08:00
Kasen IO
0b46c53df1
Merge branch 'kasen/core' into v0860-kasen-release+freshstart
2019-12-01 19:59:59 -05:00
Brad Davis
0240a6e3d9
Update prebuilt dependencies
2019-11-25 11:42:09 -08:00
Anthony Thibault
edfad97b64
Merge pull request #16517 from hyperlogic/feature/facecap-osc-plugin
...
Input plugin for streaming blendshapes from an iPhone
2019-11-23 11:49:51 -08:00
Simon Walton
167dfab539
Copy PolyVox libs to build directory; don't try to upload docker image
2019-11-22 15:17:23 -08:00
Anthony J. Thibault
909d292295
Bumped version number on hifi-client-deps/CONTROL file
2019-11-22 14:22:29 -08:00
Simon Walton
a2c5295311
On Linux, remove quazip5 dynamic libs
2019-11-21 16:32:54 -08:00
Simon Walton
9e5c0a7afc
Copy quazip lib to build dir; built server-console
2019-11-21 15:02:08 -08:00
Anthony J. Thibault
befbdcef48
Upgraded OSC plugin with changes from ARKit blendshape work.
2019-11-19 13:13:56 -08:00
Brad Davis
9c2a85d9a9
Revert ssl dependency on unix
2019-11-18 15:20:37 -08:00
Brad Davis
d4b3a9ba49
Github actions
2019-11-18 15:20:37 -08:00
Zach Fox
40814f9086
Merge branch 'master' of github.com:highfidelity/hifi into screenshareElectronApp
2019-11-06 14:46:14 -08:00
Bradley Austin Davis
69e586cc54
Fix codesign
2019-11-04 16:42:03 -08:00
Zach Fox
1e24df3f71
Get Interface to look in the proper directories
2019-10-31 08:57:06 -07:00
Zach Fox
5af7acf9ba
Revert spooky changes
2019-10-30 16:53:18 -07:00
milad
ea373ac14c
First steps towards a screenshare app
2019-10-30 16:44:42 -07: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
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
Revofire
47af406440
merged 0.80.0-kasen into 0.81.0-kasen, 0.81.0-kasen source ready for build.
...
various changes, idk, added a whitelist filter to ent script filter
2019-05-01 22:13:51 -04: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
NissimHadar
2963dd8fa5
testing
2019-04-23 08:18:41 -07:00
NissimHadar
e7b780fcb9
testing
2019-04-23 08:11:09 -07:00
NissimHadar
182799b4ec
testing
2019-04-23 08:07:25 -07:00
NissimHadar
55e1841358
testing
2019-04-23 07:58:33 -07:00
NissimHadar
01a838b5cb
Updated for Jenkins.
2019-04-22 21:36:35 -07:00
NissimHadar
d7197dba65
Use QT_CMAKE_PREFIX_PATH only on local builds.
2019-04-22 20:56:32 -07:00
NissimHadar
24110ebf86
Ready for Mac/Linux testing.
2019-04-22 17:58:20 -07:00
SamGondelman
06fbc8440e
Merge remote-tracking branch 'upstream/master' into stencil2
2019-04-22 13:28:30 -07:00
Clement
e01561185d
Dependencies have correct osx deploy target
2019-04-19 20:19:48 -07:00
NissimHadar
69433b1f8a
Merge pull request #15339 from NissimHadar/22076-changeTimeStampURLToEnvironmentVariable
...
Case 22076: Use optional environment variable for timestamp server URL
2019-04-19 07:39:04 -07:00
SamGondelman
c730e51d1e
wip redo stencil work
2019-04-11 13:22:51 -07:00
NissimHadar
75e1437274
Use optional environment variable for timestamp server URL
2019-04-05 14:55:23 -07:00
Sam Gondelman
660818aded
Revert "Case 20060: Grab correct stencil masks from display plugins"
2019-04-05 11:59:46 -07:00
Sam Gondelman
85bf1da0a1
Merge pull request #15266 from SamGondelman/stencil
...
Case 20060: Grab correct stencil masks from display plugins
2019-04-04 13:36:25 -07:00
Shannon Romano
65a039e228
Merge pull request #15312 from roxanneskelly/Case19858
...
Case 19858 - crashpad_handler is duplicated outside of the Interface/…
2019-04-04 11:27:20 -07:00
Roxanne Skelly
80683a7b7a
Crashpad fix 2nd try
2019-04-02 17:35:09 -07:00
Roxanne Skelly
b841125b19
Case 19858 - crashpad_handler is duplicated outside of the Interface/Sandbox applications on MacOS
2019-04-02 16:42:09 -07:00
Olivier Prat
e2bc80b46f
Fixed for debug
2019-04-01 15:07:29 +02:00
Olivier Prat
4e39a063f7
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2019-04-01 11:08:41 +02:00
Olivier Prat
c480f36dd4
Finally managed to switch to all static for OpenEXR
2019-03-28 10:58:58 +01:00
Olivier Prat
eb0e1d5f93
Fix for Mac and Ubuntu
2019-03-27 18:34:59 +01:00
Olivier Prat
610d8347ff
Removed FindOpenEXR.cmake alltogether
2019-03-27 18:00:49 +01:00
Olivier Prat
809b1694ff
Added cmake find library suffixes
2019-03-27 14:41:48 +01:00
Olivier Prat
89fbe131c2
Yet another try at fixing compilation
2019-03-27 13:56:11 +01:00
Olivier Prat
2a0033aa1f
Another try at building on Ubuntu & Mac
2019-03-27 12:08:06 +01:00
Olivier Prat
7791401b0e
Trying to fix Ubuntu & Mac builds.
2019-03-27 11:17:22 +01:00
SamGondelman
4ed7c09016
grab correct stencil masks from display plugins
2019-03-26 13:42:18 -07:00
Olivier Prat
d2011481bf
Successfull buid and link of Oven with OpenEXR
2019-03-26 11:37:32 +01:00
Olivier Prat
d8b457895a
Adding OpenEXR vcpkg port
2019-03-22 10:30:24 +01:00
NissimHadar
718eed8d5b
Corrected typo.
2019-03-19 09:58:44 -07:00
Brad Davis
72ec0ea29a
Update Oculus Mobile SDK to latest version
2019-03-06 11:16:03 -08:00
Brad Davis
02a95b599d
fix extra shadergen args
2019-02-15 15:57:19 -08:00
Brad Davis
51884155ee
Support Android app-specific extensions in shaders
2019-02-15 14:16:58 -08:00
Simon Walton
75901a1e37
Merge pull request #14853 from SimonWalton-HiFi/installer-removes
...
Case 20496: Windows (NSIS) installer shouldn't remove unselected component upon reinstall
2019-02-14 15:41:25 -08:00
Sam Gateau
466da1bd05
Merge pull request #14783 from NissimHadar/20816-installOnAndroid
...
Case 20816: install on android (Mac and Windows installers)
2019-02-07 17:02:40 -08:00
Simon Walton
e62f67a847
Don't remove unselected component in Win installer
2019-02-05 10:31:59 -08:00
NissimHadar
cc3a74b7a0
Merge branch 'master' of github.com:highfidelity/hifi into 20816-installOnAndroid
2019-02-05 09:01:46 -08:00
Brad Davis
c3c22aa84c
EGL and Oculus depedency macros
2019-01-30 16:23:21 -08:00
Brad Davis
8a1a55189a
CMake cleanup and modernization
2019-01-30 16:23:14 -08:00
Shannon Romano
d8f781deae
Merge pull request #14719 from jherico/feature/quest_frame_serialization
...
case 20883: GPU frame serialization and related tools
2019-01-28 15:47:55 -08:00
NissimHadar
a2bae0b329
Fixing merge issues.
2019-01-25 18:15:26 -08:00
NissimHadar
79f096fb7e
Merge branch 'master' of github.com:highfidelity/hifi into 20816-installOnAndroid
2019-01-25 18:02:59 -08:00
Brad Davis
4b805105c7
Fix hash
2019-01-24 13:00:19 -08:00
Brad Davis
219c159a25
Switch to nvtt with no openmp dependency
2019-01-24 12:44:05 -08:00
Brad Davis
e18e3fc138
Gpu Frame serialization
2019-01-23 13:21:34 -08:00
NissimHadar
21bad12b4c
Merge branch '20550-installOnMac' of https://github.com/NissimHadar/hifi into 20550-installOnMac
2019-01-17 11:17:46 -08:00
NissimHadar
c0519c5a64
Corrected back to interface
2019-01-17 11:15:45 -08:00
NissimHadar
9593b0e764
Removed debug code.
2019-01-17 08:23:49 -08:00
NissimHadar
2307be2785
Corrections.
2019-01-16 17:30:13 -08:00
NissimHadar
b2cf8c8e18
New CMake for nitpick.
2019-01-15 15:21:48 -08:00
NissimHadar
86fb794ecf
Moved setting of NITPICK_BUNDLE_NAME
2019-01-14 14:31:10 -08:00
NissimHadar
40f83b2564
Just removed blank line
2019-01-14 14:30:07 -08:00
NissimHadar
f0dfa5edd2
Integrating Stephen's hints.
2019-01-14 12:30:58 -08:00
NissimHadar
9e61e3415c
WIP.
2019-01-11 17:26:28 -08:00
NissimHadar
2f4f0b8d80
Working on Mac installation of nitpick.
2019-01-11 14:46:02 -08:00
NissimHadar
111670556f
Added NITPICK_INSTALLER_DIR
2019-01-11 14:25:46 -08:00
NissimHadar
524a8e54e0
Can create nitpick installer.
2019-01-10 15:37:23 -08:00
Seth Alves
87878cbdee
use -shared-libasan with clang whem memory debugging is enabled
2018-11-20 10:40:32 -08:00
Brad Hefta-Gaub
22dd958582
Merge pull request #14297 from jherico/feature/vcpkg
...
Case 19807: Switch to vcpkg for many dependencies on all non-mobile platforms
2018-11-12 09:52:02 -08:00
Brad Davis
2691c39d66
PR feedback
2018-11-08 12:47:53 -08:00
Brad Davis
8c4f0ec774
Vcpkg migration
2018-11-08 12:28:06 -08:00
Roxanne Skelly
2482bb9731
Add logging for install options
2018-10-31 11:07:26 -07:00
Roxanne Skelly
1dc96fec79
Implement CR comments for installer text logging
2018-10-30 12:13:46 -07:00
Roxanne Skelly
d67598e540
Merge branch 'master' of https://github.com/highfidelity/hifi into SetupLogging
2018-10-30 10:03:05 -07:00
John Conklin II
daa13b3706
Merge pull request #14193 from misslivirose/rc75-tutorial
...
Tutorial: bug 18725 & New Menu Content
2018-10-23 15:21:29 -07:00
Stephen Birarda
7b04cbd092
Merge pull request #14183 from Atlante45/feat/ccache
...
Add ccache support for Linux and Mac
2018-10-23 13:33:46 -07:00
Brad Davis
c8e664a0a1
New SPIRV Shader toolchain
2018-10-23 10:40:12 -07:00
Brad Davis
8ce2081349
Add python discovery
2018-10-23 10:40:10 -07:00
Clement
e3e197ff5c
2 spaces in cmake files
2018-10-22 15:32:29 -07:00
Roxanne Skelly
659302d20f
Include TextLog logging include file for NSIS
2018-10-18 17:06:09 -07:00
Roxanne Skelly
48a48883b0
Add logging to the windows installer to track install options
...
and install steps
2018-10-18 16:42:22 -07:00
Liv Erickson
a6339bbe85
bug fix and new menu content
2018-10-11 17:26:05 -07:00
Stephen Birarda
b31af8c9c6
Merge pull request #14052 from birarda/macos-10.14
...
updates for deprecating cmake policies and MacOS 10.14 build
2018-10-11 11:31:43 -07:00
Atlante45
be8f4256c3
Add ccache support for Linux and Mac
2018-10-10 14:39:57 -07:00
Gabriel Calero
1719f4a474
Build libplugins_libhifiCodec.so
2018-10-05 23:49:06 -03:00
Roxanne Skelly
265bafecba
More CR Fixes
2018-10-04 15:36:31 -07:00
Roxanne Skelly
ee3fd81070
Code review fixes from birarda
2018-10-04 11:33:01 -07:00
Roxanne Skelly
34a7aff2ef
Differentiate name of Console.app/Sandbox.app depending on client_only
...
build
2018-10-01 20:12:00 -07:00
Roxanne Skelly
113ad3d917
Fixes for OSX
...
App Translocation makes it nearly impossible to find the interface
executable from the running server-console, specifically in downloaded
builds launched from the Finder. To enable OSX detection and and
launch of the interface, the code has been changed to:
* Assume interface is installed on OSX as we don't produce a server-only
build.
* Launch the interface by using 'open' with the appid.
NOTE: This may launch the wrong version of the app if
multiple instances of the app are installed, but this
is the best we can do for now. For most users, the
behavior should be as expected.
Second, polling was happening even if interface couldn't be
detected if it was previously enabled.
2018-09-30 13:11:15 -07:00
Roxanne Skelly
42cdf24f5b
Move OSX Back to Sandbox.app
2018-09-28 14:52:21 -07:00
Roxanne Skelly
1aaaca4e6c
Code review changes
2018-09-28 10:48:20 -07:00
Roxanne Skelly
308deeaa8d
Refactoring of NSIS setup files with respect to Sandbox vs Console
2018-09-27 19:54:42 -07:00
Roxanne Skelly
6d0996c254
Show "Sandbox" as the server component for server installs, show
...
"Console" for client-only installs
2018-09-27 16:52:03 -07:00
Roxanne Skelly
ba1bae6408
OSX Build fix
2018-09-26 17:43:04 -07:00
Roxanne Skelly
db772fc3fe
Update console name for osx build
2018-09-26 15:39:45 -07:00
Roxanne Skelly
be87773b2c
Checkpoint sysTray Installer
2018-09-26 10:47:33 -07:00
Stephen Birarda
eb7b7440bf
changes for cmake 3.12 and MacOS 10.14
2018-09-20 17:12:30 -07:00
Stephen Birarda
e624b0ce8e
bump deployment target to 10.9 so libc++ is default
2018-09-20 17:00:11 -07:00
Brad Davis
b6247e0850
Remove cmake spam
2018-09-06 08:59:05 -07:00
