Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 17:12:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
76691 commits 67 branches 56 tags 1.2 GiB
Commit graph

1663 commits

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