Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 17:14:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
83621 commits 76 branches 59 tags 1.2 GiB
Commit graph

260 commits

Author SHA1 Message Date
David Rowe
4214182b2f Tidy JSON relative URLs importing 2020-09-01 21:08:52 +12:00
Maki
3783c98976 Allow resolving relative urls when importing entities json 2020-08-04 01:33:19 +01:00
Kasen IO
afc23954c5 Import entities now works on domains that you do not have rights on. 2020-07-03 16:37:02 -04:00
David Rowe
46173439ed Enable serverless domains via HTTP and HTTPS 2020-02-01 12:46:28 +13:00
Simon Walton
82e21e89e4 Merge remote-tracking branch 'upstream/master' into max-json-size 2018-11-13 17:26:20 -08:00
Simon Walton
167a8fdc04 Merge branch 'master' into max-json-size 2018-11-13 14:57:06 -08:00
Simon Walton
a65466f154 Use traditional C strings rather than raw strings 2018-11-13 13:33:36 -08:00
Simon Walton
d183968175 Add skipThoseWithBadParents functionality to octree visitor; reviewer suggestions 2018-11-08 18:20:20 -08:00
Zach Fox
142dfab9ac CR round 1 2018-11-08 10:05:57 -08:00
Roxanne Skelly
cef7000a72 Case 19754 - Remove logging URLs and related file locations. 
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
 2018-11-06 16:24:32 -08:00
Kerry Ivan Kurian
a1bb685176 Remove cruft 2018-10-22 14:00:08 -07:00
Zach Fox
493262052c Remove extraneous code changes; remove QUrlAncestry code; remove extra logging 2018-10-22 13:59:52 -07:00
Kerry Ivan Kurian
3b15548ea3 Display resource-access events in marketplace item tester 
Includes refactoring marketplace item tester into a single-page app.
 2018-10-18 01:04:47 -07:00
Simon Walton
be279f08dc Restore the addMarketplaceIDToDocumentEntities() hack 
Fixes for Linux compiles; other improvements
 2018-10-17 15:43:38 -07:00
Simon Walton
f5f34e8e7d Pasre Entities JSON with our own top-level parser 
Use QJsonDocument for each individual entity.
 2018-10-15 18:14:40 -07:00
Simon Walton
ad9f7f3a1d Include the skipDefaults option in case we ever need it 
Also print errors from parsing entities file; other tweaks
 2018-10-12 11:18:38 -07:00
Simon Walton
0eec0e376c Convert EntityTree direct to JSON, not via QJsonDocument 2018-10-11 18:13:26 -07:00
Simon Walton
c938c595c0 Detect failed conversion from QVariant to JSON better 2018-10-10 17:11:42 -07:00
SamGondelman
0c8a4cc81e merge with master 2018-08-28 17:31:51 -07:00
SamGondelman
5c0b12abf6 ordered ray/parabola intersection code 2018-08-22 16:29:17 -07:00
Andrew Meadows
be0899c41d remove unnecessary writes to appease Xcode's static analyzer 2018-06-15 11:44:22 -07:00
Ryan Huffman
2b49d84a22 Add better error logging in Octree::writeToJSONFile 2018-06-13 12:57:06 -07:00
Ryan Huffman
c2f08dfdba Update Octree to atomically persist data 2018-06-13 12:24:09 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
Liv Erickson
afea186784 fix for both functions 2018-04-25 14:39:04 -07:00
Liv Erickson
10694e2256 Merge branch 'master' of github.com:highfidelity/hifi into fix/import-whitespace 2018-04-24 17:15:45 -07:00
John Conklin II
cad4d45941
Merge pull request #12871 from Atlante45/fix/dead-octree-code 
Remove dead Octree code
 2018-04-19 09:58:20 -07:00
Liv Erickson
d2335ea9f6 fix in where octree imports url so fix is global 2018-04-18 13:18:50 -07:00
Clement
2e8a6e1961 Remove more dead octree code 2018-04-17 18:21:51 -07:00
Simon Walton
692ccfc09b Create HIFI_FCDEBUG(_ID) variants that require a category 
Original macros use default settings.
 2018-04-04 09:49:15 -07:00
Simon Walton
7d16ca9c1c Remove uses of addRepeatedMessageRegex() and its implementation 
Change to new log-message ID scheme.
 2018-04-03 17:54:01 -07:00
Seth Alves
b8fc9e2469 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-07 07:40:35 -08:00
Ryan Huffman
70bdedc4b3 Fix Edit -> Export Entities exporting gzipped json 
We were not respecting the doGzip flag.
 2018-03-01 16:42:41 -08:00
Seth Alves
a44ddbbc26 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-27 14:09:05 -08:00
Ryan Huffman
dbfbee5406 CR 2018-02-26 13:53:20 -08:00
Dante Ruiz
d394c891c5 allow Octreee to load compressed gz files 2018-02-22 10:10:54 -08:00
Ryan Huffman
2a667fcd60 Cleanup entity -> ds persist 2018-02-15 10:09:21 -08:00
Ryan Huffman
cb9327e030 Add entity file sync and domain content backups 2018-02-15 10:09:20 -08:00
Atlante45
28f164d7e5 Remove legacy jurisdiction code 2017-12-29 12:46:52 -08:00
Brad Davis
7bf1b176d7 Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem 2017-11-10 14:21:24 -08:00
ZappoMan
5901d1a311 clean up VERSION_ENTITIES stuff 2017-10-24 13:48:27 -07:00
Andrew Meadows
aee35b751e replace 'unsigned long' with uint64_t 2017-08-18 14:35:48 -07:00
Andrew Meadows
0de109e2e8 cleanup and fix typos 2017-08-18 11:29:47 -07:00
David Kelly
c4d5d16eb3 cr feedback 2017-07-18 11:12:06 -07:00
David Kelly
061f084d9f Get marketplaceID into imported entities 
Rather than doing this on the backend, we can do it here at the
time we import.  Later we will have some support for getting
an entities identity hash and querying the backend to get a
marketplaceID for them as needed.  However for now this is enough
to get us moving forward.
 2017-07-17 15:08:30 -07:00
Seth Alves
794495c197 make ResourceManager be owned by DependencyManager 2017-06-28 14:18:14 -07:00
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00
Stephen Birarda
53e6a77fcc cleanup EncodeBitstreamParams to use nodeData when possible 2017-03-24 13:41:36 -07:00
Stephen Birarda
1b1ae48650 don't recurse on octree elements that have not changed 2017-01-30 17:01:45 -08:00
Stephen Birarda
a40c25ddbf fix repeated send of matching entities 2017-01-19 16:42:14 -08:00