Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 15:22:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
80640 commits 71 branches 56 tags 1.2 GiB
Commit graph

1508 commits

Author SHA1 Message Date
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
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
Olivier Prat
1322fef568 Taking into account samuel's remarks 2019-04-05 20:15:58 +02:00
Olivier Prat
a45b91c4be Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-05 09:01:03 +02:00
David Rowe
28dfac64ba Merge branch 'master' into M21460 
# Conflicts:
#	libraries/image/src/image/Image.h
 2019-04-05 17:50:46 +13:00
Shannon Romano
82a8a79172
Merge pull request #15229 from ingerjm0/api-docs 
JSDoc template and branding changes
 2019-04-04 16:51:33 -07:00
ingerjm0
3dbb2b1812 Fix build error for template changes 2019-04-04 15:08:39 -07:00
NissimHadar
8eb428bc77
Merge pull request #15313 from NissimHadar/22021-specificThresholdsPerGPUVendor-v3.2.0 
Case 22021: specific thresholds per GPU vendor v3.2.0
 2019-04-04 12:42:26 -07:00
NissimHadar
4f97899045 Moved position of GPU vendor combo. 2019-04-04 11:31:06 -07:00
Sam Gateau
eee5f87dcd
Merge pull request #15264 from Zvork/hdr 
Case 22045: Added support for OpenEXR files (mostly for skyboxes)
 2019-04-04 10:32:11 -07:00
NissimHadar
3ba5f8e574 Use place holder instead of RCC file. 
(cherry picked from commit 709515dd74)
(cherry picked from commit 4e4526fbb2)
 2019-04-03 15:25:34 -07:00
David Rowe
2a17ad3da5 AvatarList and AvatarManager JSDoc 2019-04-04 10:11:54 +13:00
Olivier Prat
eadace70f8 Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-03 18:19:46 +02:00
NissimHadar
813d467f49 Ready. 2019-04-03 07:43:07 -07:00
NissimHadar
863fce6321 Change version number. 2019-04-03 07:42:00 -07:00
NissimHadar
a856d10798 Improved error message. 2019-04-03 07:39:59 -07:00
SamGondelman
14bd5ed687 remove need for destination path 2019-04-02 16:53:49 -07:00
NissimHadar
0ace57b396 Tested on Mac. 2019-04-02 13:04:14 -07:00
David Back
8de75604cf
Merge pull request #15270 from dback2/avatarExporterWarningFixes 
Case 20964, 21758: Avatar Exporter v0.4.1 - bone rule fixes
 2019-04-02 12:20:39 -07:00
NissimHadar
0e0714c398 Can detect GPU and set combo default. 2019-04-02 11:57:55 -07:00
NissimHadar
efd9a8935e Clean-up. 2019-04-02 08:59:05 -07:00
SamGondelman
75a246b82d simplifying material baker and support bump/gloss maps 2019-04-01 22:35:28 -07:00
Olivier Prat
4e39a063f7 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2019-04-01 11:08:41 +02:00
Olivier Prat
7af4a52587 Merge branch 'hdr' into amc 2019-04-01 10:44:38 +02:00
Olivier Prat
20f53f5de3 Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-01 10:04:41 +02:00