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

1239 commits

Author SHA1 Message Date
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
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
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
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
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
NissimHadar
701c18c9eb Correction to recursive scripts. 2019-02-14 08:58:09 -08:00
NissimHadar
58c0078188 Reversed order of recursive calls. 2019-02-13 21:07:25 -08:00
NissimHadar
301b4215e5 Fixed gcc warning. 2019-02-13 19:13:08 -08:00
NissimHadar
be5f9b211b Add nitpick to production (but not stable) builds 2019-02-13 18:09:06 -08:00
NissimHadar
56483f4884 Check that zipped folder name is in correct format. 2019-02-13 15:18:07 -08:00
NissimHadar
86aaba016f Narrow filter on zip folder selection. 2019-02-13 15:15:46 -08:00
NissimHadar
12c122ce9c Bump up version number. 2019-02-13 15:14:36 -08:00
NissimHadar
77b679606f Corrected bug in zip folder name. 2019-02-13 15:13:55 -08:00
Shannon Romano
8a07e2b31a
Merge pull request #14895 from ctrlaltdavid/M21132 
Case 21132: Add "Avatar Script" classification to relevant JSDoc APIs
 2019-02-13 10:35:00 -08:00
Shannon Romano
6ca4a2776e
Merge pull request #14903 from NissimHadar/21129-improveNitpickUsability 
Case 21129: improve nitpick usability
 2019-02-13 09:54:53 -08:00
Shannon Romano
1330b108d6
Merge pull request #14890 from sabrina-shanman/gltf_mat-support 
(case 20980) Add support for Roughness/Metallic in GLTF models
 2019-02-13 08:16:00 -08:00
NissimHadar
9ed1470175 Corrected case. 2019-02-12 19:10:34 -08:00
sabrina-shanman
efd22172b4 Add final missing CMake includes 2019-02-12 17:27:04 -08:00
NissimHadar
305ce74659 Updated the Windows installation instructions. 2019-02-12 11:11:59 -08:00
NissimHadar
0b1034c290 Improved wording of error message. 2019-02-12 11:11:22 -08:00
NissimHadar
6225d97357 Check for adb and python when needed. 
Look for adb and python in PATH.
 2019-02-12 09:06:04 -08:00
Brad Davis
e534270f9a Merge remote-tracking branch 'upstream/master' into feature/quest_custom_plugins 2019-02-11 15:41:32 -08:00
David Rowe
5428bb19dc Add "Avatar Script" JSDoc API classification 2019-02-12 11:49:49 +13:00