Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-06 22:29:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
68372 commits 69 branches 57 tags 1.2 GiB
Commit graph

979 commits

Author SHA1 Message Date
Ryan Huffman
2a667fcd60 Cleanup entity -> ds persist 2018-02-15 10:09:21 -08:00
Ryan Huffman
1b7b4eee50 Fix entity data not being gzipped when adding id+version 2018-02-15 10:09:20 -08:00
Ryan Huffman
ff5be2d690 Fix entity data ID sometimes being reset 2018-02-15 10:09:20 -08:00
Ryan Huffman
cb9327e030 Add entity file sync and domain content backups 2018-02-15 10:09:20 -08:00
SamGondelman
324eefc914 remove fresnel, add unlit, fix overlays, cleanup 2018-02-14 17:02:07 -08:00
SamGondelman
4500ed17e7 merge from master 2018-02-13 13:58:39 -08:00
SamGondelman
84cd0e1529 wip live material swapping on model entities, model overlays, avatars, 
and albedo swap on shape entities
 2018-02-09 12:00:08 -08:00
SamGondelman
d7f4b033e8 wip finish adding material entity 2018-02-02 16:49:33 -08:00
Olivier Prat
3804917cf4 Orthographic octree selection seems to be working 2018-02-02 09:40:57 +01:00
Nissim Hadar
8206ae6ffb Removed BackgroundMode packet type. 2018-01-07 13:50:42 -08:00
Atlante45
28f164d7e5 Remove legacy jurisdiction code 2017-12-29 12:46:52 -08:00
Stephen Birarda
d299b9a56c
Merge pull request #12024 from birarda/bug/entity-sequence-skip 
handle sequence number from reliably sent adds in OctreeEditPacketSender
 2017-12-22 12:30:27 -08:00
Stephen Birarda
1a6546999a track reliably sent adds in sent packet history from OEPS 2017-12-19 16:00:55 -08:00
Zach Fox
b2bafed2bb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-07 11:21:24 -08:00
Brad Hefta-Gaub
ebac2556e4
Merge pull request #11841 from ZappoMan/makeAddEntityAtomic 
Make add entity atomic
 2017-11-18 14:27:12 -08:00
ZappoMan
66454e7288 fix unix warnings 2017-11-17 16:33:43 -08:00
Zach Fox
7d34b3fe67 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-11-17 15:45:03 -08:00
ZappoMan
71a46a3374 cleanup 2017-11-17 13:03:04 -08:00
ZappoMan
cd0fa989e1 debugging 2017-11-17 08:55:55 -08:00
ZappoMan
e438ac54d5 make adds go over NLPacketList as reliable 2017-11-16 13:16:23 -08:00
Stephen Birarda
eedb77dae9 add clearing of known state if client resets ES connection 2017-11-16 11:40:35 -08:00
ZappoMan
4c4f23e312 Merge branch 'master' of https://github.com/highfidelity/hifi into makeAddEntityAtomic 2017-11-16 10:09:46 -08:00
Stephen Birarda
05a38a78c5 don't send octree data without first query 2017-11-14 14:08:27 -08:00
Brad Davis
5cf9c1bb33 Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-13 10:48:21 -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
c6947dd165 some side by side plumbing for NLPackets and NLPacketLists 2017-11-09 18:20:06 -08:00
Anthony J. Thibault
5507bcea3c Remove hack for missing inttypes.h header on VS2010 2017-11-09 10:34:01 -08:00
ZappoMan
d4b4d188ed allow splitting of edit or add entity packets across multiple edit packets when property list is larger than MTU 2017-11-04 13:40:41 -07:00
Zach Fox
6f96e0c7bd More progress 2017-10-31 12:14:12 -07:00
Zach Fox
90e9251176 It's a start 2017-10-31 11:28:19 -07:00
Zach Fox
91333cdf7b Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-25 10:26:50 -07:00
ZappoMan
5901d1a311 clean up VERSION_ENTITIES stuff 2017-10-24 13:48:27 -07:00
Zach Fox
b35eaf2cc8 Throw a bunch of code at the wall and hope some sticks 2017-10-04 15:06:55 -07:00
Andrew Meadows
0c934e863b clarify some comments 2017-09-29 11:34:35 -07:00
Andrew Meadows
5dcd6bc496 namechange: apparentAngle --> angularDiameter 2017-09-29 11:34:35 -07:00
Andrew Meadows
1c30f7424e remove cruft and add comments 2017-09-29 11:34:35 -07:00
Andrew Meadows
49e11d2173 fix Differential scan logic for LOD culling 2017-09-29 11:34:35 -07:00
Andrew Meadows
b1b7764056 use 20 degrees of OVERSEND 2017-09-29 11:34:35 -07:00
Andrew Meadows
a55661e1ff remove ViewFrustum::calculateProjection() 2017-09-29 11:34:35 -07:00
Andrew Meadows
a22e577100 zero out OVERSEND hack 2017-09-29 11:34:35 -07:00
Andrew Meadows
d061627a1d reasonable values for iitial OctreeQueryNode view 
make sure newViewFrustum is fully initialized before using it
 2017-09-29 11:34:34 -07:00
Andrew Meadows
1562fb153e cherrypick traverseTreeAndBuildNextPacketPayload() 2017-09-29 11:34:34 -07:00
Andrew Meadows
0b0de96894 use memcpy instead of copying one byte at a time 2017-09-29 11:34:33 -07:00
Andrew Meadows
8b7c43f3b1 add LOD culling in DiffTraversal 2017-09-29 11:34:33 -07:00
Andrew Meadows
82ed19386f make Octree::readBitstreamToTree() virtual 2017-09-29 11:34:32 -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
Atlante45
5777b5e805 Create one packet per node 2017-06-14 11:42:25 -07:00
Stephen Birarda
9bc0609b1e address code review comments 2017-04-28 10:17:48 -07:00
Stephen Birarda
a21a34a4a4 add entities file replacement to DS and ES 2017-04-27 16:56:27 -07:00
Stephen Birarda
53e6a77fcc cleanup EncodeBitstreamParams to use nodeData when possible 2017-03-24 13:41:36 -07:00
Triplelexx
b7980569cc change all references of IDENTITY_FRONT to IDENTITY_FORWARD 2017-03-21 22:13:33 +00:00
Stephen Birarda
d4119d5676 fix for non-void set of should force scene 2017-02-16 16:46:09 -08:00
Stephen Birarda
9d336a84ab force a full scene send for new ancestors/descendants 2017-02-16 16:46:09 -08:00
Stephen Birarda
1b1ae48650 don't recurse on octree elements that have not changed 2017-01-30 17:01:45 -08:00
Howard Stearns
a1afbe7d5e Merge branch 'master' of https://github.com/highfidelity/hifi into edit-entity-filter 2017-01-25 19:16:29 -08:00
Stephen Birarda
69b47dcf50 use currentParameters instead of getJSONParameters() 2017-01-24 16:49:17 -08:00
Stephen Birarda
33378ede5c force full scene send if json parameters changed 2017-01-24 16:34:57 -08:00
Stephen Birarda
6376068021 fix usesFrustum check in OctreeQueryNode 2017-01-20 13:54:46 -08:00
Stephen Birarda
a40c25ddbf fix repeated send of matching entities 2017-01-19 16:42:14 -08:00
Stephen Birarda
33cde412b1 make getJSONParameters thread-safe 2017-01-18 17:49:54 -08:00
Stephen Birarda
5fbdc94c66 pass usesFrustum down to EntityTreeElement 2017-01-18 17:49:54 -08:00
Stephen Birarda
ed41412d95 fix for unpack of OctreeQuery 2017-01-18 17:49:54 -08:00
Stephen Birarda
112b119f17 send entities that just stopped matching filter 2017-01-18 14:58:36 -08:00
Stephen Birarda
b08bfe93f4 change lastViewFrustumSent to lastQuerySent 2017-01-18 14:58:36 -08:00
Stephen Birarda
3556379034 leverage JSON filter changes to OctreeQuery in EntityServer 2017-01-18 14:58:36 -08:00
Stephen Birarda
f9f958aef1 provide direct access to OctreeQuery from OHV 2017-01-18 14:58:36 -08:00
Stephen Birarda
6e6f2c50b8 leverage OctreeQuery enhancements in EntityScriptServer/OHV 2017-01-18 14:58:36 -08:00
Stephen Birarda
ed68d5a7a2 add JSON filter to OctreeQuery 2017-01-18 14:58:36 -08:00
howard-stearns
f6446c6806 minimum entity edit filter 2017-01-13 13:18:24 -08:00
Brad Hefta-Gaub
dbbed462b4 cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
Brad Davis
30a9961362 tracing polish 2016-12-16 14:02:27 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
Seth Alves
6fe35ac0da use smart pointers to avoid leaking EntityTreeElementExtraEncodeData 2016-12-12 16:04:41 -08:00
Seth Alves
1d0c3d7168 fix checker for unreasonable size of vector of bools 2016-11-03 09:47:24 -07:00
Seth Alves
cfea3cba9b guard against heap-overflow in the event of bogus entity network data 2016-11-03 06:54:11 -07:00
Seth Alves
64cb5d1b1a fix QVector<bool> packing when number of joints isn't a multiple of 8 2016-11-02 20:02:07 -07:00
Seth Alves
f47aeae2a7 stop passing bare pointers to EntityTreeRenderer all around 2016-10-27 10:10:22 -07:00
Seth Alves
9bcda1bb45 merge from upstream 2016-08-20 15:25:04 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
Ryan Huffman
727d59ab27 Add backup directory setting to domain server 2016-08-16 17:33:32 -07:00
David Rowe
657f8fdad5 Fix reporting of JSON export failure 2016-06-15 14:12:49 +12:00
David Rowe
2953ca08cb Fix import of invalid JSON file failing silently 2016-06-10 12:04:41 +12:00
Ryan Huffman
68665e6b25 Fix JurisdictionMap not initializing correctly 2016-05-17 15:12:45 -07:00
Ryan Huffman
475d881b04 Fix logging of shared_ptr 2016-05-17 10:59:51 -07:00
Ryan Huffman
1bec38584b Remove class qualification from header file 2016-05-17 10:59:51 -07:00
Ryan Huffman
368eded8ee Remove unnecessary type in Jurisdictionmap 2016-05-17 10:59:51 -07:00
Ryan Huffman
5fc18eafda Rename OctalCodePtr related functions 2016-05-17 10:59:51 -07:00
Ryan Huffman
35f147f557 Cleanup use of OctalCodePtrList and add allocateOctalCodePtr 2016-05-17 10:59:51 -07:00
Ryan Huffman
e819ab8475 Add mutex protection around octal code getters 2016-05-17 10:59:51 -07:00
Ryan Huffman
ef6d758e7f Fix JurisdictionMap multithreading issues 
Make octal code pointers use shared_ptr, add locks around access.
 2016-05-17 10:59:51 -07:00
Brad Hefta-Gaub
d7eee98acc Merge pull request #7827 from AndrewMeadows/threadsafe-viewfrustum 
resurrection of threadsafe ViewFrustum
 2016-05-10 09:06:38 -07:00
Andrew Meadows
db9a4d6b8f cleanup for code review 2016-05-10 07:49:11 -07:00
Brad Hefta-Gaub
fe14bc8e52 also switch OctreePersistThread to use std::this_thread::sleep_for() 2016-05-06 11:19:27 -07:00
Andrew Meadows
01950fba96 recover unused code that may prove useful someday 2016-05-05 18:28:27 -07:00
Andrew Meadows
bcf2cc8074 use references not pointers for ViewFrustums 
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
 2016-05-05 18:28:27 -07:00