Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-15 10:57:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
77773 commits 25 branches 28 tags 1.2 GiB
Commit graph

1388 commits

Author SHA1 Message Date
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
Sam Gateau
e6c76cdb19
Merge pull request #15329 from Zvork/amc 
case 22219: Improved ambient maps
 2019-04-17 10:20:53 -07:00
sabrina-shanman
8f87afd7db Disable baking of embedded material textures in material entities 2019-04-15 15:00:14 -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
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
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
Shannon Romano
f926298020
Merge pull request #15297 from NissimHadar/21984-fixNitpickCMake 
Case 21988: Use place holder instead of RCC file.
 2019-03-29 13:16:56 -07:00
NissimHadar
709515dd74 Use place holder instead of RCC file. 2019-03-29 11:48:15 -07:00
Olivier Prat
7455ddb7ba Created Image class to encapsulate some transforms with QImage 2019-03-29 12:23:44 +01:00
NissimHadar
705e6432a7 Merge branch 'master' of github.com:highfidelity/hifi into 21660-updateNitpickForQuest 2019-03-28 12:46:36 -07:00
NissimHadar
d230fc86db CR comments. 2019-03-28 12:23:25 -07:00
David Back
57c3620587 update package 2019-03-28 11:28:14 -07:00
David Back
4ddbdbbb6c fix bone rule warnings 2019-03-28 11:27:47 -07:00
NissimHadar
de1c40e994 Changed version. 2019-03-28 11:27:35 -07:00
Olivier Prat
cef9e454d5 Working beta pipeline 2019-03-28 16:44:22 +01:00
NissimHadar
e95efc29e4 Bug fix after code review. 2019-03-27 19:00:28 -07:00
SamGondelman
310d01feff wip 2019-03-27 15:44:01 -07:00
Sam Gondelman
ffbf678695
Merge pull request #15217 from jherico/fix/framereader_files 
Case 21793: Fix loading relative files
 2019-03-27 10:52:35 -07:00
Olivier Prat
aa4401801e Added new texture types : sky and ambient in place of just cube 2019-03-27 11:54:45 +01:00
SamGondelman
3d2b71bc7b remove all existing material parsing 2019-03-26 17:16:13 -07:00
Shannon Romano
1d5f9cc0ec
Merge pull request #15149 from ctrlaltdavid/M21222 
Case 21222: Agent, Avatar, and MyAvatar JSDoc
 2019-03-26 15:43:32 -07:00
David Rowe
9a1bb27034 AnimationCache, ModelCache, SoundCache, and TextureCache JSDoc 2019-03-26 13:58:43 +13:00
David Rowe
cf4370ed3a Merge branch 'master' into M21222 2019-03-26 09:44:48 +13:00
ingerjm0
2b858c4ef5 Show deprecated statement in method details 2019-03-22 11:56:29 -07:00
ingerjm0
ba9426e14e Fixed font size in docs 2019-03-22 11:56:04 -07:00
NissimHadar
a8dba041a2 Merge branch 'master' of github.com:highfidelity/hifi into 21660-updateNitpickForQuest 2019-03-22 11:24:18 -07:00