Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 09:18:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
80673 commits 74 branches 59 tags 1.2 GiB
Commit graph

1764 commits

Author SHA1 Message Date
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