Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-23 14:19:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
74052 commits 73 branches 59 tags 1.2 GiB
Commit graph

1084 commits

Author SHA1 Message Date
Simon Walton
3baebf55c5 Don't enforce key presence in models.json 2018-11-16 17:33:13 -08:00
Simon Walton
452c212c4f Add Paths entry parsing to json parser 2018-11-13 17:58:12 -08: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
df2bc6ba5c Remove unused function 2018-11-13 10:18:30 -08:00
Simon Walton
6ee837d47c OctreeDataUtils - use new json from DS also; allow upload of large domains 2018-11-12 15:43:09 -08:00
Simon Walton
8c347fae70 Fixes for domain server use of changed OctreeDataUtils 2018-11-12 12:45:01 -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
Zach Fox
2f37a2b1a1 Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2 2018-10-18 11:12:26 -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
Sam Gondelman
3f117cd3e0
Merge branch 'master' into scriptvec3 2018-10-17 13:57:21 -07:00
Simon Walton
c031769c67 Faster JSON entities parser 2018-10-16 18:08:07 -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
e86d1691ce Cache the local Entities file to avoid reading 2 or 3 times 2018-10-12 17:26:46 -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
Seth Alves
834699fa12 Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
SamGondelman
c522d1bc93 merge with master 2018-09-14 00:57:13 -07:00
SamGondelman
589e88af4a Merge remote-tracking branch 'upstream/master' into scriptvec3 2018-09-04 17:54:45 -07:00
Sam Gateau
9e2a540bab Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-30 12:12:24 -07:00
SamGondelman
0c8a4cc81e merge with master 2018-08-28 17:31:51 -07:00
Sam Gateau
d97d655148 USing a simpler halfTan test for culling 2018-08-26 23:17:29 -07:00
Sam Gateau
294fe51fde Trying to simplify the LOD culling test 2018-08-24 16:48:23 -07:00
SamGondelman
283c0c0311 s i m p l i f y 2018-08-23 11:47:56 -07:00
SamGondelman
5c0b12abf6 ordered ray/parabola intersection code 2018-08-22 16:29:17 -07:00
SamGondelman
9427de1a50 Merge branch 'scriptvec3' of github.com:SamGondelman/hifi into scriptvec3 2018-08-06 12:38:44 -07:00
SamGondelman
3c805df3cc try to get rid of qobject vecs 2018-08-06 12:38:01 -07:00
Sam Gondelman
7772e8adf2
Merge branch 'master' into scriptvec3 2018-08-03 14:57:49 -07:00
Simon Walton
88fafc7a1f
Merge pull request #13704 from SimonWalton-HiFi/delay-physics 
Enable physics after ES indicates all nearby entities received
 2018-08-01 18:15:00 -07:00
SamGondelman
7c8d080050 Merge remote-tracking branch 'upstream/master' into scriptvec3 2018-07-31 14:04:23 -07:00
SamGondelman
2ca217eb4a merge with master 2018-07-30 17:43:15 -07:00
SamGondelman
3b5a0d278d trying to fix conversion 2018-07-30 17:06:57 -07:00
Simon Walton
4d559bbaee Don't initialize an atomic; squelch gcc warning 2018-07-27 10:05:34 -07:00
Simon Walton
0cec9a72d6 Implement client-side enable physics once indicated EntityData has arrived 
Also now use Entity Server Protocol sequence numbers.
 2018-07-26 18:10:38 -07:00
Simon Walton
2c06487df0 Move sending of completion packet up to EntityTreeSendThread 
I hadn't appreciated the continuous nature of the scene
traversal. Looks good now. Also changed some identifier names.
 2018-07-25 17:05:05 -07:00
Simon Walton
47e99cdeac Initial code for AC side of Enabling Physics plan 
When interface sets query flag send only entities
close to main frustrum origin, until no more available,
then send unreliabe sequence # reliably.
 2018-07-24 16:50:37 -07:00
SamGondelman
956c1511b6 Merge remote-tracking branch 'upstream/master' into parabolic 2018-07-19 15:23:25 -07:00
SamGondelman
f9cdfbad7c cleanup 2018-07-12 17:59:57 -07:00
SamGondelman
16ad9cb5d3 xcolor/rgbcolor conversion 2018-07-11 18:06:06 -07:00
SamGondelman
9929529f30 vec3 conversion 2018-07-11 14:18:22 -07:00
SamGondelman
5bbd5b9e52 vec2 conversion 2018-07-10 16:32:49 -07:00
Clément Brisset
f2a3907e3d
Merge pull request #13357 from SimonWalton-HiFi/memcheck-fixes 
Entity Script Server memory leak when taking down EntityTree
 2018-07-05 15:30:45 -07:00
SamGondelman
90091d11e4 parabola picks, started implementing math 2018-07-03 09:47:31 -07:00