Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
68622 commits 2 branches 0 tags 1.1 GiB
Commit graph

1564 commits

Author SHA1 Message Date
Simon Walton
01ef636411 Merge branch 'master' into snoretoast 
Two simple conflicts fixed.
 2018-06-13 11:19: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
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
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