Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-14 17:39:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65662 commits 25 branches 0 tags 1.1 GiB
Commit graph

574 commits

Author SHA1 Message Date
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
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
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
Nissim Hadar
b7a170c718 Added error messages to file rename. 2017-12-08 11:45:30 -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
Nissim Hadar
c0673db3c5 Fix for MacOS 2017-11-30 18:23:58 -08:00
Nissim Hadar
c63571a710 Debugging the image comparison. 2017-11-30 16:27:28 -08:00
Nissim Hadar
0842e09570 Debugging the image comparison. 2017-11-30 13:59:02 -08:00
Nissim Hadar
2e8fe40da8 Recursive test evaluations. 2017-11-30 13:07:54 -08:00
Nissim Hadar
4afc8f9759 Added print() code to the produced script. 2017-11-29 12:12:13 -08:00
Nissim Hadar
7a67e3e5f7 Using js modules. 2017-11-29 09:15:30 -08:00
Nissim Hadar
3710d726df WIP - improving the recursive script. 2017-11-28 15:23:57 -08:00
Nissim Hadar
709fadff2e WIP - improving the recursive script. 2017-11-28 15:23:33 -08:00
David Rowe
cd2922a560 Merge branch '21602' into 21624 
# Conflicts:
#	tools/jsdoc/plugins/hifi.js
 2017-11-28 17:04:59 +13:00
nissim.hadar
42fbe95768 Additional code. 2017-11-26 13:33:01 -08:00
nissim.hadar
b397cd80db Implemented code to call the various test.s functions. 2017-11-26 02:44:12 -08:00
nissim.hadar
9b2c057e9b Trying to fix Qt error on Ubuntu. 2017-11-26 01:39:16 -08:00
nissim.hadar
1510c4d68a Fixed CMakeLists.txt. 2017-11-26 01:12:55 -08:00
nissim.hadar
c0d1549ca5 Trying to fix Qt error on Ubuntu. 2017-11-26 00:17:41 -08:00
nissim.hadar
ea53b9893c Minor edit. 2017-11-26 00:00:19 -08:00
nissim.hadar
0a51ca46e8 Fix gcc error. 2017-11-25 11:58:30 -08:00
nissim.hadar
2911b7dec6 Fix gcc error, and MAC error (no pow). 2017-11-25 11:41:05 -08:00
nissim.hadar
fcd8a47bec Fix gcc error. 2017-11-25 11:24:24 -08:00
nissim.hadar
e35e76afd7 Removed unused variable warning. 2017-11-25 11:03:33 -08:00
nissim.hadar
747ba0bf84 Removed unneeded include of glm. 2017-11-25 11:03:02 -08:00
nissim.hadar
034f4f6036 Fixes for gcc warnings. 2017-11-25 09:21:31 -08:00
nissim.hadar
a71ee719dc Minor typos. 2017-11-25 08:45:22 -08:00
nissim.hadar
ab400159bd Removed ITK. 2017-11-25 03:13:41 -08:00
nissim.hadar
e20ac9aa94 First version with own implementation of SSIM. 2017-11-25 03:01:15 -08:00
nissim.hadar
2a062ad772 Merge branch 'master' into QtImageCompare 2017-11-25 02:59:11 -08:00
nissim.hadar
186d9da303 First version with own implementation of SSIM. 2017-11-25 02:30:23 -08:00
David Rowe
de49fefc61 Merge branch 'master' into 21602 
# Conflicts:
#	libraries/shared/src/RegisteredMetaTypes.h
 2017-11-25 17:06:36 +13:00
David Rowe
91671722a5 Add Shape API types JSDoc 2017-11-25 16:09:54 +13:00
nissim.hadar
857f2c6880 New image comparison method. 2017-11-23 05:58:00 -08:00
nissim.hadar
346c691f0c Implemented creation of allTests.js 2017-11-22 10:56:32 -08:00
nissim.hadar
fef5d95e94 First fully-coded registration. 2017-11-20 12:33:38 -08:00
nissim.hadar
80b646f48c Clean-up. 2017-11-20 11:13:06 -08:00
nissim.hadar
689957c80b Created RGB to monochrome filters. 2017-11-20 08:11:19 -08:00
nissim.hadar
b13ccab303 Can copy an image using ITK. 2017-11-20 01:24:52 -08:00
nissim.hadar
861c33d5a9 Added first use of ITK. 2017-11-19 13:48:37 -08:00
nissim.hadar
7b2fed6db2 Include of "ITK" in Test.cpp complete 2017-11-17 05:38:29 -08:00
nissim.hadar
f990e3f918 Build auto-tester iff ITK has been installed. 2017-11-17 05:10:14 -08:00
SamGondelman
8730a26d20 use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation 2017-11-15 14:12:16 -08:00