Commit graph

49683 commits

Author SHA1 Message Date
Stephen Birarda
746327dc11 whitespace cleanup in OST 2017-01-19 10:43:36 -08:00
Stephen Birarda
33cde412b1 make getJSONParameters thread-safe 2017-01-18 17:49:54 -08:00
Stephen Birarda
916a7325bc remove debug in EntityScriptServer 2017-01-18 17:49:54 -08:00
Stephen Birarda
a86be14b8c remove debug in OctreeSendThread 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
fc03d25155 Merge pull request #14 from Atlante45/ess-pr
Unload all scripts on entity server loss
2017-01-18 17:48:43 -08:00
Atlante45
6b0b19d36d Unload all scripts on entity server loss 2017-01-18 17:47:19 -08:00
Stephen Birarda
fe2a5d6059 Merge pull request #12 from Atlante45/ess-pr
Fix server script preload funcitons
2017-01-18 16:44:07 -08:00
Atlante45
cbc69fbf9e Fix script preload functions 2017-01-18 16:42:25 -08:00
Atlante45
e94cccf08d Fix server script preload funcitons 2017-01-18 16:12:41 -08:00
Stephen Birarda
8dabf25c42 Merge pull request #11 from Atlante45/ess-pr
Automatically query octree
2017-01-18 15:21:25 -08:00
Atlante45
e15bf6bfb4 Automatically query octree 2017-01-18 15:15:29 -08:00
Clément Brisset
842692e99b Merge pull request #9 from birarda/entity-script-server
ability to query without frustum only for entities with server scripts
2017-01-18 15:14:02 -08:00
Stephen Birarda
112b119f17 send entities that just stopped matching filter 2017-01-18 14:58:36 -08:00
Stephen Birarda
5d1b53c600 move map population with properties back 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
a1ad496772 handle match on non-default serverScripts property during entity send 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
Ryan Huffman
3b5b88e719 Move MessageID to AssetUtils 2017-01-18 11:17:13 -08:00
Ryan Huffman
d85f27e992 Add Entities.getServerScriptStatus 2017-01-18 11:15:59 -08:00
Ryan Huffman
8137c59ef7 Add support for sending requests to entity script server 2017-01-18 11:15:29 -08:00
Atlante45
20b7bb0c54 EntityScriptServer tracks server scripts 2017-01-17 16:41:56 -08:00
Atlante45
97e9bfff36 Remove Viewer API for entity server scripts 2017-01-17 15:40:05 -08:00
Atlante45
ff3f175fb7 Fix typos 2017-01-17 15:39:54 -08:00
Clément Brisset
57d324a9e9 Merge pull request #8 from huffman/feat/entity-server-script-property
Add serverScripts entity property
2017-01-17 15:37:07 -08:00
Ryan Huffman
340eeb94fa Add return type to lambdas in EntityTreeRenderer 2017-01-17 15:24:14 -08:00
Ryan Huffman
71e039951c Add reload server scripts button to edit.js 2017-01-17 14:47:57 -08:00
Ryan Huffman
812aaee48c Add Entities.reloadServerScripts 2017-01-17 14:47:57 -08:00
Ryan Huffman
142c7da523 Add serverScripts property support to edit.js 2017-01-17 14:47:06 -08:00
Ryan Huffman
b0c2a9d614 Add serverScripts entity property 2017-01-17 14:47:06 -08:00
Atlante45
1212fefa61 Check for avatar collision in assignment as well 2017-01-17 13:47:45 -08:00
Atlante45
8d199ded15 Check collision against the right owner 2017-01-17 13:47:45 -08:00
Atlante45
5db37fff95 More entity script server work 2017-01-17 13:47:45 -08:00
Atlante45
529286b2ea More EntityScriptServer work 2017-01-17 13:47:45 -08:00
Atlante45
163d65d784 Setup basic EntityScriptServer 2017-01-17 13:47:45 -08:00
Ryan Huffman
d9e7c423f6 Merge pull request #9409 from birarda/granular-stats
add 1s heartbeat interval command line switch
2017-01-17 13:21:42 -08:00
Stephen Birarda
1e04aebb8d add --fast-hearbeat command line switch for 1s stats 2017-01-17 11:25:40 -08:00
Philip Rosedale
b02a5f85ec Merge pull request #9405 from ZappoMan/bugFix
improve comment in domain settings
2017-01-16 20:47:43 -08:00
ZappoMan
5e49e8025a improve comment in domain settings 2017-01-16 21:06:38 -06:00
Seth Alves
f900629cdb Merge pull request #9390 from sethalves/load-models-in-keyhole
fix physics not starting up when a model is close behind
2017-01-16 18:06:23 -08:00
Chris Collins
1df13d6a56 Merge pull request #9399 from howard-stearns/hand-controll-grab-update
handControllerGrab update loop change
2017-01-16 16:41:02 -08:00
Chris Collins
5f34ad3596 Merge pull request #9400 from AndrewMeadows/fix-cauterization-hack
don't render non-skinned meshes on head when in first person
2017-01-16 15:47:52 -08:00
Andrew Meadows
fd28457807 fix cauterization hack 2017-01-16 15:13:28 -08:00
howard-stearns
0a3236dcc9 handControllerGrab update loop change 2017-01-16 14:54:32 -08:00
Zach Fox
079e5c4296 Merge pull request #9397 from zfox23/FB-2814
Fix FB-2814 "Users.requestUsernameFromID() doesn't work for yourself"
2017-01-16 12:54:28 -08:00
Zach Fox
e22c1ac30e Fix the bug 2017-01-16 11:48:51 -08:00