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
66641 commits 2 branches 0 tags 1.1 GiB
Commit graph

621 commits

Author SHA1 Message Date
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