Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-03 18:12:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
72570 commits 73 branches 59 tags 1.2 GiB
Commit graph

916 commits

Author SHA1 Message Date
Anthony Thibault
eae5215d94
Merge pull request #13206 from ctrlaltdavid/21872-c 
JSDoc fixes
 2018-05-24 16:44:55 -07:00
NissimHadar
802cedf1bc Removed messages in non-interactive mode. 2018-05-24 13:29:02 -07:00
Ryan Huffman
384851c289 Add option to oven cli to select texture usage type 2018-05-23 10:50:51 -07:00
Ryan Huffman
8e1c7531dc Add option to oven.exe to disable texture baking 2018-05-23 10:42:14 -07:00
NissimHadar
f8b69ef1f1 Changed stored failure images from JPG to PNG 
Now uses snapshot name to find correct test folder - allows creating multiple tests
Reversed order of recursive scripts, so execution will be in alphabetical order.
 2018-05-22 16:34:32 -07:00
milad
ded774de9c multiple fixes for repeated type defs 2018-05-22 16:02:29 -07:00
milad
1a4fa92a29 Merge commit 'refs/pull/13206/head' of https://github.com/highfidelity/hifi into gravprep-redo 2018-05-22 14:33:53 -07:00
milad
5056e698fa further clean up 2018-05-21 22:10:57 -07:00
milad
3450af7a3d clean up 2018-05-21 21:52:20 -07:00
milad
24262e97a6 removed old cruft 2018-05-21 09:10:30 -07:00
milad
9c0bd89951 another round of fixing and merging 2018-05-21 09:09:18 -07:00
milad
73dd5c7f36 fixed merge 2018-05-21 08:21:47 -07:00
milad
1e4d4dac44 cleaned up script 2018-05-20 23:39:47 -07:00
milad
e436f65d4c reworking gravprep to fix most links and oddities 2018-05-20 23:32:18 -07:00
milad
8e50c0fd56 Added pre typedef splits 2018-05-20 20:40:23 -07:00
David Rowe
e44e7ca35f Fix up Resource and resource cache APIs' JSDoc 2018-05-21 11:57:16 +12:00
milad
23ee06fc4b fixed class links 2018-05-20 14:35:58 -07:00
milad
0ccb233724 gravprep redo for link fixes 2018-05-20 14:18:39 -07:00
milad
46efb2b868 merging onto mac 2018-05-19 22:44:18 -07:00
Sam Gateau
efca568dbe
Merge pull request #13198 from NissimHadar/autoTesterUsePeriods 
Updated auto-tester.
 2018-05-18 10:15:55 -07:00
NissimHadar
a0462451be Updated auto-tester 2018-05-18 09:09:29 -07:00
milad
bbb1aa404f Merge commit 'refs/pull/13165/head' of https://github.com/highfidelity/hifi into gravprep-redo 2018-05-16 23:04:43 -07:00
David Rowe
f571e90ef5 Merge branch 'master' into 21872-b 2018-05-16 10:20:53 +12:00
David Rowe
fdeb0e3305 Avatar API JSDoc stubs 2018-05-16 09:20:54 +12:00
David Rowe
1ca6bd2f0b location getter/setter JSDoc 2018-05-15 17:37:45 +12:00
NissimHadar
a9a783588b Fixed typo. 2018-05-14 09:25:17 -07:00
milad
4fb479c382 Merge commit 'refs/pull/13165/head' of https://github.com/highfidelity/hifi into gravprep-redo 2018-05-12 23:42:21 -07:00
milad
091c2c8b98 Before David's latest stubs 2018-05-12 23:41:56 -07:00
David Rowe
7cef329939 Render API JSDoc stubs 2018-05-13 11:53:57 +12:00
milad
2b7e217c35 Fixed Asset Class 2018-05-12 15:45:27 -07:00
David Rowe
fb1f7fea90 Steam API JSDoc stubs 2018-05-13 10:32:46 +12:00
milad
7af53bea4e Merge branch 'master' of https://github.com/highfidelity/hifi into gravprep-redo 2018-05-12 13:50:17 -07:00
David Rowe
11f984f05b OffscreenFlags API JSDoc stubs 2018-05-12 15:08:41 +12:00
David Rowe
841161068c Midi API JSDoc stubs 2018-05-12 15:01:52 +12:00
David Rowe
a2bb9de441 Graphics API JSDoc stubs 2018-05-12 12:53:43 +12:00
David Rowe
42d0620fd1 EntityViewer API JSDoc stubs 2018-05-11 20:56:00 +12:00
David Rowe
3891ebe703 Agent API JSDoc stubs 2018-05-11 20:20:07 +12:00
NissimHadar
9d52306ac5 Merge branch 'master' of github.com:highfidelity/hifi into missingImagesMDfiles 2018-05-09 12:17:17 -07:00
NissimHadar
32f2494416 Stores previous user-selected folders. 2018-05-09 11:58:16 -07:00
milad nazeri
c822e836bc general format work 2018-05-08 21:48:57 -07:00
NissimHadar
ee4b1af3aa Corrected missing images in test.md files 2018-05-08 16:51:58 -07:00
milad nazeri
f72e7d8c01 updating for workPC 2018-05-08 13:09:41 -07:00
NissimHadar
d5bb582811 Per Austin's comments. 2018-05-08 11:40:56 -07:00
NissimHadar
eb14658bc5 Per Austin's comments. 2018-05-08 11:13:06 -07:00
milad nazeri
6cb4901bae fixed undefined errors 2018-05-07 15:49:53 -07:00
Ryan Huffman
894cd3ed76 Add 010-templates/README.md 2018-05-07 11:52:29 -07:00
Ryan Huffman
b9fb9875a7 Add 010 ktx template 2018-05-07 11:48:50 -07:00
Ryan Huffman
d8257dcfd3 Add 010 fbx template 2018-05-07 11:48:41 -07:00
NissimHadar
481eddb2a3 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-07 08:24:03 -07:00
milad nazeri
22065ad611 Links fixed 2018-05-06 21:39:37 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
Stephen Birarda
ec354620db
Merge pull request #12956 from huffman/feat/client-texture-selection-baking 
Add support for client texture selection
 2018-05-04 16:14:43 -07:00
NissimHadar
2c2b74f4c8 Removed unused variable. 2018-05-04 14:13:14 -07:00
NissimHadar
1f691edf0d Removed platform code (was used for MD files). 2018-05-03 17:04:17 -07:00
NissimHadar
beb19c53fa Added date and time to auto-generated scripts. 2018-05-03 15:00:14 -07:00
NissimHadar
b9cdaf31a0 Corrected name of create all recursive tests call. 2018-05-02 15:26:03 -07:00
NissimHadar
56e5b0e7b4 Added autoTester.enableAuto(); to the recursive tests. 2018-05-02 15:25:31 -07:00
NissimHadar
93afbcdc08 First success with running from command line. 2018-05-01 17:59:07 -07:00
milad nazeri
ae935dcda5 saved before laptop acts up more 2018-05-01 16:23:50 -07:00
NissimHadar
a3e4fa8429 Corrected download of images. 2018-05-01 15:27:29 -07:00
NissimHadar
b722c80b3f WIP 2018-05-01 14:25:33 -07:00
Ryan Huffman
24ac342c6b Add support for client texture selection 2018-05-01 14:11:31 -07:00
NissimHadar
6d8eee6b32 Merge branch 'commandLineParametersForAutotester' of github.com:NissimHadar/hifi into commandLineParametersForAutotester 2018-04-30 17:19:29 -07:00
milad nazeri
8845094afb Added Lod fix 2018-04-30 16:55:42 -07:00
milad nazeri
f520d13242 pre TOC add 2018-04-30 16:32:15 -07:00
milad nazeri
1ce4c9d140 GravPrep working through first round of editing, starting explore file and jsdoc quality tests 2018-04-29 14:52:56 -07:00
milad nazeri
f35fffb975 Added toc 2018-04-28 13:55:42 -07:00
milad nazeri
91c0fa2778 Adding dedent 2018-04-28 12:16:39 -07:00
milad nazeri
9db67229b9 Name groupings working correctly, pre-adding ctrlAtlDavid's new tags 2018-04-28 09:29:16 -07:00
David Rowe
fada958e72 Handle possibly undefined value 2018-04-28 19:57:45 +12:00
milad nazeri
9773b928ac copying to dir working 2018-04-28 00:25:07 -07:00
David Rowe
fc4837b51c Reorder listing of context tags 2018-04-28 16:00:49 +12:00
David Rowe
e39aecfb2a Fix custom JSDoc tags 2018-04-28 16:00:22 +12:00
NissimHadar
a5297f8447 Merge branch 'commandLineParametersForAutotester' of github.com:NissimHadar/hifi into commandLineParametersForAutotester 2018-04-27 14:55:12 -07:00
Anthony J. Thibault
c6b12307aa Added custom jsdoc tags to High Fidelity 
There are 4 new jsdoc tags:

* @hifi-interface - indicates that this namespace or class is available in Interface Scripts.
* @hifi-assignment-client - indicates that this namespace or class is available in Assignment Client Scripts.
* @hifi-client-entity - indicates that this namespace or class is available in Client Entity Scripts.
* @hifi-server-entity - indicates that this namespace or class is avaialbe in Server Entity Scripts.

These tags should appear just after the @class or @namespace tag. For example:

    /**jsdoc
     * Your avatar is your in-world representation of you. The <code>MyAvatar</code> API is used to manipulate the avatar.
     * For example, you can customize the avatar's appearance, run custom avatar animations,
     * change the avatar's position within the domain, or manage the avatar's collisions with other objects.
     *
     * @namespace MyAvatar
     *
     * @hifi-interface
     * @hifi-client-entity
     *
 2018-04-26 14:13:42 -07:00
David Rowe
08dc9b133f Docs to JSDoc review 2018-04-26 21:10:28 +12:00
NissimHadar
a2d73ff202 Merge branch 'master' of github.com:highfidelity/hifi into testerUpdate 2018-04-25 15:09:07 -07:00
MiladNazeri
0f87e53902
Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate 
Docs/docs to js docs update
 2018-04-25 12:26:19 -07:00
Alexander Ivash
2439c04528 skip url conversion to 'file:///' for the urls which schema is already 'file' 2018-04-25 11:04:45 +03:00
NissimHadar
aceaa510c8 Added referral to physical memory Test. 
Added menu items - `close` and `about`
 2018-04-23 14:47:17 -07:00
David Rowe
719062dd9f Interim JSDoc for MyAvatar - first pass 2018-04-24 09:10:59 +12:00
milad nazeri
e25c871a52 fixing hifi.js 2018-04-23 07:53:46 -07:00
milad nazeri
83523c7052 original doc sources ported 2018-04-23 07:52:21 -07:00
David Rowe
6a2b7244eb Interim JSDoc for Tablet 2018-04-23 11:06:17 +12:00
milad nazeri
e9b9c05b5d removed cruft 2018-04-22 08:51:47 -07:00
milad nazeri
dc3d162c5b working through the list 2018-04-22 08:19:22 -07:00
David Rowe
7087abd201 Merge branch 'master' into 21815 2018-04-21 10:49:56 +12:00
Anthony Thibault
147da86668
Merge pull request #12933 from hyperlogic/feature/wireshark-avatar-data 
Add more detailed AvatarData packet support to Wireshark dissector plugin
 2018-04-18 13:13:54 -07:00
Anthony J. Thibault
04c22e5a2b Add more detailed AvatarData packet support to Wireshark dissector plugin. 2018-04-18 10:50:00 -07:00
John Conklin II
d19bb557ad
Merge pull request #12897 from ctrlaltdavid/21848 
Include JSDoc Web pages in the install
 2018-04-18 10:49:31 -07:00
Oren Hurvitz
50eaf3e166 Fixed CMakeLists.txt for 'oven' to work in Linux 2018-04-17 12:14:45 +03:00
David Rowe
c1ede6ef58 Merge branch 'master' into 21815 
# Conflicts:
#	tools/jsdoc/plugins/hifi.js
 2018-04-17 11:54:56 +12:00
David Rowe
9f83c606e9 Controller API JSDoc 2018-04-17 11:46:40 +12:00
Stephen Birarda
77b3a2cb7c add wireshark HFUDT packet dissector 
Co-authored-by: Ryan Huffman <ryanhuffman@gmail.com>
Co-authored-by: Clément Brisset <clement.brisset@gmail.com>
 2018-04-16 16:37:50 -07:00
John Conklin II
5705bac87f
Merge pull request #12723 from ctrlaltdavid/21801 
HMD API JSDoc
 2018-04-16 11:12:26 -07:00
David Rowe
06bb873e8d Include JSDoc Web pages in the install 2018-04-16 16:08:26 +12:00
Seth Alves
3830f65df5
Merge pull request #12875 from druiz17/update-baking-tools 
Update baking script to include skyboxes.
 2018-04-12 19:46:46 -07:00
Dante Ruiz
5fdcd12375 add baking of skyboxes 2018-04-12 09:20:46 -07:00
NissimHadar
c458b587ac Completed creation of testsOutline.md. 2018-04-11 16:50:27 -07:00
David Rowe
7a9e3388fa Merge branch 'master' into 21801 2018-04-12 09:48:51 +12:00
Dante Ruiz
67ec766af2 saving work. 2018-04-11 10:24:01 -07:00
NissimHadar
60f4c6788f Added creation of tests outline .MD file. 2018-04-10 23:04:56 -07:00
NissimHadar
8e063a600b Added recursive creation of MD files. 2018-04-10 20:16:36 -07:00
Seth Alves
d8f0cfa89a
Merge pull request #12797 from druiz17/update-bake-tool 
update python bake tool
 2018-04-10 10:20:38 -07:00
Dante Ruiz
66f78ea2c7 update bake tool 2018-04-05 10:39:27 -07:00
NissimHadar
b19fcc340d Start test steps from 1 (not from 0). 2018-04-05 10:01:29 -07:00
NissimHadar
99a4bd65a0 Corrected message to user. 
Changed ::ReadWrite to ::WriteOnly when creating MD file.
 2018-04-04 17:12:46 -07:00
NissimHadar
235996911a Fixed gcc warning. 2018-04-04 11:38:14 -07:00
NissimHadar
7a6b071e46 Merge branch 'master' of github.com:highfidelity/hifi into addMDtoAutoTester 2018-04-04 10:20:35 -07:00
NissimHadar
4f5895cb16 Added MD file to autoTester. 2018-04-03 13:17:37 -07:00
David Rowe
f27e8868eb Add HMD JSDoc 2018-03-28 12:25:12 +13:00
Dante Ruiz
0c6f5bb04d adding python baking scripts 2018-03-26 10:51:25 -07:00
Ryan Huffman
e90c051744
Merge pull request #11872 from huffman/feat/version-wo 
Add asset server baking versioning
 2018-03-23 08:27:37 -07:00
Seth Alves
bea7ee42e2 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-21 14:30:07 -07:00
Stephen Birarda
e05ee55495
Merge pull request #12691 from huffman/fix/oven-exit-crash 
Fix crashes on exit because of ResourceManager thread destruction
 2018-03-21 11:56:06 -07:00
Ryan Huffman
00aa564d84 Fix crashes on exit because of ResourceManager thread destruction 2018-03-21 10:43:31 -07:00
Stephen Birarda
1405c8fcb3 add a client only option to cmake 2018-03-20 14:20:58 -07:00
Seth Alves
7a7a9e9af0 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-16 16:55:47 -04:00
Alexander Ivash
b1690b3189 fix malformed urls on windows (like file:///Users/ai/AppData....) 
note: the issue happened because drive letter on Windows is treated by QUrl as 'scheme', so replacing it with 'file' results in broken url.
 2018-03-16 00:27:36 +03:00
Ryan Huffman
0a00227ce3 Update message for failed bakes inside of AssetServer.cpp 2018-03-13 15:03:20 -07:00
Ryan Huffman
c555590e9b Enable support for baking JS files inside of the oven 2018-03-13 14:57:35 -07:00
Ryan Huffman
5448099a93 Fix baker CLI not correctly exiting on failure 
We previusly were exiting while still inside of the QApplication ctor,
before the event loop had been started. This fixes that by queueing up
the baking to occur after the ctor has completed.
 2018-03-13 14:57:04 -07:00
Ryan Huffman
11a3a86af3 Merge branch 'master' of github.com:highfidelity/hifi into feat/obj-baker-update 2018-03-13 14:49:26 -07:00
Ryan Huffman
bcbe55d751 Fix OBJ support in DomainBaker 2018-03-13 14:30:42 -07:00
Ryan Huffman
a5e491e29d Add OBJ support to domain baker 2018-03-13 10:38:21 -07:00
Seth Alves
b39c7eadd2 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-13 09:24:18 -07:00
MiladNazeri
e054f16c46
Merge pull request #12526 from ctrlaltdavid/21709 
Entities API JSDoc
 2018-03-12 14:40:09 -07:00
Seth Alves
75f4959b79 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-12 09:08:51 -07:00
NissimHadar
84cc4c18a4 Added date/time to testResultsFolder. 2018-03-09 18:13:26 -08:00
NissimHadar
77901e5089 Corrected MacOS warnings. 2018-03-08 20:11:35 -08:00
David Rowe
b461a422c6 Merge branch 'master' into 21709 2018-03-09 14:18:42 +13:00
Seth Alves
6c831bbc3a Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-08 07:42:30 -08:00
NissimHadar
7052ea3769 Merge branch 'master' of github.com:highfidelity/hifi into addRecursionToAutotester 2018-03-07 17:46:14 -08:00
NissimHadar
a4854839a4 Enable user selection of destination folder when creating a test. 2018-03-07 17:45:10 -08:00
Clément Brisset
b7ac07f590
Merge pull request #12589 from highfidelity/RC65 
merge back RC65 to master after RC hotfixes
 2018-03-07 17:22:41 -08:00
Ryan Huffman
004e15d2d9 Update ATP to be optional in ResourceManager for OBJBaker 2018-03-07 16:31:41 -08:00
Ryan Huffman
975f0bfbd2 Fix OBJBaker not correctly waiting until all assets have been baked to finish 2018-03-07 16:30:23 -08:00
NissimHadar
b47b512ab9 Completed recursive creation of recursive scripts. 2018-03-07 13:25:40 -08:00
John Conklin II
7381bb0d7e
Merge pull request #12447 from birarda/feat/oven-no-dock-bounce 
use QCoreApplication for Oven when headless version is used
 2018-03-07 12:56:25 -08:00
NissimHadar
9bd7f31ff3 Now search for tests folder bottom-up. 2018-03-07 11:30:30 -08:00
NissimHadar
da414b94fd WIP - adding the creation of recursive scripts. 2018-03-07 10:47:37 -08:00
David Rowe
a62b6b7150 Merge branch 'master' into 21709 2018-03-07 17:34:53 +13:00
NissimHadar
4b3d63eea4 Added math.h to includes (MacOS build error). 2018-03-06 16:37:05 -08:00
NissimHadar
84815fadae Use JPG->PNG trick to keep file sizes down. 2018-03-05 17:45:51 -08:00
Ryan Huffman
842d5cdb39 Fix erroneous syntax (unmatched paren) 2018-03-05 12:03:24 -08:00
Ryan Huffman
ac0ecc8baa Merge remote-tracking branch 'upstream/master' into feat/obj-baker-update 2018-03-05 10:41:49 -08:00
NissimHadar
5a79f272f3 Allow multiple evaluations. 2018-03-04 20:56:57 -08:00
NissimHadar
913ad569c0 Added completion message. 2018-03-04 17:36:20 -08:00
NissimHadar
b32ad2f69c createTests fixed. 2018-03-03 18:22:51 -08:00
NissimHadar
0a2610a9e0 Evaluation seems to work. 2018-03-03 09:58:30 -08:00
NissimHadar
361b5331ba File sizes are wrong, and so is format. 2018-03-02 18:09:32 -08:00
NissimHadar
96c7cc8197 Merge branch 'master' of github.com:highfidelity/hifi into addRecursionToAutotester 2018-03-02 16:49:30 -08:00
NissimHadar
4b836a2ca9 Stores downloaded images in correct folder and with correct filenames. 2018-03-02 16:49:09 -08:00
NissimHadar
d29adcd000 Can download multiple images from GitHub. 2018-03-02 16:08:14 -08:00
Seth Alves
45157a16f2 merge from upstream 2018-03-02 09:57:27 -08:00
NissimHadar
07267f9fe6 WIP. 2018-03-02 09:13:07 -08:00
NissimHadar
5bb4023fb5 First version - can download fixed URL to fixed location. 2018-03-01 19:23:17 -08:00
NissimHadar
b3b40d68c2 Merge branch 'master' of github.com:highfidelity/hifi into addRecursionToAutotester 2018-03-01 11:11:08 -08:00
NissimHadar
2a1c22e7a5 "Create Test" copies (and renames) images from snapshot folder to the corresponding test folder. 2018-03-01 11:10:45 -08:00
Seth Alves
33065fb51c more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and port 2018-03-01 11:07:37 -08:00
David Rowe
f9086e31de Deprecate Entities.getMeshes() in favor of using the new Graphics API 2018-03-01 10:08:50 +13:00
David Rowe
3275846882 Material entity JSDoc 2018-03-01 09:57:42 +13:00
David Rowe
a782b6779a Merge branch 'master' into 21709 
# Conflicts:
#	interface/src/ui/overlays/Overlays.h
#	interface/src/ui/overlays/Shape3DOverlay.cpp
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/EntityScriptingInterface.h
 2018-02-28 12:42:05 +13:00
Brad Davis
136ced98c3 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-27 13:44:00 -08:00
Stephen Birarda
9cc348ef27 Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings 2018-02-27 09:59:37 -08:00
Brad Davis
6254e2b569 PR feedback 2018-02-27 09:11:40 -08:00
David Rowe
1fb02d15d7 Entities actions JSDoc 2018-02-27 14:12:20 +13:00
Brad Davis
5aa15b5422 Fixing build warnings 2018-02-26 10:17:07 -08:00
David Rowe
a8e05824cd Entities octree sending functions JSDoc 2018-02-25 14:15:39 +13:00
NissimHadar
b81f69d97a WIP - recursive tests. 2018-02-23 18:40:16 -08:00
Brad Davis
aeb29db37d Merge remote-tracking branch 'upstream/stable' into android_stable 2018-02-22 17:35:00 -08:00
Atlante45
277e556b48 Create a standard function to init Hifi Apps 2018-02-22 17:06:09 -08:00
Atlante45
80c0f2a21e Fix crash when passing --checkMinSpec flag 
That flag caused a DLL to be loaded before Application was
	instanced.
	This triggers a Qt bug inside Q_COREAPP_STARTUP_FUNC that causes
	the previous registration pointing the startup function in
	the main executable to be overridden with the address of the
	function in the DLL (Since they both link the same static
	library)
	This leads to the correct function running in the wrong address
	space (the DLLs), hence not initializing some global variables
	correctly.
 2018-02-22 16:29:38 -08:00
Stephen Birarda
946474c615 do not init caching for asset requests in domain-server 2018-02-21 16:33:58 -08:00
Stephen Birarda
79f5d0cee2 include memory for unique_ptr in Oven 2018-02-21 13:52:07 -08:00
Stephen Birarda
d4061c172e quit all threads before waiting on them (CR) 2018-02-21 13:52:07 -08:00
Stephen Birarda
2a597eb715 use QCoreApplication for oven when headless version is used 2018-02-21 13:52:07 -08:00
David Rowe
67cfe783be Entity properties JSDoc 2018-02-19 12:17:31 +13:00
Brad Davis
fe9b1de908 Fix PR builds 2018-02-16 09:28:58 -08:00
Bradley Austin Davis
fd007e845d Squashed scribe changes 2018-02-07 10:29:29 -08:00
Bradley Austin Davis
a578e64416 Remove Qt dependency from scribe 2018-02-07 09:44:45 -08:00
Bradley Austin Davis
0455fb37b6 Merge remote-tracking branch 'upstream/master' into fix/shader_length 2018-02-06 15:55:01 -08:00
Bradley Austin Davis
f291715f87 Merge remote-tracking branch 'zvork/scribe' into fix/shader_length 2018-02-06 10:36:15 -08:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets 
Remove some unneeded Qt dependencies
 2018-02-05 15:32:54 -08:00
Bradley Austin Davis
f611990b10 Fix overlimit shader char strings 2018-02-05 15:27:19 -08:00
Olivier Prat
ac92b3c130 Merge branch 'master' of http://github.com/highfidelity/hifi into scribe 2018-02-02 14:01:59 +01:00
Bradley Austin Davis
b97c938544
Merge pull request #12216 from thoys/feat/js-script-console-auto-complete 
JS scripting console auto-complete
 2018-01-31 10:39:51 -08:00
Brad Davis
3e3a585b92 Fixing compile warnings 2018-01-30 21:54:29 -08:00
Atlante45
bc819c698e Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back 2018-01-30 16:09:30 -08:00
Olivier Prat
5e6300ce46 Merged with master 2018-01-30 09:52:30 +01:00
MiladNazeri
9baf02b7a1
Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request 
Leopoly_Phase1_003_Asset-Request
 2018-01-29 11:40:41 -08:00
Brad Davis
0781d8eaf0 Remove some unneeded Qt dependencies 2018-01-28 22:18:24 -08:00
Atlante45
314c51ab3b Fix settings init in all exe 2018-01-26 15:53:08 -08:00
Brad Davis
361b767586 Merge branch 'fix/render_config' into android 2018-01-25 14:50:41 -08:00
Thijs Wenker
45487a1e45 Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete 
# Conflicts:
#	interface/CMakeLists.txt
 2018-01-25 22:51:35 +01:00
Olivier Prat
95882e0cde Merged with master 2018-01-24 10:51:54 +01:00
Nissim Hadar
f9e0c724ce Added '?raw=true' suffices where needed. 2018-01-23 18:09:45 -08:00
Nissim Hadar
6bb325f6a2 Implemented new recursive functionality. 2018-01-23 17:25:02 -08:00
Thijs Wenker
c46a115000 attempt to fix ubuntu build 2018-01-24 01:45:53 +01:00
Thijs Wenker
79dbde6a6f optional auto-complete build (requires NPM installed) 2018-01-23 23:01:59 +01:00
Brad Davis
d0be19ab41 Add prototype KTX manipulation tool 2018-01-23 12:27:29 -08:00
humbletim
16ca0eebed fix atp-client AssetUtils:: namespace 2018-01-23 03:36:00 -05:00
Thijs Wenker
5885569644 fix UNIX jsdoc command order 2018-01-23 01:29:52 +01:00
Thijs Wenker
4ff3c9e046 fix jsdoc output folder 2018-01-22 19:00:45 +01:00
Thijs Wenker
58216b947c removal of unnecessary JS export (for now) 2018-01-22 18:54:24 +01:00
Thijs Wenker
483074b11e jsdoc cmake fixes 2018-01-22 17:59:01 +01:00
Thijs Wenker
0f7f58417b JS scripting console auto-complete 2018-01-19 19:11:12 +01:00
Brad Hefta-Gaub
4485ed8613
Merge pull request #12073 from NissimHadar/QtImageCompare 
Improved functionality
 2018-01-18 15:00:35 -08:00
Clément Brisset
956f45b5af
Merge pull request #11932 from birarda/bug/baking-folder-number 
fix sparse rectification for small textures, export for same model at diff URL
 2018-01-18 14:25:33 -08:00
Olivier Prat
efa6a8c0b5 Merged with master 2018-01-17 15:49:46 +01:00
Olivier Prat
157a229a4f Tried to add GLSL validation in scribe. Issues with determining the correct version... 2018-01-17 15:09:32 +01:00
Olivier Prat
54690219e3 Changed the way shader type is sent to Scribe 2018-01-17 11:12:37 +01:00
Olivier Prat
49549ced17 Fixed compilation with new shader system 2018-01-17 10:52:58 +01:00
Olivier Prat
3911ce59cc Scribe now outputs .h and .cpp. Need to change how shader source is referenced in C++ code 2018-01-16 19:02:12 +01:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Olivier Prat
98a47e56fc Added a hack to force referencing of shader source on Android 2018-01-12 17:32:12 +01:00
Olivier Prat
420b58fd5b Trying to fix Android build error 2018-01-12 15:13:55 +01:00
Olivier Prat
814de4ab81 Scribe now outputs shaders as cpp files. 2018-01-12 11:59:19 +01:00
Nissim Hadar
0f4206d330 Added option to delete old snapshots. 2018-01-10 18:21:34 -08:00
Stephen Birarda
fa75320acf
Merge pull request #11984 from birarda/bug/macdeployqt-for-oven 
fix rpath for oven on OS X
 2017-12-14 10:26:13 -08:00
Stephen Birarda
88831ff08a don't trigger unix step on apple for oven 2017-12-13 18:39:19 -08:00
Stephen Birarda
0b598ea948 fix RPATH for oven so it loads things from macdeployqt 2017-12-13 18:39:19 -08:00
Zach Fox
ed5082e5d4
Merge pull request #11974 from birarda/feat/staging-env-or-cl 
allow custom metaverse URL to be used with env var
 2017-12-13 17:29:45 -08:00
Stephen Birarda
139976d8bb allow staging METAVERSE_SERVER_URL to be toggled by env 2017-12-12 16:22:08 -08:00
David Rowe
578c42b4ea Merge branch 'master' into 21624 2017-12-13 09:41:09 +13:00
MiladNazeri
16e16501cd
Merge pull request #11791 from ctrlaltdavid/21602 
JSDoc updates
 2017-12-12 12:18:02 -08:00
Ryan Huffman
c2e0f19591 Merge branch 'master' of github.com:highfidelity/hifi into feat/obj-baker-update 2017-12-11 13:39:58 -08:00
divya
e187852df1
Merge pull request #11941 from huffman/feat/atp-baking-process 
Move asset server baking to a separate process
 2017-12-09 20:48:14 -08:00
Ryan Huffman
7b48f08566 Remove _baker inside ModelBakeWidget 2017-12-08 16:45:27 -08:00
Nissim Hadar
9ff1b4bcb1 WTF.... 2017-12-08 16:38:46 -08:00
Nissim Hadar
44c76061ed Lowered threshold to 0.999 2017-12-08 16:25:10 -08:00
Ryan Huffman
373b29c031 Merge branch 'master' of github.com:highfidelity/hifi into feat/obj-baker-update 2017-12-08 14:29:58 -08:00
Nissim Hadar
b7a170c718 Added error messages to file rename. 2017-12-08 11:45:30 -08:00
Ryan Huffman
70c35f84b5 Update baker library with many style improvements 2017-12-08 10:30:38 -08:00
Nissim Hadar
5806605439 Reformatting per coding standard. 2017-12-07 11:34:56 -08:00
Nissim Hadar
8c1a4e058e Changed format (to 5 digits). 
Changed threshold.
 2017-12-07 10:58:28 -08:00
Ryan Huffman
4dd08d93f4 Cleanup dead code and unused var in BakerCLI 2017-12-07 10:54:39 -08:00
Ryan Huffman
94a58a2471 Remove baking dependency from assignment-client 2017-12-07 10:53:23 -08:00
Nissim Hadar
ebad5cf503 Reduced threshold from 0.9995 to 0.995 2017-12-06 16:55:32 -08:00
Ryan Huffman
6b098bfc6a Fix aborted baking in oven cli 2017-12-06 13:51:31 -08:00
Ryan Huffman
bee666b522 Add error text reading to asset server baking 2017-12-06 11:49:34 -08:00
Ryan Huffman
7eb93f4777 Add oven as dep to assignment-client 2017-12-06 11:49:34 -08:00
Ryan Huffman
f3fc5769e8 Move asset baking on asset server to separate process 2017-12-06 11:49:19 -08:00
Stephen Birarda
5688a166f8 fix folder name creation for duplicated models 2017-12-05 14:44:11 -08:00
Nissim Hadar
3de34834e1 Changed autoTester threshold to 0.9995 
Added a readme explaining how to deploy autoTester.
 2017-12-05 11:19:00 -06:00
Nissim Hadar
c35310c2fb Deal with user canceling folder selection. 2017-12-01 17:17:11 -08:00
Nissim Hadar
6c2e701023 Improved CMakeLists.txt for QT deployment. 
Changed threshold from 0.999 to 0.9998
 2017-12-01 13:31:52 -08:00
Nissim Hadar
a83244c27f Corrected typo in comment. 2017-12-01 11:16:57 -08:00
Nissim Hadar
526aa8fe57 Changed threshold from 0.98 to 0.999 2017-12-01 09:28:31 -08:00
Nissim Hadar
12ac551d25 Changed power from 2.0 to 2 2017-11-30 18:27:47 -08:00