Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-13 08:17:32 +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
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
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
Simon Walton
d604f9adfb Add AudioSoloRequest, BulkAvatarTraitsAck; also decode obfuscated protocols 2019-02-13 18:18:47 -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
NissimHadar
d3e0aa5d8c Make sure only top-level recursive script runs recursively. 2019-02-10 20:32:38 -08:00
NissimHadar
b2fb7a737b Ready for testing. 2019-02-09 13:21:36 -08:00
NissimHadar
dff98f462f Removed unnecessary of spaces. 2019-02-09 13:13:13 -08:00
NissimHadar
6598f83d39 Removed debug code. 2019-02-08 11:22:39 -08:00
NissimHadar
4727123e5f Do not include nitpick in production builds. 2019-02-08 10:25:18 -08:00
NissimHadar
80392b1724 Removed unneeded copying of SSL DLL's. 2019-02-07 18:21:24 -08:00
Sam Gateau
466da1bd05
Merge pull request #14783 from NissimHadar/20816-installOnAndroid 
Case 20816: install on android (Mac and Windows installers)
 2019-02-07 17:02:40 -08:00
Brad Davis
d3301803d3 Support custom display / input plugin lists and small tweaks 2019-02-07 15:15:26 -08:00
NissimHadar
cf83124968 Improved instructions. 2019-02-07 14:57:25 -08:00
NissimHadar
c168d31e07 Added missing ". 2019-02-07 14:52:59 -08:00
NissimHadar
bab306fd30 Added instruction to add Python to path. 2019-02-07 14:38:53 -08:00
NissimHadar
03ad14caaf Removed unneeded step. 2019-02-07 14:17:18 -08:00
NissimHadar
f9396fe597 Corrected error message. 2019-02-07 14:11:59 -08:00
NissimHadar
89eff9171e Merge branch '20816-installOnAndroid' of github.com:NissimHadar/hifi into 20816-installOnAndroid 2019-02-06 14:29:30 -08:00
NissimHadar
8f09c5b689 Updated readme. 2019-02-06 14:28:19 -08:00
NissimHadar
cc3a74b7a0 Merge branch 'master' of github.com:highfidelity/hifi into 20816-installOnAndroid 2019-02-05 09:01:46 -08:00
Bradley Austin Davis
2db5bbd381 Fix mac frame player 2019-01-30 16:23:22 -08:00
Brad Davis
b8d8079590 Enable transforming a frame to use only relative paths 2019-01-30 13:15:23 -08:00
Brad Davis
ab9a4a55f8 Allow movement in frameplayer app 2019-01-30 13:15:22 -08:00
Jamil Akram
cc38a96bff
Merge pull request #14415 from Atlante45/feat/rc-branch-script 
RC branch script
 2019-01-29 16:32:49 -08:00
Shannon Romano
d8f781deae
Merge pull request #14719 from jherico/feature/quest_frame_serialization 
case 20883: GPU frame serialization and related tools
 2019-01-28 15:47:55 -08:00
Thijs Wenker
a8f95c8916
Merge pull request #14703 from dback2/avatarExporterImprovements 
Avatar Exporter v0.1 - add bone rules and versioning
 2019-01-28 17:45:33 +01:00
NissimHadar
f248beba9f Added device description + running Interface. 2019-01-27 23:43:07 -08:00
NissimHadar
94d741480c Added missing SSL dll's 2019-01-26 14:59:30 -08:00
NissimHadar
bee86235a3 Corrected error message. 2019-01-26 09:52:58 -08:00
NissimHadar
8223e046c8 Eliminate silly gcc warnings. 2019-01-25 21:41:00 -08:00
NissimHadar
e9ffa05b4b Eliminate silly gcc warnings. 2019-01-25 20:27:23 -08:00
NissimHadar
7a957d829c Missing files. 2019-01-25 19:36:06 -08:00
NissimHadar
8871621372 Removed duplicated folder. 2019-01-25 18:26:29 -08:00
NissimHadar
a2bae0b329 Fixing merge issues. 2019-01-25 18:15:26 -08:00
NissimHadar
79f096fb7e Merge branch 'master' of github.com:highfidelity/hifi into 20816-installOnAndroid 2019-01-25 18:02:59 -08:00
NissimHadar
ce90b62c3e Testing APK installation. 2019-01-25 16:48:29 -08:00
NissimHadar
57d3cec2f9 Completed - downloading Installer (APK) 2019-01-25 14:34:11 -08:00
NissimHadar
b95cc149aa Corrected miss-named Pushbutton. 2019-01-25 13:00:17 -08:00
NissimHadar
1c1b34c3aa WIP - downloading Installer (APK) 2019-01-25 11:30:43 -08:00
NissimHadar
70053d3bba
Merge pull request #14664 from NissimHadar/20526-updateReadme 
Case 20526 - update readme
 2019-01-25 09:15:42 -08:00
NissimHadar
50e7adf32c Can download Build XML in Test on Mobile mode. 2019-01-24 17:55:00 -08:00
NissimHadar
f949b9d5b4 Initial tab set (back) to 0. 2019-01-24 12:16:12 -08:00
NissimHadar
817d132604 renamed ...Button... to ...pushButton... for consistency. 2019-01-24 12:13:35 -08:00
NissimHadar
64843b5ed2 Added "Download APK" push-button. 2019-01-24 12:01:00 -08:00
NissimHadar
e87d5abbd7 Merge branch 'master' of github.com:highfidelity/hifi into 20778-pullFolderFromAndroid 2019-01-24 08:55:30 -08:00
NissimHadar
12b8442e71 Can pull folder on Windows. 2019-01-23 14:32:47 -08:00
John Conklin II
1768d91780
Merge pull request #14733 from hyperlogic/bug-fix/translation-precision 
Avatar Protocol: Fix for precision issues with translation
 2019-01-23 14:07:58 -08:00
NissimHadar
0c6d3be037 Can detect device. 2019-01-23 14:05:32 -08:00
Brad Davis
e18e3fc138 Gpu Frame serialization 2019-01-23 13:21:34 -08:00
NissimHadar
d4fac770ff Renamed local variable per coding standard. 2019-01-23 10:42:38 -08:00
NissimHadar
c25e493f20 Factored out Worker class. 2019-01-23 10:33:02 -08:00
NissimHadar
b7a0fae00e Added common class to simplify code. 2019-01-23 09:15:27 -08:00
NissimHadar
089c71b047 Read device button enabled after setting working folder. 2019-01-23 08:49:42 -08:00
NissimHadar
0728794e38 Can select temporary folder. 2019-01-22 17:14:48 -08:00
David Back
a9895a90e5 add rules for unity version and bone count limit 2019-01-22 17:03:09 -08:00
David Back
08344d5510 add bone rule errors/warnings, add versioning 2019-01-22 16:28:52 -08:00
NissimHadar
5cffdafd22 Adding buttons to Run on Mobile tab. 2019-01-22 15:49:34 -08:00
NissimHadar
28c9b7e1e6 Updated README to include ADB installation. 2019-01-22 15:48:45 -08:00
NissimHadar
a51e446b77 Added TestRunnerMobile. 2019-01-22 14:08:31 -08:00
NissimHadar
7800a0bddc Renamed TestRunner class to TestRunnerDesktop. 2019-01-22 13:37:45 -08:00
NissimHadar
4099fe333b Added tab for Mobile testing. 2019-01-22 13:26:46 -08:00
NissimHadar
a734135462 Update version to 2.0.0 2019-01-22 13:20:07 -08:00
NissimHadar
c199654ded Gabriel Calero's hint. 2019-01-21 10:32:33 -08:00
NissimHadar
56fa467b63 Testing. 2019-01-21 10:26:19 -08:00
NissimHadar
c817c66513 Removed debug code. 2019-01-18 18:39:34 -08:00
NissimHadar
628a420f91 DEBUG. 2019-01-18 17:14:39 -08:00
NissimHadar
9047a8f707 Cleanup in progress. 2019-01-18 16:10:24 -08:00
NissimHadar
1fa516dd56 No need to build on Android or in a Production build 2019-01-18 16:03:02 -08:00
NissimHadar
acbbe2658d Do not build nitpick in PRODUCTION build. 2019-01-18 15:41:06 -08:00
NissimHadar
ecef7834f2 Cleanup in progress. 2019-01-18 15:40:25 -08:00
NissimHadar
e0bb8c64ca Merge branch '20550-installOnMac' of https://github.com/NissimHadar/hifi into 20550-installOnMac 2019-01-18 14:25:22 -08:00
NissimHadar
34c58d4de5 Cleanup in progress. 2019-01-18 14:24:14 -08:00
NissimHadar
5b81931b83 Removed unneeded stuff. 2019-01-18 13:47:51 -08:00
NissimHadar
74d5e4891c Cleanup in progress. 2019-01-18 12:20:05 -08:00
Anthony Thibault
286f23d512 Updated protocol version and fixed bugs 2019-01-17 15:19:54 -08:00
NissimHadar
20c52e4104 Merge branch 'master' of https://github.com/highfidelity/hifi into 20550-installOnMac 2019-01-16 23:55:57 -08:00
NissimHadar
74b8937004 Copy folder only in DEV builds. 2019-01-16 18:38:03 -08:00
NissimHadar
84dd4c4e1d Fixed Linux compilation error. 2019-01-16 18:37:38 -08:00
NissimHadar
c6529ae86d Minor clean-up. 2019-01-16 17:44:48 -08:00
NissimHadar
bfe7742e97 Use the `applicationDirPath on Mac 2019-01-16 17:30:55 -08:00
NissimHadar
7d5bb6eaf8 Added AppData folder copy. 2019-01-16 14:46:52 -08:00
NissimHadar
b0fc794426 Trying to get Jenkins to build correctly. 2019-01-16 10:42:49 -08:00
John Conklin II
7c06c18fe4
Merge pull request #14699 from ingerjm0/api-directory 
JSDoc > Grav directory change
 2019-01-15 18:15:11 -08:00
NissimHadar
f8f8e35e6d Trying ... honestly! 2019-01-15 17:54:25 -08:00
NissimHadar
fcd0a6f20a Funny ... this is needed on Mac... 2019-01-15 15:59:03 -08:00