Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
64360 commits 2 branches 0 tags 1.1 GiB
Commit graph

516 commits

Author SHA1 Message Date
Brad Davis
aeb29db37d Merge remote-tracking branch 'upstream/stable' into android_stable 2018-02-22 17:35:00 -08: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
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
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
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
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
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05: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