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
Sam Gondelman
3f117cd3e0
Merge branch 'master' into scriptvec3
2018-10-17 13:57:21 -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
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
