Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
68362 commits 29 branches 0 tags 1.1 GiB
Commit graph

1022 commits

Author SHA1 Message Date
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
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
David Rowe
9c1fa7a8d2 Miscellaneous JSDoc tidying and fixes 2018-02-28 11:44:03 +13: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
8a8830bbd4 Fix writeSubclassData in octree data 2018-02-26 17:06:25 -08:00
Ryan Huffman
ec210e1750 Move OctreeUtils to OctreeDataUtils 2018-02-26 16:51:42 -08:00
Ryan Huffman
3fa538d42d Add RawEntityData subclass 2018-02-26 16:32:09 -08:00
Ryan Huffman
dbfbee5406 CR 2018-02-26 13:53:20 -08:00
David Rowe
a8e05824cd Entities octree sending functions JSDoc 2018-02-25 14:15:39 +13:00
Atlante45
c106fee659 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration 2018-02-22 19:45:43 -08:00
Dante Ruiz
d394c891c5 allow Octreee to load compressed gz files 2018-02-22 10:10:54 -08:00
Ryan Huffman
0bbbff95cd Fix replacement octree data not working 2018-02-15 10:09:21 -08:00
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