Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-18 13:16:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
75302 commits 69 branches 56 tags 1.2 GiB
Commit graph

1649 commits

Author SHA1 Message Date
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
Liv Erickson
acf1afea01 fix audio files playing swapped input, trying to amplify audio playback 2018-07-31 15:41:59 -07:00
Liv Erickson
9ec14c1f0d update bubble context for RC 71 2018-07-30 18:03:26 -07:00
Clement
f038ba96b5 Move a couple dependency archives to dependencies 2018-07-13 10:52:32 -07:00
Clement
5a80eb646a Fix bad URL 2018-07-13 10:36:01 -07:00
Clement
284329209b Added missing MD5 2018-07-12 18:14:06 -07:00
Clement
e35cb374ae Re-host dependencies and update URLs to hifi.com 2018-07-12 18:04:10 -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
Clement
85f56e2aa7 Remove Mac domain exception 2018-07-10 17:41:07 -07:00
Clement
b5252da3f2 CR 2018-07-10 16:53:11 -07:00
Clement
107c5d74ac Generate debug symbols for Macos Release 
And then strip them from the binary
 2018-07-09 15:51:36 -07:00
Brad Hefta-Gaub
f8f206c2f9
Merge pull request #13450 from misslivirose/master 
MS14398: Make tutorial not grabbable
 2018-07-07 21:18:15 -07:00
Clement
d9d72774d8 Add exception for backtrace requests 2018-07-06 15:51:40 -07:00
Clement
72dbbd816b Fix cmake 2018-07-05 15:07: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
SimonWalton-HiFi
21b2187f66
Merge branch 'master' into check-pfx-file 2018-07-03 13:22:27 -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
Liv
2fe9913d22 update tutorial content 2018-06-22 20:48:59 -04:00
SamGondelman
64fdb8fe62 simplify etc2comp cmake 2018-06-21 09:32:39 -07:00
Sam Gondelman
ad00e1bdca
Merge pull request #13394 from sethalves/fix-osx-etclib-relwithdebinfo 
fix etclib link when building RelWithDebInfo on OSX
 2018-06-18 14:26:47 -07:00
Gabriel Calero
583c46b3a0 Merge remote-tracking branch 'upstream/master' into breakpad_android 2018-06-15 21:21:03 -03:00
Seth Alves
b60e3c6c7b fix etclib link when building RelWithDebInfo on OSX 2018-06-15 17:09:32 -07: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
Simon Walton
929f6f3059 Only try to sign a Win installer if we have a private key file 2018-06-13 16:42:05 -07:00
Simon Walton
ce7a10c143 Add AppUserModelID to desktop shortcut for Sandbox also 2018-06-13 15:30:35 -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
John Conklin II
99b5835098
Merge pull request #13344 from birarda/feat/new-version-numbers 
handle semantic version numbers in interface/sandbox update
 2018-06-13 11:16:56 -07:00
Clement
920263ef49 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-06-12 17:00:25 -07:00
Stephen Birarda
be64f4bcbf
Merge pull request #12917 from kitely/cmake-fixes 
CMake fixes
 2018-06-11 10:51:49 -07:00
Stephen Birarda
7a9d77d0d9 force git abbreviated SHA to have length of 7 2018-06-08 17:21:09 -07:00
Stephen Birarda
8dd268addb handle semantic version updates in sandbox 2018-06-08 17:21:06 -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
Sam Gateau
c53a15ec78
Merge pull request #13314 from jherico/feature/oculus_update 
Update Oculus integration
 2018-06-07 11:45:31 -07:00
Bradley Austin Davis
e38059797d Update Oculus integration 2018-06-06 17:27:30 -07:00
Ryan Huffman
f87775c269 Update serverless content to v2 2018-06-05 10:03:39 -07: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
John Conklin II
6095a3b319
Merge pull request #13082 from jherico/feature/shader_cache 
Shader load time performance optimiziations
 2018-05-30 13:55:34 -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
Simon Walton
ef4d09c5e2 Add app user-model IDs to Sandbox shortcut and use in server-console 2018-05-30 10:21:07 -07:00
Simon Walton
65bb4c218e Distinguish appIDs for production & nonproduction 2018-05-25 11:02:49 -07:00
Stephen Birarda
c03b9833fd
Merge pull request #13233 from highfidelity/RC68 
Merge RC68 back to master
 2018-05-24 16:55:44 -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
Andrew Meadows
7e03b8b33c one more try to eliminate windows compile warnings 2018-05-24 11:28:52 -07:00
Andrew Meadows
da7dc487cc remove windows build warnings in Bullet lib 2018-05-24 11:28:52 -07:00
Andrew Meadows
1112609ae7 upgrade to Bullet-2.88 2018-05-24 11:28:52 -07:00
Simon Walton
f0570557b2 Assign a Win 'appUserModelId' and use it for toaster popups (notifications) 2018-05-24 10:56:17 -07:00
Ryan Huffman
3554334dfc Update serverless tutorial for RC68 2018-05-24 10:27:00 -07:00
Andrew Meadows
1c0f6818a3 apply orenh1's patch to make GLM-0.9.8.5 compile on updated linux 2018-05-23 14:52:28 -07:00
Andrew Meadows
aedb5cc746 upgrade to glm-0.9.8.5 2018-05-23 14:52:28 -07:00
SamGondelman
282e61c085 patch etc2comp for mac 2018-05-21 16:20:09 -07:00
SamGondelman
12b91a2ab7 compress skyboxes 2018-05-18 13:18:43 -07:00
SamGondelman
6b268191c8 local compression, patched etc2comp 2018-05-15 14:05:21 -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
Seth Alves
a245bb2174 fix libquazip debug filename. link libatomic where needed 2018-04-28 13:30:28 -07:00
Stephen Birarda
e9ac581309 update RC67 serverless content to include default path 2018-04-26 16:31:31 -07:00
Stephen Birarda
d3661ac22c use baked uncompressed KTX skyboxes for macOS compatibility 2018-04-25 18:23:45 -07:00
John Conklin II
282d319972
Merge pull request #12977 from birarda/feat/new-serverlesss-tutorial 
update serverless content for RC67
 2018-04-25 13:23:22 -07:00
Stephen Birarda
005a2bce14 update to serverless content for RC67 2018-04-23 16:29:40 -07:00
Stephen Birarda
02c1cd2d50 optionally use campaign serverless content during install 2018-04-23 13:54:47 -07:00
Stephen Birarda
0da51672bb don't stop image slideshow when install concludes 2018-04-19 18:52:45 -07:00
Stephen Birarda
7ecc279e00 show default or campaigned slideshow during install 2018-04-19 17:58:21 -07:00
Oren Hurvitz
cd06067030 Fixed based on PR review 2018-04-18 10:18:29 +03:00
Oren Hurvitz
5cdcf1c53e Eliminated spurious "resolved_item" warnings in CMake 
Previously, building the project produced many warnings with this message:
    "resolved_item == resolved_embedded_item - not copying..."

These warnings are distracting as they make it difficult to see actual warnings. This commit changes the warnings to status messages.

This fix was copied from: https://github.com/jherico/OculusMinimalExample/blob/master/cmake/templates/FixupBundlePostBuild.cmake.in
 2018-04-17 11:53:37 +03:00
Ken Cooke
3630198c27
Merge pull request #12886 from kencooke/audio-gverb-deadcode 
Remove dead code
 2018-04-16 08:20:38 -07:00
John Conklin II
6def70791e
Merge pull request #12864 from sethalves/backtrace-annotations 
switch to backtrace's newer crashpad blob
 2018-04-13 15:34:05 -07:00
Ken Cooke
ee6e9ee81e Remove dead code left over from Gverb 2018-04-13 10:36:13 -07:00
Clement
157ca8cd68 Update docs with correct qt version 2018-04-12 16:21:26 -07:00
Stephen Birarda
16f6ac5295 use serverless content with baked skybox and help textures 2018-04-11 13:53:13 -07:00
John Conklin II
005b55f997
Merge pull request #12853 from birarda/new-serverless-tutorial 
RC66: fix unreadable baked textures in serverless tutorial
 2018-04-11 13:44:21 -07:00
Seth Alves
625905007f use new filename for new blob 2018-04-11 11:49:53 -07:00
Seth Alves
366498c6d3 switch to backtrace's newer crashpad blob 2018-04-11 11:44:49 -07:00
Stephen Birarda
7ec65e8c0c fix unreadable baked textures in serverless tutorial 2018-04-10 17:02:37 -07:00
Stephen Birarda
0d237f84b0 remove the installer information file during uninstall 2018-04-10 14:56:47 -07:00
John Conklin II
f6721d4ad0
Merge pull request #12802 from birarda/client-only-installer-name 
66 fix - installer changes for client only name and clean install
 2018-04-06 11:53:22 -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
2e3db99f7e update to serverless tutorial with RC66 fixes 2018-04-05 17:17:00 -07:00
Stephen Birarda
16335a3b4b only remove selected components on clean install, leave wallet 2018-04-05 17:09:38 -07:00
Stephen Birarda
55a3dc3a49 make client/server only installers have special naming 2018-04-05 13:55:37 -07:00
Seth Alves
60ed033667 new content md5 2018-03-26 14:33:08 -07:00
Stephen Birarda
b52a877d8d optionally grab serverless tutorial, on for installers 2018-03-26 14:32:11 -07:00
Stephen Birarda
cfdf8c2588 handle launch client option for client only 2018-03-20 14:22:37 -07:00
Stephen Birarda
45d16731c3 fix abort of setup options page for express client 2018-03-20 14:22:37 -07:00
Stephen Birarda
9a664f25dc setup custom or express label correctly in installer 2018-03-20 14:22:37 -07:00