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

1831 commits

Author SHA1 Message Date
Thijs Wenker
8a76753135 Merge branch 'master' of https://github.com/kasenvr/project-athena into feature/gha_vircadia 2020-05-07 11:07:28 +02:00
kasenvr
5c2dab6ba5
Merge pull request #314 from kasenvr/kasen/core 
Update master with kasen/core's latest changes
 2020-04-25 14:46:01 -04:00
Thijs Wenker
0ebe33b447 change upload server 2020-04-19 22:50:52 +02:00
Thijs Wenker
25932d3ab5 the new build upload script 2020-04-19 22:50:51 +02:00
kasenvr
0acf959fb6
Apply suggestions from code review 
Co-Authored-By: David Rowe <david@ctrlaltstudio.com>
 2020-04-10 17:13:24 -04:00
David Rowe
ffeb37e7aa Merge remote-tracking branch 'hifi/master' into merge-hifi-master 
# Conflicts:
#	CMakeLists.txt
#	README.md
#	cmake/externals/glad32es/CMakeLists.txt
#	cmake/externals/glad41/CMakeLists.txt
#	cmake/externals/glad45/CMakeLists.txt
#	cmake/externals/polyvox/CMakeLists.txt
#	cmake/externals/quazip/CMakeLists.txt
#	cmake/externals/vhacd/CMakeLists.txt
#	cmake/init.cmake
#	cmake/ports/hifi-deps/CONTROL
#	cmake/ports/sdl2/CONTROL
#	cmake/ports/sdl2/disable-hidapi-for-uwp.patch
#	cmake/ports/sdl2/enable-winrt-cmake.patch
#	cmake/ports/sdl2/fix-arm64-headers.patch
#	cmake/ports/sdl2/fix-x86-windows.patch
#	cmake/ports/sdl2/portfile.cmake
#	cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
#	cmake/ports/tbb/portfile.cmake
#	hifi_vcpkg.py
#	interface/src/avatar/MyAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
#	libraries/avatars/src/AvatarData.h
#	libraries/entities-renderer/src/RenderableEntityItem.h
#	libraries/entities/src/EntityItem.cpp
#	libraries/entities/src/EntityItem.h
#	libraries/fbx/src/GLTFSerializer.cpp
#	libraries/graphics-scripting/src/graphics-scripting/Forward.h
#	libraries/networking/src/AddressManager.cpp
#	libraries/networking/src/DomainHandler.h
#	libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
#	libraries/render-utils/src/HighlightEffect.cpp
#	libraries/render-utils/src/MeshPartPayload.cpp
#	libraries/render-utils/src/Model.cpp
#	libraries/render-utils/src/RenderShadowTask.cpp
#	libraries/script-engine/src/WebSocketClass.cpp
 2020-04-09 16:46:27 +12:00
Kasen IO
0588fd3f4f API docs rebranded to Vircadia. 2020-04-07 02:11:29 -04:00
Kasen IO
fff819f56c Fix sidebar not showing on first load. 2020-03-27 16:07:59 -04:00
David Rowe
1112367b06 Handle localStorage not being available 2020-02-02 20:57:56 +13:00
Kasen IO
eaa6151ff3 == to === 2020-01-31 13:53:46 -05:00
Kasen IO
d8ba64785f Fix tabs 2020-01-31 13:24:24 -05:00
Kasen IO
0eac20d830 toggle works + viewport restriction removed. 2020-01-30 13:12:46 -05:00
Kasen IO
a8000f876b menu show/hide button added. 2020-01-30 12:17:09 -05:00
Kasen IO
d3e2f7204b init 2020-01-30 11:30:31 -05:00
Kasen IO
b10ffc667f remove non codeblock bg for code, add weight to all for visibility. 2020-01-24 10:42:46 -05:00
Kasen IO
6ec6b39530 code comments brighter, code blocks now have padding for readability. 2020-01-24 10:14:55 -05:00
Kasen IO
4f56a847d7 Bugfix for init val. 2020-01-24 08:16:13 -05:00
Kasen IO
2eca2cf10e Theme + button bg matches sidebar. 2020-01-23 22:52:34 -05:00
Kasen IO
d373826d03 Fixed theme selection loading bug. 2020-01-23 18:37:15 -05:00
Kasen IO
717c20fc84 Fixed persistence bug. 2020-01-23 16:04:31 -05:00
Kasen IO
615c01d058 Disabled dev mode on Vue, fixed persistence, updated styles. 2020-01-23 15:52:22 -05:00
Kasen IO
3c1665df02 Updated some colors. 2020-01-23 13:54:01 -05:00
Kasen IO
53d05f9fee Night mode set to default + toggle implemented. 2020-01-23 13:47:59 -05:00
Kasen IO
78bf9e9a2f Vue.JS + Vuetify init + test. 2020-01-23 02:55:50 -05:00
Marcus Llewellyn
6ac090dea5 Quick fix for the metaverse API 
We did have the dfault metaverse API as metaverse.projectathena.io, but that doesn't not yet exist, and it turns out we can't just do a redirect. So for now changing it to metaverse.highfidelity.com
 2020-01-14 20:33:39 -06:00
Marcus Llewellyn
0fbaada57b
Merge pull request #54 from sethalves/fix-linux-build-0 
fix linux build
 2020-01-14 18:44:01 -06:00
Marcus Llewellyn
e5dd23b922
Merge pull request #33 from kasenvr/feature/metaverse-url-switching 
Ability to change Metaverse API from setting
 2020-01-14 18:40:04 -06:00
David Rowe
195f8867d8 Disable API docs old analytics 2020-01-14 12:48:16 +13:00
David Rowe
60e2c2b520 API docs rebranding 2020-01-09 10:38:58 +13:00
Seth Alves
82bddeb5a7 fix linux build 2020-01-03 10:27:43 -08:00
David Rowe
f7336d9141 Fix @hideconstructor JSDoc tag hiding classes' properties 2019-12-23 14:12:50 +13:00
Kasen IO
c34cd996df change Metaverse API from setting 2019-12-20 11:39:05 +01:00
Brad Hefta-Gaub
42b69332f7
Merge pull request #16564 from ctrlaltdavid/DOC-239 
DOC-239: Rates JSDoc
 2019-12-13 10:36:39 -08:00
Brad Davis
1ac7215ac8 Fix GA S3 upload path 2019-12-10 12:44:49 -08:00
David Rowe
73ad5d1d31 Fix some JSDoc typos noticed in passing 2019-12-10 13:34:32 +13:00
Simon Walton
82ed358323 Merge remote-tracking branch 'upstream/master' into linux-actions-builds 
Also merge in Linux PR build
 2019-12-05 16:19:12 -08:00
Brad Davis
697f445edd Merge remote-tracking branch 'upstream/master' into ga/master_build 2019-12-04 08:44:12 -08:00
Brad Davis
8844620116 Change s3 key prefix 2019-12-03 12:06:51 -08:00
Brad Davis
f39088fb0b Github Actions master builds 2019-12-03 10:56:04 -08:00
Simon Walton
c38fe5b2aa Another dummy statement 2019-12-01 23:25:14 -08:00
Simon Walton
0d52462578 Dummy Dockerfile statement 2019-11-30 00:18:25 -08:00
Simon Walton
c88479610d Use correct path for hifi.conf; copy DS resources to image 2019-11-27 15:19:22 -08:00
jennaingersoll
c9bdd54b1d
Merge pull request #16541 from ctrlaltdavid/DOC-233 
DOC-233: MaterialCache JSDoc
 2019-11-27 14:56:42 -08:00
Simon Walton
35fe7fe00c Build from updated base docker image; copy over supervisor hifi.conf 2019-11-27 12:25:18 -08:00
Anthony J. Thibault
764b6a9adf code review feedback 2019-11-26 10:52:21 -08:00
David Rowe
fafb3dd30b MaterialCache JSDoc 2019-11-26 17:43:23 +13:00
Simon Walton
30f3525932
Merge branch 'master' into linux-actions-builds 2019-11-22 18:02:48 -08:00
Anthony J. Thibault
320095f765 Added animedit avatar-animation.json graph editor tool 2019-11-22 15:40:44 -08:00
Seth Alves
ea2c6b4dfb fix linux build 2019-11-22 11:35:23 -08:00
Simon Walton
9e5c0a7afc Copy quazip lib to build dir; built server-console 2019-11-21 15:02:08 -08:00
Simon Walton
51cf9fab8e Take out .so copy 2019-11-20 23:51:21 -08:00
Simon Walton
27d3b493fa Initial Linux GHA build 2019-11-20 16:15:39 -08:00
Maia Hansen
48cdbcf933
Merge pull request #16401 from jherico/github_actions 
DEV-2773: GitHub actions initial work
 2019-11-19 11:46:52 -08:00
Brad Davis
d4b3a9ba49 Github actions 2019-11-18 15:20:37 -08:00
sabrina-shanman
f39121c53b Fix build error/warning 2019-11-12 09:52:58 -08:00
sabrina-shanman
7b14c00540 Merge branch 'master' into instancing 2019-11-05 10:22:24 -08:00
HifiExperiments
bae2ba7bae merge with master 2019-11-02 01:08:56 -07:00
HifiExperiments
6e5217b80d fix build error, add environment variable 2019-11-02 01:03:34 -07:00
Sabrina Shanman
05ac16536e
Merge pull request #16436 from highfidelity/master 
Merge master into instancing
 2019-10-31 17:39:15 -07:00
Anthony Thibault
f99bb3ec77
Merge pull request #16400 from hyperlogic/feature/arkit-blendshapes 
Extended avatar blendshape support for ARKit compatiblity
 2019-10-31 12:33:50 -07:00
Shannon Romano
8d6434fbca
Merge pull request #16367 from ctrlaltdavid/DOC-199 
DOC-199: AudioScope JSDoc
 2019-10-30 13:45:13 -07:00
Sabrina Shanman
e8b963b59a
Merge pull request #16425 from highfidelity/master 
Merge master into instancing
 2019-10-30 09:16:04 -07:00
danteruiz
bc207638a5 Merge branch 'master' of github.com:highfidelity/hifi into qt-launcher 2019-10-25 10:15:39 -07:00
danteruiz
58a3cf6e67 finishing qt-lite build info 2019-10-25 10:13:23 -07:00
Sabrina Shanman
e74de214e2
Merge pull request #16404 from highfidelity/master 
Merge master into instancing
 2019-10-25 09:55:44 -07:00
HifiExperiments
1e100a672e merge with master and try to fix opacity mode stuff 2019-10-23 22:21:45 -07:00
Anthony J. Thibault
d43d12dfa7 Merge branch 'master' into feature/arkit-blendshapes 2019-10-23 21:45:10 -07:00
danteruiz
850dcb839d adding build qt-lite build rules 2019-10-23 14:39:34 -07:00
David Rowe
2591aed686 Exclude AudioScope API from JSDoc output 2019-10-24 09:20:24 +13:00
danteruiz
1d3be46068 Merge branch 'master' of github.com:highfidelity/hifi into qt-launcher 2019-10-23 10:17:46 -07:00
Bradley Austin Davis
6cb1421978 Qt patch for mac video 2019-10-21 16:09:48 -07:00
Sam Gateau
695b9cdba6 Clening up left over comments and typos, simplify the code to update Matrices in the model classes and removed renderITemsIdMap because not needed, chasing the problem of the physics objects transform 2019-10-18 03:31:06 -07:00
Anthony J. Thibault
da0911e01b Delete legacy blendshape code 
Move FaceshiftConstants to BlendshapeConstants.
Delete FaceTracker and DdeFaceTracker classes.
Delete old facetracker menu and preferences
 2019-10-16 10:36:37 -07:00
dante ruiz
7474f3f721 add qt-lite-mac-config.opt 2019-10-15 16:27:14 -07:00
Sabrina Shanman
63fa9afa13
Merge pull request #16323 from highfidelity/master 
Merge master into instancing
 2019-10-09 16:59:54 -07:00
Shannon Romano
a52b8acf4d
Merge pull request #16306 from huffman/feat/hq-launcher-serverless 
DEV-2374: Add serverless content back to launcher builds
 2019-10-09 16:15:58 -07:00
Shannon Romano
7aa28f29d2
Merge pull request #16224 from ctrlaltdavid/DOC-111 
DOC-110, DOC-111, DOC-167: JSDoc fixes and tidying
 2019-10-08 10:01:21 -07:00
David Rowe
f224832d27 Merge branch 'master' into DOC-111 2019-10-08 20:44:13 +13:00
Ryan Huffman
bab1a902a5 Add serverless content back to launcher builds 2019-10-07 15:44:57 -07:00
Brad Davis
b2bcf54b5b Removing frame converter 2019-10-04 19:52:55 -07:00
Brad Davis
243120b95c Even better frame capture 2019-10-04 14:57:39 -07:00
Brad Davis
88514540d1 Fixing tools build 2019-10-04 09:26:33 -07:00
Brad Davis
cc1be64850 Fixing build issues 2019-10-04 09:20:02 -07:00
Brad Davis
3c6e98f16b New format for captured GPU frames 2019-10-04 08:34:06 -07:00
danteruiz
97644eb335 Merge branch 'master' of github.com:highfidelity/hifi into qt-launcher 2019-10-02 16:44:00 -07:00
Sam Gateau
1d19671e88 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-01 11:27:16 -07:00
Shannon Romano
e8f1eecc5b
Merge pull request #16258 from samcake/yellow 
DEV-1815: Investigating rendering issues with opacity map and adding tools to debug resource caches
 2019-09-30 16:36:24 -07:00
Shannon Romano
3d813b525e
Merge pull request #16230 from MattHardcastle/add-notarize-script 
[INFRA-196] Add mac notarization script
 2019-09-30 11:56:40 -07:00
Sam Gateau
9b8d159873 remove unused variable 2019-09-30 09:24:37 -07:00
Sam Gateau
ecd940e0e6 Addressing warnings 2019-09-27 14:01:00 -07:00
Sam Gateau
9d999baab2 FIrst pass to clean up before pushing a pr: 2019-09-26 11:59:01 -07:00
Sam Gateau
ba11c3e702 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-25 17:54:21 -07:00
Clement
96b58756b1 Add flag for account settings feature 2019-09-24 16:50:10 -07:00
Matt Hardcastle
f0f9fa0a80 [INFRA-196] Add mac notarization script 
The `notarize` script signs and submits a bundle to Apple's notarization
service. This command is meant for use as the part of release process
and its us is documented on the internal wiki.

    https://highfidelity.atlassian.net/wiki/spaces/hifiOps/pages/532710623/Sign+and+notarize+a+build+on+macOS

Jira: https://highfidelity.atlassian.net/browse/INFRA-196
 2019-09-20 15:00:38 -07:00
David Rowe
c2e5748452 Move classes' details above constructor 2019-09-20 10:16:43 +12:00
David Rowe
d02a111e69 Increase font sizes of Parameters and Example headings and example code 2019-09-20 09:18:44 +12:00
David Rowe
77fcda90c8 Remove Description section from Global page 2019-09-20 08:50:06 +12:00
David Rowe
78b7c04457 Fix white space in generated API docs 2019-09-20 08:09:51 +12:00
David Rowe
43a0ed48fd Fix JSDoc template HTML issues 2019-09-17 16:25:34 +12:00
Sam Gateau
18226e64f8 Add a read lock where we think it s needed and banging my head on the problem 2019-09-16 18:06:43 -07:00
sabrina-shanman
76b1f551b1 Merge branch 'master' into instancing 2019-09-16 10:17:59 -07:00
sabrina-shanman
5837053f50 Fix miscellaneous build errors/warnings 2019-09-13 16:56:30 -07:00
Sam Gateau
802326d4da Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-12 17:01:37 -07:00
Shannon Romano
6a78ea1471
Merge pull request #16139 from jennaingersoll/api-docs 
API docs formatting updates
 2019-09-12 13:09:28 -07:00
Sam Gateau
133a8b7d5e a bunch of changes to debug why... 2019-09-11 18:21:44 -07:00
jennaingersoll
d548afb277
Removed indent per review 2019-09-11 17:06:35 -07:00
sabrina-shanman
01b29c3aac Fix DomainBaker not finishing when Re-bake originals checked and 
.baked.fbx present
 2019-09-09 10:43:08 -07:00
ingerjm0
2322a9ea7f Making sure ctrlaltdavid's changes made it into my repository 2019-09-05 13:58:59 -07:00
ingerjm0
55bdc7d2a6 Made sure ctrlaltdavid's changes made it into my repo 2019-09-05 13:54:55 -07:00
ingerjm0
b8b7dbf681 DOC-148: Increase size of monospace type 2019-09-05 13:39:06 -07:00
ingerjm0
d8c655a151 Fixed spacing issues in navigation caused by fix to to DOC-156 2019-09-05 11:42:34 -07:00
ingerjm0
af7e68786a DOC-156 (comment): Fixed spacing on non-paragraph text 2019-09-05 11:29:13 -07:00
ingerjm0
9bf579d878 DOC-156: Fix font size issues on non-paragraph text 2019-09-05 11:08:25 -07:00
ingerjm0
5ebf141d73 DOC-67: Incorrect location of example code for Avatar API 2019-09-05 10:39:18 -07:00
ingerjm0
2502abe963 Merge branch 'master' of https://github.com/highfidelity/hifi into api-docs 2019-09-05 10:17:38 -07:00
ingerjm0
5aef2d674a DOC-69: Move Supported Script Types section to top of JSDoc pages 2019-09-05 10:12:59 -07:00
HifiExperiments
97b9179144 merge with master 2019-09-05 00:46:56 -07:00
dante ruiz
4c5de120b7 enable post build script for qt launcher 2019-09-04 09:13:22 -07:00
jennaingersoll
037ad36262
Merge pull request #16103 from ctrlaltdavid/DOC-64 
DOC-64: ScriptDiscoveryService API JSDoc
 2019-08-30 22:35:39 -07:00
Andrew Meadows
43cd543226
Merge pull request #16084 from sabrina-shanman/test-profile 
(DEV-359) Per-profile test reference images (C++ component)
 2019-08-26 16:36:01 -07:00
sabrina-shanman
e0b4734917 Add missing bullet point when test.md step has image with unknown test filter 2019-08-26 14:37:37 -07:00
sabrina-shanman
ad1a98b85a Trim else after return 2019-08-26 14:30:47 -07:00
sabrina-shanman
388a70502e Fix indexing typo in joinVector 2019-08-26 14:28:04 -07:00
David Rowe
233a1528df Add support for examples in API description section 2019-08-27 09:24:01 +12:00
sabrina-shanman
bc2cc11c06 Fix build warnings 2019-08-26 12:35:18 -07:00
sabrina-shanman
e4369feec5 Factor out directory parsing from md file output 2019-08-26 11:33:03 -07:00
sabrina-shanman
1ae66c6c10 Show expected images side-by-side rather than creating one MD file per 
image set
 2019-08-26 10:57:57 -07:00
sabrina-shanman
5e3777999d Revert unfinished alternative implementation 2019-08-26 10:57:49 -07:00
sabrina-shanman
acd07e904f Output profile-specific md files corresponding to profile images 2019-08-26 10:57:24 -07:00
ingerjm0
7ffcee35dd Fix formatting in API docs (DOC-112, DOC-113, DOC-142, DOC-143) 2019-08-22 15:37:34 -07:00
sabrina-shanman
2dbf3de58a Allow more image names to be used as Nitpick test reference images 2019-08-21 14:17:43 -07:00
David Rowe
11f8387a5a Fix typo noticed in passing 2019-08-17 16:56:35 +12:00
David Rowe
dbb964d415 Report type of callback as "function" in JSDoc 2019-08-17 16:56:01 +12:00
David Rowe
ed6407d2bd Fix callback functions' display in JSDoc 2019-08-16 21:07:34 +12:00
Clement
be534f2127 Add --version to the Oven 2019-08-09 17:11:07 -07:00
Shannon Romano
0b71cac84b
Merge pull request #16043 from sethalves/fix-linux-build-shared-nitpick 
BUGZ-1205: fix Linux builds when -DBUILD_SHARED_LIBS=ON
 2019-08-09 13:15:47 -07:00
Seth Alves
5bf6fd3977 on Linux, allow -DBUILD_SHARED_LIBS=ON to build when memory-debugging is enabled 2019-08-07 16:28:39 -07:00
David Rowe
e2748a861a Merge branch 'master' into DOC-98 
# Conflicts:
#	libraries/platform/src/platform/backend/Platform.cpp
 2019-08-03 11:22:23 +12:00
Andrew Meadows
f07352ab2c add MaterialCache to oven's DependencyManager 2019-07-31 13:39:52 -07:00
dante ruiz
58dea69ecf create zip file for launcher 2019-07-25 15:41:34 -07:00
David Rowe
bce3e9bd6b PlatformInfo API JSDoc update 2019-07-26 10:32:19 +12:00
Simon Walton
f567777f24 Don't read HMAC for 'nonverified' packets 2019-07-18 12:57:13 -07:00
Clement
6ddccafa6b Use absolute path 2019-07-12 15:29:05 -07:00
Clement
b93ec08f5a Modify path to resources 2019-07-12 14:05:02 -07:00
Clement
54a2619b70 Move ci scripts to hifi repo 2019-07-12 14:03:09 -07:00
SamGondelman
60600779c9 merge with master 2019-07-12 11:01:17 -07:00
Shannon Romano
22e9628e77
Merge pull request #15662 from SamGondelman/uber2 
DEV-203: Add ability for .slp files to define shader variants
 2019-07-03 18:03:56 -07:00
jennaingersoll
938b9e25f9
Merge pull request #15861 from jennaingersoll/signal-fix 
DOC-66: Show deprecated notices for signals.
 2019-07-02 10:21:56 -07:00
ingerjm0
292dce3e88 DOC-66: Show deprecated notices for signals. 2019-07-01 14:38:56 -07:00
jennaingersoll
b6cefd8dfb
Merge pull request #15786 from ChristophHaag/patch-1 
Update jsdoc to avoid breakage with recent node
 2019-06-27 13:06:12 -07:00
Sam Gondelman
e4847cc4ae
Merge branch 'master' into proceduralMesh 2019-06-24 10:16:45 -07:00
Anthony Thibault
96179328e0 nitpick: [mac] preserve symlinks when installing interface.app 2019-06-19 11:20:32 -07:00
Christoph Haag
bd22baad72
Update jsdoc to avoid breakage with recent node 2019-06-18 16:26:30 +02:00
Brad Davis
595fe0cdfe Fix launcher signing for windows 2019-06-11 15:52:25 -07:00
Brad Davis
ee8235358a Fixing the launcher signing 2019-06-11 14:51:43 -07:00
Brad Davis
56bde0432e Tricking the builds system 2019-06-11 14:25:18 -07:00
Brad Davis
782e0e63dc Another go at signing 2019-06-11 13:37:56 -07:00
Brad Davis
a86e41f898 More logging on signing / non-signing conditional 2019-06-11 13:00:36 -07:00
Brad Davis
40a20aac0d Add signing for the windows launcher 2019-06-11 11:25:19 -07:00
Bradley Austin Davis
844397d86c
Merge pull request #15689 from jherico/light-launcher-win 
DEV-77: Light launcher Windows build
 2019-06-10 18:43:44 -07:00
Brad Davis
ecfc3613b0 Enable windows launcher build 2019-06-10 16:44:19 -07:00
SamGondelman
37feb7f027 merge with master 2019-06-10 10:29:39 -07:00
Howard Stearns
6394d14f2a
Merge pull request #15687 from SimonWalton-HiFi/dissectors-message-limits 
Dissectors: Limit message number & position values
 2019-06-06 17:03:09 -07:00
Simon Walton
d2e9abd72c Tweak limits; add comment 2019-06-06 15:01:54 -07:00
Simon Walton
a5c2ce472e unsourced additions from Howard 2019-06-06 11:08:16 -07:00
Simon Walton
ecbce8201b Dissectors: Limit message number & position values 2019-06-05 18:17:24 -07:00
Brad Davis
0bc0c73ef2 Enable mac launcher builds 2019-06-05 15:16:01 -07:00
Brad Davis
3cb5b7716e Light Launchers 2019-06-05 11:18:16 -07:00
Sam Gondelman
16a56dc1ec
Merge branch 'master' into proceduralMesh 2019-06-04 09:56:25 -07:00
SamGondelman
68d2f9581f add ability for slp files to define shader variants 2019-06-03 19:16:42 -07:00
Anthony J. Thibault
154fd393ba Bug fix for crash in QScriptEngine::reportAdditionalMemoryCost() 
This fix requires a patch to qt.  This build includs a new pre-built Qt 5.12.3 with the patch applied.
See tools/qt5-builder/qtscript-crash-fix.patch to see actual patch applied.

* Touched bullet3 portfile to create new vckpg hash
* New urls for qt assets which include qscript patch hifi_vcpkg.py
* Updated tools/qt5-builder/ with qscript patch and README.md directions.

https://highfidelity.atlassian.net/browse/BUGZ-46

A qt bug was filed to hopefully get this bug fixed upstream.
https://bugreports.qt.io/browse/QTBUG-76176
 2019-06-03 17:11:54 -07:00
Simon Walton
987d5e7662
Merge pull request #15650 from SimonWalton-HiFi/dissectors-stun-filter 
Use STUN RFC magic number to filter for such packets
 2019-05-30 15:47:50 -07:00
Brad Hefta-Gaub
85389aa5b9
Merge pull request #15649 from hyperlogic/bug-fix/qt-symbols-for-mac 
Update mac qt build
 2019-05-30 12:04:44 -07:00
Simon Walton
bffd87b331 Fallback for STUN packets 2019-05-30 11:41:12 -07:00
Simon Walton
d620d3511f Add packet-len check 2019-05-29 18:21:37 -07:00
Simon Walton
ddffa62468 Use STUN RFC magic number to filter for such packets 2019-05-29 18:10:48 -07:00
Anthony J. Thibault
ddf1543d68 Update mac qt build 
* Reformat whitespace in README.md
* hifi_vckpg.py: Remove macos var/temp hack for vcpkg
* hifi_vckpg.py: Add ability to override HIFI_QT_INSTALL_ROOT dir with environment variable.
* hifi_vckpg.py: Update macos url for pre-built qt 5.12.3 on S3.
* cmake/ports/bullet3/portfile.cmake: add comment to force change in vcpkg hash.
* tools/qt-builder/README.md: updated formatting and added details about how to generate symbols for macos and pc
* tools/qt-builder: added prepare python scripts for symbols
* cmake/macros/SetupQt.cmake: Remove hardcoded var/temp qt cmake path
 2019-05-29 17:11:24 -07:00
Brad Davis
568d3ab1f9 Fix release build zip name 2019-05-29 09:19:11 -07:00
Brad Davis
4d0eb65121 Post-build script tweaks 2019-05-28 15:22:03 -07:00
Brad Hefta-Gaub
f9773dfdd8
Merge pull request #15615 from jherico/feature/post-build-script 
DEV-50: Add postbuild script
 2019-05-24 09:17:37 -07:00
Anthony J. Thibault
a7874fa556 Update windows build with symbols for release qt-5.12.3 
hifi_vcpkg.py will now download a new version of qt that contains release symbols.
made minor changes to bullet3/portfile.cmake to trigger a new vkpkg hash.
 2019-05-23 14:10:06 -07:00
Brad Davis
cdf71f40d5 Add postbuild script for CI server 2019-05-23 10:55:39 -07:00
Sam Gondelman
a7842fe3ea
Merge branch 'master' into proceduralMesh 2019-05-21 09:51:33 -07:00
SamGondelman
da254c2ccc (¬‿¬) 2019-05-15 23:48:04 -07:00
Andrew Meadows
4cf9673dbb Merge master into 22007-hifiQtBuildv2 2019-05-15 14:10:30 -07:00
Clement
b3d0705e39 Extend ICE logging + make it more searchable 2019-05-08 18:38:00 -07:00
NissimHadar
f1593cad70 Updated readmes. 2019-05-05 17:16:38 -07:00
NissimHadar
6ff6c0c410 Reverted erroneous commit. 2019-05-04 18:45:27 -07:00
NissimHadar
844fbec36f So that both Jenkins and local Mac are happy. 2019-05-04 18:09:54 -07:00
NissimHadar
c9e372aa53 Updated for Ubuntu 16.04/18.04 2019-05-04 17:30:10 -07:00
NissimHadar
ec4a3fed43 Using Andrew's configure line. 2019-05-03 21:20:18 -07:00
NissimHadar
80bf1e592d Allow build on both Ubuntu 16.04 (Jenkins) and 18.04 2019-05-03 20:37:40 -07:00
NissimHadar
604f506dec Merge branch '22007-hifiQtBuildv2' of github.com:NissimHadar/hifi into 22007-hifiQtBuildv2 2019-05-03 19:24:45 -07:00
NissimHadar
88a89de7c6 Merge branch 'master' of github.com:highfidelity/hifi into 22007-hifiQtBuildv2 2019-05-03 19:18:34 -07:00
NissimHadar
9dfcb675ca Moved script. 2019-05-01 10:47:40 -07:00
NissimHadar
cd276d2745 Merge branch 'master' of github.com:highfidelity/hifi into 22007-hifiQtBuildv2 2019-04-29 14:37:43 -07:00
NissimHadar
52636564a1 Added macdeployqt to local builds for nitpick. 2019-04-29 12:36:02 -07:00
NissimHadar
7eaa45f5c1 Added macdeployqt to local builds. 2019-04-29 12:33:23 -07:00
NissimHadar
79f73cf06c Minor cleanup 2019-04-27 22:52:55 -07:00
NissimHadar
88f2cfa965 Updated for Ubuntu 16.04 2019-04-27 22:22:57 -07:00
NissimHadar
03b4d1b472 Updated readme. 2019-04-27 11:00:15 -07:00
NissimHadar
6f7cc6d07f Corrected README.md for Mac. 2019-04-26 16:27:02 -07:00
NissimHadar
b84f8110f0 Updated for Mac. 2019-04-26 15:53:38 -07:00
NissimHadar
ced1f7d82b Typo 2019-04-26 15:30:40 -07:00
NissimHadar
08ca27bf42 Add qt.conf and updated README.md 2019-04-26 15:30:00 -07:00
Anthony Thibault
2c370d9d74
Merge pull request #15460 from hyperlogic/feature/network-opt-faux 
Avatar network bandwidth optimization
 2019-04-26 10:16:30 -07:00
SamGondelman
cde84982d0 fix baking 2019-04-25 15:56:56 -07:00
SamGondelman
6ce6877dfa Merge remote-tracking branch 'upstream/master' into textureUsage 2019-04-25 15:05:27 -07:00
NissimHadar
a4d5aa8eac Merge branch 'master' of github.com:highfidelity/hifi into 22007-hifiQtBuildv2 2019-04-25 14:26:29 -07:00
SamGondelman
a66c515c2a fix url issue and always generateIrradiance 2019-04-25 11:36:29 -07:00
NissimHadar
450bc96c39 Cleanup. 2019-04-25 08:53:25 -07:00
NissimHadar
db77fda626 testing. 2019-04-25 07:46:23 -07:00
NissimHadar
331f692e34 Cleanup of readme. 2019-04-24 17:39:02 -07:00
NissimHadar
2009ce95b2 Updated readme. 2019-04-24 11:37:46 -07:00
NissimHadar
030f172999 Updated readme for "Fix" 2019-04-24 10:28:11 -07:00
Shannon Romano
4148ebfd18
Merge pull request #15447 from SamGondelman/materialData 
Case 22329: Don't try to bake materialURL if it points to materialData
 2019-04-24 09:26:52 -07:00
Shannon Romano
6da5608ae4
Merge pull request #15430 from huffman/fix/domain-baker-not-finishing 
Case 22309: Fix domain baker not finishing (merge to master)
 2019-04-24 09:19:25 -07:00
Shannon Romano
a6ff19c4ee
Merge pull request #15377 from sethalves/remove-unwanted-view-menuitems 
case 22175: remove view/Independent-Mode and view/Entity-Mode menu items
 2019-04-24 09:13:59 -07:00
NissimHadar
4b7a3ac332 Cleaned up readme 2019-04-23 19:00:30 -07:00
NissimHadar
960443323f Cleaned up readme 2019-04-23 18:47:43 -07:00
NissimHadar
70531bca52 Updated with new Ubuntu zip instructions. 2019-04-23 16:51:27 -07:00
SamGondelman
3b746384ca really fix texture baking, and turn off irradiance generation during baking 2019-04-23 16:01:31 -07:00
NissimHadar
68f9b473a6 Updated python interface. 2019-04-23 15:06:17 -07:00
SamGondelman
1c888d63f0 don't try to bake materialURL if it points to materialData 2019-04-23 13:44:36 -07:00
NissimHadar
c9d128ae71 testing 2019-04-23 10:39:52 -07:00
NissimHadar
0179ba8e67 testing - removed oven. 2019-04-23 09:12:47 -07:00
NissimHadar
4b26ef7c0f Updated with upload to AWS instructions. 2019-04-22 16:19:40 -07:00
Anthony Thibault
e28775b091 Update avatar dissector to account for has flag bit reorder 2019-04-22 15:37:53 -07:00
SamGondelman
7245d1a037 handle texturebakers with same url but different usage 2019-04-22 13:24:34 -07:00
NissimHadar
0da6e088cb Updated readme. 2019-04-22 13:15:10 -07:00
SamGondelman
98a7e4e711 fix version not being preserved 2019-04-22 11:34:58 -07:00
Anthony J. Thibault
5971ddbe24 Improvements to wireshark plugin 
* properly decodes AvatarData packets embedded within BulkAvatarData packets
* Keeps a running total of all the different types of data within the AvatarData packet.
  This is useful for breaking down how much bandwidth is consumed by each sub-section.

(cherry picked from commit f8bca69819afddc506641009133208d16835fbd2)
 2019-04-22 10:54:18 -07:00
NissimHadar
71bf3f2e14 Installation folder can be made. 2019-04-21 20:18:59 -07:00
Ryan Huffman
15e4df2b61 Fix domain baker not finishing (threading, material key) 
This addresses 2 cases where the domain baker would not finish

1. For material baking, we were storing a value in
_entitiesNeedingRewrite with a different key than what
we use when we later remove it from _entitiesNeedingRewrite

2. The domain baker runs on a worker thread. When starting a
baker for an item in the domain, we do an invokeMethod,
which will happen synchronously if the baker ends up on the
same thread as the thread that the domain baker is on.
This can cause issues if the baker finishes immediately.
The case I saw was a local model url that immediately failed,
and finished before return from the invokeMethod in the domain baker .
 2019-04-19 15:32:51 -07:00
Shannon Romano
4962bc8c10
Merge pull request #15395 from SamGondelman/oven 
Case 22213: Fix materialJSON paths in domain baker
 2019-04-19 10:39:42 -07:00
Shannon Romano
828677cd10
Merge pull request #15335 from NissimHadar/22067-updateNitpickToUseNewHifiURLs 
Case 22067: Added 'metaverse' to dev-build URL - v3.2.1
 2019-04-19 09:23:49 -07:00
Sam Gondelman
4f9911a655
Merge pull request #15356 from NissimHadar/22096-addVHACDUtilToInstaller 
Case 22096: Added vhacd-util and Oven to all installers.
 2019-04-18 20:25:02 -07:00
Sam Gateau
e6c76cdb19
Merge pull request #15329 from Zvork/amc 
case 22219: Improved ambient maps
 2019-04-17 10:20:53 -07:00
SamGondelman
23918258d9 fix materialJSON paths in domain baker 2019-04-16 10:30:09 -07:00
sabrina-shanman
8f87afd7db Disable baking of embedded material textures in material entities 2019-04-15 15:00:14 -07:00
Seth Alves
feda884c71 remove view/Independent-Mode and view/Entity-Mode menu items and related code. Leave the modes available for scripts. 2019-04-12 09:21:48 -07:00
David Rowe
ca3f45163f Merge branch 'master' into M21989 2019-04-11 10:37:34 +12:00
SamGondelman
de3f07cea4 remove js option from parser 2019-04-09 16:39:46 -07:00
NissimHadar
3e292c4b03 Install both oven and vhacd in both client and client+server builds. 2019-04-09 12:30:34 -07:00
NissimHadar
13f0b97d07 Added install_beside_console 2019-04-09 10:40:04 -07:00
NissimHadar
781949da4c Added package_libraries_for_deployment. 2019-04-08 18:33:33 -07:00
NissimHadar
523253aa13 Added vhacd-util to all installers. 2019-04-08 18:21:04 -07:00
SamGondelman
7cbda006a0 disable jsbaker 2019-04-08 11:03:21 -07:00
Sam Gondelman
88c278d357
Merge pull request #15319 from SamGondelman/materialBaker 
Case 21764: Oven bakes model materials directly to separate material description
 2019-04-05 17:08:22 -07:00
NissimHadar
6f5786e017 Added 'metaverse' to dev-build URL. 2019-04-05 12:25:25 -07:00