Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-13 11:22:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
81700 commits 22 branches 28 tags 1.2 GiB
Commit graph

1558 commits

Author SHA1 Message Date
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
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
NissimHadar
faf11480b6 Working changes before merge. 2019-03-22 11:22:14 -07:00
David Back
77ea47a9db fix no name material override, hide auto scale text after sliding 2019-03-22 11:21:39 -07:00
ingerjm0
7c10fde517 Fix attributes not showing up 2019-03-22 10:34:18 -07:00
ingerjm0
33036bc867 Review of api main page 2019-03-22 10:33:47 -07:00
David Back
6956d01099
Merge pull request #15203 from dback2/avatarExporterBlockExportFromConfigMaster 
Case 21760: Avatar Exporter v0.3.7 - block exporting from Humanoid
 2019-03-22 10:23:21 -07:00
Andrew Meadows
8977aba7c7
Merge pull request #15175 from NissimHadar/21691-improveNitpickWebPage 
Case 21691: Improve nitpick web page.
 2019-03-22 10:06:08 -07:00
NissimHadar
05618931b1 Merge branch 'master' of github.com:highfidelity/hifi into 21660-updateNitpickForQuest 2019-03-22 09:55:14 -07:00
Shannon Romano
13e8baeff9
Merge pull request #15246 from ctrlaltdavid/M21846 
Case 21846: Make JSDoc use "@returns {Signal}" instead of "@signal"
 2019-03-22 09:51:28 -07:00
David Back
8db6abb58d Merge branch 'master' of https://github.com/highfidelity/hifi into avatarExporterBlockExportFromConfigMaster 2019-03-22 09:28:22 -07:00
David Rowe
ba0923a3ad Fix signal summary text 2019-03-22 12:20:22 +13:00
David Rowe
025326b85f Remove custom @signal tag 2019-03-22 12:20:10 +13:00
David Rowe
4c7d5c7da7 Detect signal functions based on their return type 2019-03-22 12:19:20 +13:00
Thijs Wenker
5e35db1f76
Merge pull request #15199 from dback2/avatarExporterOldUnityVersionsFixMaster 
Case 21751: Avatar Exporter v0.3.6 - fix 2017.4 Unity versions
 2019-03-22 00:04:15 +01:00
NissimHadar
b0e2b5fde1 Remove unneeded variable. 2019-03-21 14:47:48 -07:00
NissimHadar
e913ea7859 Merge branch 'master' of github.com:highfidelity/hifi into 21660-updateNitpickForQuest 2019-03-21 12:48:47 -07:00
NissimHadar
1f0fe7d683 Merge branch 'master' of github.com:highfidelity/hifi into 21691-improveNitpickWebPage 2019-03-21 12:47:34 -07:00
NissimHadar
661d8a0b69
Merge pull request #15140 from NissimHadar/21616-addPerTileThreshold 
Case 21616: Add per tile threshold
 2019-03-21 10:56:53 -07:00
NissimHadar
3f37024c55 Merge branch 'master' of github.com:highfidelity/hifi into 21691-improveNitpickWebPage 2019-03-21 08:35:32 -07:00
David Back
0883e5118d Merge branch 'master' of https://github.com/highfidelity/hifi into avatarExporterBlockExportFromConfigMaster 2019-03-20 16:36:07 -07:00
David Back
f42f6096c7 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarExporterOldUnityVersionsFixMaster 2019-03-20 16:26:35 -07:00
NissimHadar
b12a268464 Fixed copy-paste-drink too much error 2019-03-20 16:25:59 -07:00
Thijs Wenker
e767254710
Merge pull request #15194 from dback2/avatarExporter0.3.5ToMaster 
Case 21732: Avatar Exporter 0.3.5 to master
 2019-03-21 00:02:24 +01:00
Shannon Romano
560459f491
Merge pull request #14916 from SimonWalton-HiFi/dissectors-add-audiosolorequest 
Dissectors - Add AudioSoloRequest, BulkAvatarTraitsAck
 2019-03-20 12:46:02 -07:00
ingerjm0
76bc5c52a7 Template fixes for new API system 2019-03-20 10:20:30 -07:00
ingerjm0
b10eb4e1d9 Add intro page to API docs 2019-03-20 10:14:32 -07:00
ingerjm0
5271d2b7c8 JSDoc template updates for branding 2019-03-20 10:13:53 -07:00
NissimHadar
51ab8880e9 Corrected labels. 2019-03-19 13:25:40 -07:00
Brad Davis
ad2c4718a3 Fix loading relative files 2019-03-19 09:32:44 -07:00
sabrina-shanman
fa6a94f16a Fix not mapping identical URLs in DomainBaker 2019-03-18 17:21:05 -07:00
sabrina-shanman
b0b4307f27 Fix unsupported model types preventing DomainBaker from finishing 2019-03-18 17:02:49 -07:00
sabrina-shanman
e4cafced2a Re-name GRAP_KEY to GRAB_KEY in DomainBaker.cpp 2019-03-18 16:49:09 -07:00
David Back
e1358fd5f5 prevent export from humanoid config, cleaner scene switch 2019-03-15 16:28:46 -07:00
David Back
e8cac1f598 fix 2017 Unity versions 2019-03-15 14:14:16 -07:00
NissimHadar
b91a1d930a Missing newline. 2019-03-15 13:44:01 -07:00
NissimHadar
9e8e389e99 Improved detection of device model. 2019-03-15 13:38:43 -07:00
NissimHadar
cc2868a6f4 Can get server IP. 2019-03-15 12:46:47 -07:00
NissimHadar
748a80fed7 Store device ifconfig results in ifconfig.txt. 2019-03-14 20:02:19 -07:00
David Back
d8b4419fd0 fix null object error on cancel export 2019-03-14 17:19:21 -07:00
sabrina-shanman
20d0ca0073 Fix baked material JSONS using wrong texture paths 2019-03-14 17:09:21 -07:00
David Back
3c78e48f88 prevent warnings on embedded materials 2019-03-14 17:05:29 -07:00
David Rowe
f0bbd89546 Update JSDoc README with solution for out-of-memory problem 2019-03-15 11:05:58 +13:00
David Back
f9f2b6f8ac avatar exporter 0.3.4/0.3.5 changes to master 2019-03-14 15:03:33 -07:00
David Rowe
53b5a599b1 Reinstate avatar script type tag 2019-03-15 09:12:16 +13:00
NissimHadar
6c9c58c657 Remove unneeded wait. 2019-03-14 11:36:40 -07:00
sabrina-shanman
a3412bb25e Attempt to fix build errors 2019-03-13 16:44:50 -07:00
sabrina-shanman
b855b0e2a3 Document available bake types for baker command line 2019-03-12 18:33:41 -07:00
NissimHadar
b35b7687b7 Ready. 2019-03-12 18:32:17 -07:00
sabrina-shanman
7f77e163ac Restore 'Re-bake originals' checkbox to domain bake window 2019-03-12 18:17:11 -07:00
sabrina-shanman
ddc4f5349e Merge branch 'master' into hfm_oven_wip 2019-03-12 16:23:07 -07:00
sabrina-shanman
06d38bf8e7 Fix DomainBaker not outputting URLs relative to the Destination URL Path 2019-03-12 15:36:14 -07:00
sabrina-shanman
f9f55f08db Fix model baking GUI being less lenient with local Windows files 2019-03-12 15:36:14 -07:00
sabrina-shanman
09c30269d4 Add a note about FST support for url userinfo/query/fragment 2019-03-12 15:36:13 -07:00
sabrina-shanman
abbbeb11e1 Comment out baking for collision model, with explanation 2019-03-12 15:36:13 -07:00
sabrina-shanman
efc9f993f5 Add FSTBaker, and make ModelBaker output an FST 
Restore feature to look for baked model file in other oven directory
 2019-03-12 15:34:57 -07:00
NissimHadar
858d80073f Change default snapshots folder. 2019-03-12 13:27:36 -07:00
NissimHadar
4c7b292e1a Remove unneeded wait. 2019-03-12 10:25:40 -07:00
NissimHadar
df2fd82b61 Merge branch 'master' of github.com:highfidelity/hifi into 21616-addPerTileThreshold 2019-03-11 20:25:32 -07:00
NissimHadar
80168058f7 Correct APK installation. 2019-03-11 20:22:07 -07:00
NissimHadar
d4b77d15cc Use correct snapshots folder. 
Fix bug in APK installer.
 2019-03-11 17:11:09 -07:00
NissimHadar
6032fde5e5 Unique command line to run Interface on Quest. 2019-03-11 12:43:34 -07:00
NissimHadar
7419f9899e Modified thresholds to reduce false positives. 2019-03-09 11:54:04 -08:00
NissimHadar
687745dc7e Remove old recursive scripts that are empty. 
Don't add unneeded delays.
 2019-03-08 17:17:10 -08:00
Thijs Wenker
63c0df9945 temporary de-optimize game objects during the export process 2019-03-08 23:18:56 +01:00
NissimHadar
dbdf5fdd1f Decreased threshold after additional testing. 2019-03-08 13:53:07 -08:00
NissimHadar
1e5837f25f Enable Android buttons as needed. 2019-03-08 11:10:54 -08:00
NissimHadar
19c7c26c63 gcc / Mac compilation error. 2019-03-08 10:04:23 -08:00
NissimHadar
20e1753605 Reduced threshold a wee bit after testing on laptop. 2019-03-08 09:22:52 -08:00
David Back
571e7c1ecc update avatar exporter package 2019-03-08 09:20:19 -08:00
David Back
6fe4307d51 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarExporterDuplicateJointNames 2019-03-08 09:20:02 -08:00
NissimHadar
4caa5bd5b8 Merge branch 'master' of github.com:highfidelity/hifi into 21616-addPerTileThreshold 2019-03-08 08:54:28 -08:00
NissimHadar
c8648c7016 Added worst tile value to test. 2019-03-08 08:53:48 -08:00
Sam Gateau
11adb83f22
Merge pull request #15106 from NissimHadar/21559-increaseComparisonThreshold 
Case 21559: increased threshold to 0.9999
 2019-03-08 08:43:30 -08:00
unknown
0e1dbded22 update avatar exporter package 2019-03-07 16:19:50 -08:00
unknown
cbddffd63b Merge branch 'master' of https://github.com/highfidelity/hifi into avatarExporterMaterials 2019-03-07 16:19:20 -08:00
Shannon Romano
29960cfd5c
Merge pull request #15009 from ingerjm0/api-docs 
Add custom JSDoc template, add @signal tag
 2019-03-07 16:07:50 -08:00
Thijs Wenker
db4a33e24a
Merge pull request #14967 from dback2/avatarExporterRootName 
Case 21073: Avatar Exporter v0.3 - use root bone name from skeleton list
 2019-03-08 00:58:22 +01:00
Thijs Wenker
174e9d3915
Merge pull request #14940 from dback2/fixAvatarExporterGitIgnore 
Case 21273: Avatar Exporter - fix .gitignore to include all unneeded files
 2019-03-08 00:48:44 +01:00
NissimHadar
684f9929a9 Improved error message. 2019-03-07 12:22:07 -08:00
NissimHadar
8acec5c9e9 Increased threshold to 0.9999 2019-03-07 12:21:40 -08:00
NissimHadar
53d682d40e Merge branch 'master' of github.com:highfidelity/hifi into 21559-increaseComparisonThreshold 2019-03-07 11:32:12 -08:00
sabrina-shanman
1576125c42 Integrate HFM Asset Engine (aka model prep step) into Oven 
Add 'deduplicateIndices' parameter to FBXSerializer and make deduplicate a required parameter for extractMesh

Add draco mesh and FBX draco node version

Support generating/saving draco meshes from FBX Model nodes
 2019-03-06 15:54:12 -08:00
SamGondelman
168e47aa62 bake particles and polylines 2019-03-06 15:34:12 -08:00
SamGondelman
1a1277e9e7 it's working! 2019-03-06 15:34:12 -08:00
SamGondelman
94de0c12bc working on material baker 2019-03-06 15:34:11 -08:00
SamGondelman
4965adbc2f bake js and collision hull 2019-03-06 15:34:11 -08:00
SamGondelman
162573bc63 enable js baking from non-local file 2019-03-06 15:34:10 -08:00
SamGondelman
270b96aa8d cleaning up oven 2019-03-06 15:34:09 -08:00
sabrina-shanman
612cf43c43 Use HifiTypes.h in VHACDUtil.cpp 2019-03-06 15:22:36 -08:00
sabrina-shanman
e4d6d5af89 Streamline ModelBaker initialization and URLs 2019-03-06 15:18:19 -08:00
David Back
cea17985ff new jointRotationOffset field 2019-03-06 13:55:20 -08:00
David Back
9cc1a7aaaa CR changes 2019-03-06 13:44:27 -08:00
David Back
d063825269 export unity material data to materialMap in fst 2019-03-06 13:44:27 -08:00
NissimHadar
4e7f558af8 Merge branch 'master' of github.com:highfidelity/hifi into 21507-replaceQNetworkAccessManagerWithPython 2019-03-06 13:02:36 -08:00
Sam Gateau
f203d71159
Merge pull request #15069 from NissimHadar/21482-addSSIMResultsImage 
Case 21482: add SSIM results image
 2019-03-06 12:01:33 -08:00
NissimHadar
ab227f210d Increased threshold to 0.990 2019-03-05 16:21:32 -08:00
NissimHadar
66125e1f01 Updated version. 2019-03-05 10:21:49 -08:00
Sam Gateau
cc9a3e2541
Merge pull request #15052 from amerhifi/quest-demo 
case 21485: removing quest-demo specific changes
 2019-03-01 15:03:44 -08:00
NissimHadar
695367a3e2 Updated for Mac. 2019-03-01 14:28:23 -08:00
NissimHadar
fc3b629cfc New name. 2019-03-01 14:02:18 -08:00
NissimHadar
6697d9d49f Use python downloader. 2019-03-01 12:32:55 -08:00
NissimHadar
8dadeb197b Corrected error message. 2019-03-01 11:35:08 -08:00
NissimHadar
d4fa1e25fb Working. 2019-02-28 20:33:21 -08:00
NissimHadar
15989e3a89 WIP. 2019-02-28 11:43:16 -08:00
ingerjm0
761a922951 Fixed per code review 2019-02-25 10:43:14 -08:00
ingerjm0
75000d9a79 Add @signal tag to hifi plugin 2019-02-23 21:28:00 -08:00
ingerjm0
36c66f019d Add @signal tag to jsdoc; use custom jsdoc templates 2019-02-23 21:10:40 -08:00
NissimHadar
7cf79c1108 Now WITH installation of nitpick. 2019-02-22 15:06:42 -08:00
NissimHadar
a6ad53e79e TEST 2019-02-22 11:30:26 -08:00
amantley
87d98e5b85 These are the squashed commits for the ik optimization for the Quest 
Implmented using a new AnimSplineIK node in the anim graph

(cherry picked from commit 4fe03ba238659fee7763991f2499a315482b351f)
 2019-02-22 11:21:36 -08:00
Anthony Thibault
d4a41770d7
Merge pull request #14957 from hyperlogic/bug-fix/add-jsdoc-out-dir 
Add README.md file to tools/jsdoc/out dir to prevent jsdoc build failures
 2019-02-21 09:20:13 -08:00
unknown
d7c2231f33 use root bone name from skeleton list 2019-02-20 10:31:30 -08:00
Brad Davis
d60dcb99d2 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-19 12:37:30 -08:00
Anthony Thibault
9a0163f404 Add README.md file to tools/jsdoc/out directory to prevent jsdoc generation failures during build 2019-02-19 10:36:35 -08:00
David Back
59a1e92dd8 fix git ignore for avatar exporter 2019-02-15 16:25:04 -08:00
John Conklin II
3969a0433e
Merge pull request #14920 from NissimHadar/21193-updateNitpickReadme 
Case 21193: update nitpick readme
 2019-02-15 14:23:13 -08:00
Brad Davis
51884155ee Support Android app-specific extensions in shaders 2019-02-15 14:16:58 -08:00
John Conklin II
c7a6902e93
Merge pull request #14881 from dback2/avatarExporterTextures 
Case 20613: Avatar Exporter v0.2 - copy external textures
 2019-02-15 14:14:05 -08:00
David Back
348ac3167f move failed bone rules call, add get texture directory 2019-02-15 12:58:30 -08:00
John Conklin II
7008330641
Merge pull request #14921 from NissimHadar/fixMacError 
Compilation error on Qt 5.12
 2019-02-15 11:28:55 -08:00
NissimHadar
b77f40d300 Revert due to stable build problem on Ubuntu. 2019-02-15 09:52:57 -08:00
NissimHadar
8b2d9c36af Adding client profile combo. 2019-02-15 08:39:29 -08:00
David Back
41abacbc6f always overwrite, tweak warning 2019-02-14 17:51:32 -08:00
David Back
7cffcf2215 error handling, warnings for duplicate textures 2019-02-14 16:09:48 -08:00
NissimHadar
cf2e118c14 Added missing double-quote. 2019-02-14 14:33:49 -08:00
NissimHadar
a1e289cc1c Compilation error on Qt 5.12 2019-02-14 14:17:29 -08:00
NissimHadar
90aff53408 Merge branch 'master' of github.com:highfidelity/hifi into 21193-updateNitpickReadme 2019-02-14 13:47:16 -08:00
NissimHadar
ba68421d0c Completed manual. 2019-02-14 13:46:51 -08:00
NissimHadar
705a0bcaa0 Updated manual to include Android. 2019-02-14 13:41:54 -08:00
David Back
4e4ec9940f copy external texture dependencies 2019-02-14 11:38:39 -08:00
NissimHadar
6752092899 Removed unnecessary member variable. 2019-02-14 10:38:19 -08:00