Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-08 04:52:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
87349 commits 17 branches 0 tags 1.1 GiB
Commit graph

744 commits

Author SHA1 Message Date
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
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
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
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
SamGondelman
68d2f9581f add ability for slp files to define shader variants 2019-06-03 19:16:42 -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
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
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
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
NissimHadar
5aff0bf3e9 Make sure vcpkg'ed version of windeployqt.exe is used. 2019-04-25 15:07:34 -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
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
NissimHadar
75e1437274 Use optional environment variable for timestamp server URL 2019-04-05 14:55:23 -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
89fbe131c2 Yet another try at fixing compilation 2019-03-27 13:56:11 +01:00
Olivier Prat
7791401b0e Trying to fix Ubuntu & Mac builds. 2019-03-27 11:17:22 +01:00
Olivier Prat
d2011481bf Successfull buid and link of Oven with OpenEXR 2019-03-26 11:37:32 +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
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
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
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
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 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
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
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
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
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
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
Brad Davis
b6247e0850 Remove cmake spam 2018-09-06 08:59:05 -07:00
John Conklin II
b28aa3951f
Merge pull request #13802 from jherico/feature/scribe_programs 
Migrating to scribe program descriptors
 2018-08-20 14:48:54 -07:00
John Conklin II
3f92430bb6
Merge pull request #13369 from SimonWalton-HiFi/check-pfx-file 
Don't sign a production Windows installer if there's no key file
 2018-08-20 11:14:00 -07:00
Brad Davis
f03370c826 Migrating to scribe program descriptors 2018-08-09 17:58:34 -07:00
Brad Davis
e6fb2a9e15 Add scribe source files to project 2018-08-03 21:57:53 -07:00
Brad Davis
ae8f841912 Shader refactoring for explicit bindings 2018-08-03 14:58:11 -07:00
Brad Davis
04e84f1d23 Moving to cmake time shader compiling 2018-08-03 14:58:11 -07:00
Simon Walton
dc5da4e22b Add cmake variable BYPASS_SIGNING to control signing-file behaviour 2018-08-01 16:35:14 -07:00
John Conklin II
de33ca512f
Merge pull request #13553 from Atlante45/feat/crashpad-mac 
Add Crashpad to Mac
 2018-07-11 19:16:24 -07:00
Stephen Birarda
b4b0131065 grab correct commit hash for conflicting PR 2018-07-05 14:33:21 -07:00
Clement
546ee2b96f cleanup cmake code 2018-07-05 14:18:09 -07:00
Stephen Birarda
bbc757a193
Merge pull request #13385 from marko8904/timestampServerUpdate 
Updated time stamping server for authenticode signatures
 2018-06-29 16:46:22 -07:00
Gabriel Calero
583c46b3a0 Merge remote-tracking branch 'upstream/master' into breakpad_android 2018-06-15 21:21:03 -03:00
Marko Kudjerski
0ac1ea078e Updated time stamping server for authenticode signatures 
Symantec's time stamp server seems to be more robust.
 2018-06-15 08:20:58 -07:00
SimonWalton-HiFi
66cad7831e
Merge branch 'master' into snoretoast 2018-06-13 12:10:51 -07:00
Simon Walton
01ef636411 Merge branch 'master' into snoretoast 
Two simple conflicts fixed.
 2018-06-13 11:19:56 -07:00
Stephen Birarda
7a9d77d0d9 force git abbreviated SHA to have length of 7 2018-06-08 17:21:09 -07:00
Stephen Birarda
112abc9d7e
Merge pull request #13148 from birarda/feat/new-version-numbers 
add SHA to PR/master version, add build_type (stable/master/pr/dev)
 2018-06-08 14:44:22 -07:00
Gabriel Calero
3911a93a38 Merge remote-tracking branch 'upstream/master' into breakpad_android 2018-06-07 19:00:16 -03:00
Gabriel Calero
8869af069e Integrate Breakpad in android Interface 2018-06-07 18:59:43 -03:00
Simon Walton
97613f1f07 Only set app ID on sandbox link 
Also pass down the app ID from CMake files to installer and
server-console.
 2018-06-01 14:13:52 -07:00
Sam Gondelman
ae3b933a80 Merge branch 'master' into etc2comp 2018-05-30 17:17:03 -07:00
Stephen Birarda
b9e9c952de fix setting of abbreviated SHA for master builds 2018-05-30 12:15:39 -07:00
Stephen Birarda
33a122c08e remove short SHA where it should not appear 2018-05-30 12:05:07 -07:00
Bradley Austin Davis
3beb77694f Cached shader binaries and uniform data for shaders 2018-05-24 12:42:33 -07:00
Stephen Birarda
2c9648daaf grab correct SHA for PR_BUILD, fatally error if not found 2018-05-24 12:04:32 -07:00
Stephen Birarda
2cb7c9cc62 add a BUILD_TYPE to BuildInfo, fix conditional 2018-05-24 12:04:32 -07:00
Stephen Birarda
7c852916b9 fail master/PR build without short SHA 2018-05-24 12:03:33 -07:00
Stephen Birarda
c3595a3216 pass STABLE_BUILD instead of BUILD_BRANCH through cmake 2018-05-24 12:03:03 -07:00
Stephen Birarda
50baccdb63 add the short SHA to master and PR build version 2018-05-24 12:02:13 -07:00
SamGondelman
12b91a2ab7 compress skyboxes 2018-05-18 13:18:43 -07:00
vladest
fee3cc0aca Implemented backend for About dialog 2018-05-15 15:49:20 +02:00
SamGondelman
eede3ff1ba Merge remote-tracking branch 'upstream/master' into etc2comp 2018-05-11 11:23:33 -07:00
Brad Davis
e9dc3c650b Breakup building and testing 2018-05-09 13:20:47 -07:00
SamGondelman
07600f2a81 add etc2comp dependency on desktop and android 2018-05-08 17:30:48 -07:00
Clement
157ca8cd68 Update docs with correct qt version 2018-04-12 16:21:26 -07:00
Stephen Birarda
a2250a2a6d write an install info ini file to the installation dir 2018-04-05 18:52:07 -07:00
Stephen Birarda
55a3dc3a49 make client/server only installers have special naming 2018-04-05 13:55:37 -07:00
Stephen Birarda
b52a877d8d optionally grab serverless tutorial, on for installers 2018-03-26 14:32:11 -07:00