Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-05 10:17:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
70414 commits 69 branches 57 tags 1.2 GiB
Commit graph

1042 commits

Author SHA1 Message Date
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
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
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
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
Ryan Huffman
6b159d6124 Remove redundant read of octree data on startup 2018-06-13 11:54:20 -07:00
Simon Walton
9ae3411abe Have ~OctreeProcessor break cycle instead of using weak pointers 2018-06-12 12:32:27 -07:00
Ryan Huffman
fa22ea7630 Update ES to keep the backup that pushes file size over the limit 2018-06-11 11:58:50 -07:00
Ryan Huffman
11a48915e2 Fix order of variable initialization in OctreePersistThread 2018-06-11 09:48:22 -07:00
Ryan Huffman
94069c964d Remove unused variable and log message in OctreePersistThread 2018-06-11 08:37:19 -07:00
Ryan Huffman
9afc9d19c5 Cleanup comments and process structure in OctreePersistThread 2018-06-08 16:22:11 -07:00
Ryan Huffman
d0af06939f Update persistInterval to use std::chrono in OctreePersistThread 2018-06-08 16:22:11 -07:00
Ryan Huffman
8f4f3db9ce Add octree backup file cleanup 2018-06-08 16:22:11 -07:00
Ryan Huffman
d476146a56 Move OctreePersistThread off GenericThread and add octree negotiation 2018-06-08 16:22:11 -07:00
Ryan Huffman
2143bae100 Remove unused entity server backups 
The domain server now handles entity backups so this code is no longer
used.

This also fixes a bug where, if the entity server went down while
writing the persist file, it would leave a lock file behind. When
starting up the next time it would try to recover from the last backup.
Because the entity server no longer gets any backup rules, and the way
it searches for backups, it would end up finding the lock file and
treating it as the most recent backup. This meant that the
models.json.gz file was replaced with an empty file.
 2018-06-08 16:17:30 -07:00
David Back
ac33f33828 update version from json in toByteArray 2018-05-31 09:24:16 -07:00
John Conklin II
88163424f0
Merge pull request #13164 from SimonWalton-HiFi/entities-relaying 
Move down OctreeQueryNode::_viewMutex to OctreeQuery
 2018-05-21 10:14:41 -07:00
Simon Walton
454978a9c2 Add more locking of _conicalViews vector 2018-05-14 15:15:58 -07:00
Simon Walton
9bb966dd1d Push down OctreeQueryNode lock to OctreeQuery and use for conical views 
Possibly related to
https://highfidelity.manuscript.com/f/cases/14165/entity-server-doesn-t-always-relay-added-entities-to-clients
 2018-05-11 17:12:53 -07:00
John Conklin II
4129664368
Merge pull request #13145 from highfidelity/stable 
Merge RC67 stable into master
 2018-05-10 17:07:20 -07:00
Seth Alves
db03265a6b when in serverless mode, short-circuit simulation ownership bids 2018-05-09 10:53:46 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
Clement
487a63025f Fix warning 2018-05-03 18:19:52 -07:00
Clement
27c471ee97 Move all wire frustums to conical frustums 2018-05-03 18:19:29 -07:00
Clement
3283c5eaec Fix inverted comparaison 2018-05-03 18:19:29 -07:00
Clement
67c119cd2e Send Entity Query via conical frustums 2018-05-03 18:19:29 -07:00
Clement
49fad3d868 EntityServer traversal aware of all ViewFrustums 2018-05-01 18:02:29 -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
Simon Walton
9f9a68188d Merge remote-tracking branch 'upstream/master' into short-id 2018-04-20 11:10:21 -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
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp 
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
 2018-04-18 17:28:48 -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
Andrew Meadows
a0f3e3a031 add simulation ownership expiry 2018-04-11 09:40:32 -07:00
Ryan Huffman
010356709d Remove lock file recovery in entity server 
* We no longer make backups at the ES, so there is no backup to
  recover from if we crash during persist to disk.
  * When loading the most recent backup we look for files that match our
  backup rules. If we have no backup rules we end up grabbing
  everything.
  * Because we grab everything, we are at risk of grabbing the lock file
  and treating it as a backup. In the case where we crash on persist, we
  end up replacing the models.json.gz file with the lock file (!!).

This commit makes a small change to not do the recovery on startup. In a
future update we will remove the backup-related code on the ES
altogether.
 2018-04-05 11:52:31 -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
Simon Walton
d3464378b7 Short local source IDs - checkpoint 
DS assigns 16-bit IDs as well as UUIDs; ACs track mappings;
nodes use short IDs in packets. Initial setup works; then
fails prob. due to DS UUID.
 2018-03-27 13:46:58 -07:00
Seth Alves
b39c7eadd2 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-13 09:24:18 -07:00
Seth Alves
b8fc9e2469 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-07 07:40:35 -08:00
David Rowe
a62b6b7150 Merge branch 'master' into 21709 2018-03-07 17:34:53 +13:00
David Rowe
eeb7f5ca8d Doc review 2018-03-07 17:29:39 +13: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