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

1679 commits

Author SHA1 Message Date
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
Stephen Birarda
38606f83c8 add SERVER_ONLY handling for installer generation 2018-03-20 14:22:37 -07:00
Stephen Birarda
932c55ca08 handle client section in component-less install 2018-03-20 14:22:37 -07:00
Stephen Birarda
6ee6f88087 only add components to cmake for multi-component installer 2018-03-20 14:22:12 -07:00
Stephen Birarda
f93935f5f6 change PR build compression to bzip2 2018-03-20 14:21:52 -07:00
Stephen Birarda
c743bfcf27 templatize conditional for selection of server component 2018-03-20 14:21:52 -07:00
Stephen Birarda
1405c8fcb3 add a client only option to cmake 2018-03-20 14:20:58 -07:00
Stephen Birarda
0074c0470d
Merge pull request #12524 from birarda/feat/runtime-beside-exe 
switch back to app-local VC runtimes and UCRT
 2018-03-20 14:07:27 -07:00
John Conklin II
afcfbfe721
Merge pull request #12644 from Atlante45/feat/ga-installer 
Add Google Analytics to installer
 2018-03-20 12:07:29 -07:00
Atlante45
0117179fe4 Pull GA ID from env variables 2018-03-19 14:49:19 -07:00
Stephen Birarda
283eccd043 remove unneeded ANDROID block, revert removed line in NSIS 2018-03-15 16:21:49 -07:00
Atlante45
bbe98f61a6 Pull GUID storage in Registry for now. 2018-03-15 12:20:19 -07:00
Stephen Birarda
499defe77e grab VS2013 redistributables that are needed by externals 2018-03-15 12:20:07 -07:00
Ryan Huffman
6552aeac4d Fix quazip not building with correct build type 2018-03-15 12:17:35 -07:00
Stephen Birarda
10dd16ae8d remove VS redist handling from NSIS template 2018-03-14 17:59:04 -07:00
Atlante45
2fe9f6df6f Add google analytics to installer 2018-03-14 14:17:38 -07:00
Seth Alves
3ee41c71e4
Merge pull request #12529 from Atlante45/fix/nvtt-mac 
Fix NVTT for mac
 2018-03-13 11:28:42 -07:00
Atlante45
2067c95931 Fix NVTT for mac 2018-03-01 18:05:05 -08:00
Stephen Birarda
0d7d382540 pass additional exclusions to windeployqt 2018-02-28 16:42:25 -08:00
Stephen Birarda
e1421f2e3a switch back to app-local VC runtimes and UCRT 2018-02-28 10:45:08 -08:00
Brad Davis
6254e2b569 PR feedback 2018-02-27 09:11:40 -08:00
Brad Davis
aeb29db37d Merge remote-tracking branch 'upstream/stable' into android_stable 2018-02-22 17:35:00 -08:00
Bradley Austin Davis
fd007e845d Squashed scribe changes 2018-02-07 10:29:29 -08:00
Bradley Austin Davis
6092f1503e Fixing android build 2018-02-06 17:22:06 -08:00
Brad Davis
d087530423 Add nvtt to android build 2018-02-02 13:42:26 -08:00
Olivier Prat
ac92b3c130 Merge branch 'master' of http://github.com/highfidelity/hifi into scribe 2018-02-02 14:01:59 +01:00
Bradley Austin Davis
b97c938544
Merge pull request #12216 from thoys/feat/js-script-console-auto-complete 
JS scripting console auto-complete
 2018-01-31 10:39:51 -08:00
John Conklin II
2ae9395283
Merge pull request #12299 from highfidelity/stable 
Merge stable back into master
 2018-01-30 20:03:06 -08:00
Atlante45
97729e8f41 Cleanup bad install 2018-01-30 17:10:06 -08:00
Atlante45
d155d19198 Fix cmake install cmd 2018-01-30 17:08:10 -08:00
Atlante45
bc819c698e Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back 2018-01-30 16:09:30 -08:00
Atlante45
019a2d346c Fix spaces 2018-01-30 12:04:01 -08:00
Atlante45
edfffc575a Handle multiple targets for add_crashpad 2018-01-30 11:48:01 -08:00
Atlante45
db08f1dda6 Move backtrace to interface 2018-01-30 11:39:48 -08:00
Seth Alves
2a6ff80911 fix indentation 2018-01-30 09:13:47 -08:00
Thijs Wenker
8fdbac521f move ADD_CUSTOM_QRC_PATH function to its own file 2018-01-27 19:58:15 +01:00
Thijs Wenker
898c99e5b8 append file jsdoc json file to resources.rcc resource file 2018-01-27 19:50:52 +01:00
Seth Alves
b7303414f2 unmangle merges 2018-01-26 11:57:30 -08:00
Atlante45
093fff9c9e Add crashpad 2018-01-26 09:20:38 -08:00
Seth Alves
47f44eb21f extirpate bugsplat 2018-01-26 09:20:23 -08:00
Atlante45
ced5aad1d1 backtrace for rc-63 2018-01-26 09:20:07 -08:00
Thijs Wenker
45487a1e45 Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete 
# Conflicts:
#	interface/CMakeLists.txt
 2018-01-25 22:51:35 +01:00
Olivier Prat
95882e0cde Merged with master 2018-01-24 10:51:54 +01:00
Thijs Wenker
79dbde6a6f optional auto-complete build (requires NPM installed) 2018-01-23 23:01:59 +01:00
Olivier Prat
604817bb59 Forgot to fix output custom command on all other platforms than Windows 2018-01-17 19:21:58 +01:00
Olivier Prat
54690219e3 Changed the way shader type is sent to Scribe 2018-01-17 11:12:37 +01:00
Olivier Prat
7b420d48e2 Generated shader files are now grouped in a sub-filter group in the project 2018-01-17 10:59:48 +01:00
Olivier Prat
3911ce59cc Scribe now outputs .h and .cpp. Need to change how shader source is referenced in C++ code 2018-01-16 19:02:12 +01:00
Bradley Austin Davis
bac3388693 Fixing Linux build 2018-01-15 09:09:30 -08:00
Brad Davis
55bfdc105b Switch android to GLAD 2018-01-14 10:22:18 -08:00
Brad Davis
acb95d1355 GLAD polish 2018-01-14 00:10:05 -08:00
Brad Davis
51a0131414 Fix linkage 2018-01-12 19:37:28 -08:00
Brad Davis
ab7aa52a10 GLES emulaton on windows 2018-01-12 19:17:35 -08:00
Olivier Prat
814de4ab81 Scribe now outputs shaders as cpp files. 2018-01-12 11:59:19 +01:00
Brad Davis
22d133c71f Allow GLES client on desktop builds 2018-01-11 23:31:34 -08:00
Brad Davis
7a7aee770c Switching to binary resources 2018-01-10 13:39:56 -08:00
Gabriel Calero
76b38bebad Make Interface run in Android 2018-01-03 16:36:11 -03:00
Brad Davis
c6bc6f6ef2 Merge remote-tracking branch 'upstream/master' into android_nov 2017-12-16 16:20:16 -08:00
Brad Davis
0379ebad63 Updating android toolchain for QML 2017-12-07 11:19:31 -08:00
Stephen Birarda
99b5b8942a add file download command to install step 2017-12-06 12:15:42 -08:00
Stephen Birarda
008b4285f5 don't use cmake sys library install, grab vcredist as external 2017-12-06 11:35:14 -08:00
Stephen Birarda
c329a58c14 ignore vcredist when performing fixup_bundle 2017-12-06 11:26:34 -08:00
Bradley Austin Davis
5febbc32f5 CMake header cleanup 2017-11-28 13:54:46 -08:00
Bradley Austin Davis
a30395e945 Tweaking android cmake 2017-11-28 13:46:01 -08:00
Brad Davis
8d6d1f67f1 Support RELEASE_TYPE and RELEASE_NUM for Android 2017-11-28 11:32:36 -08:00
Bradley Austin Davis
ddc2548c53 Add polyvox, fix task copy bugs 2017-11-28 11:32:34 -08:00
Bradley Austin Davis
d6072f2bf2 Add bullet and draco to precompiled libraries 2017-11-28 11:32:34 -08:00
Brad Davis
d769acd345 Updating Android toolchain 2017-11-28 11:32:32 -08:00
Ken Cooke
c324f342b4 Fix to check ANDROID before UNIX 2017-11-09 13:39:13 -08:00
Ken Cooke
9a1386bf0d Fix build errors on Linux 2017-11-09 10:34:52 -08:00
Ken Cooke
6d019b4302 Update the audio codecs 2017-11-08 18:16:42 -08:00