Commit graph

49611 commits

Author SHA1 Message Date
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
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
David Kelly
95aad3140d Merge pull request #9386 from davidkelly/dk/manageAudioIntervalInPal
Manage audio interval timer in PAL
2017-01-16 11:29:05 -08:00
Stephen Birarda
1993e358d6 Merge pull request #9318 from birarda/ovr-platform-entitlement
handle OVR Platform entitlement checks
2017-01-16 11:16:31 -08:00
Zach Fox
d2c7342a62 Merge pull request #9352 from zfox23/PerAvatarVolume
PAL: Per-Avatar Volume Slider; visual tweaks
2017-01-16 10:34:31 -08:00
samcake
36ee7758cf Merge pull request #9394 from jherico/fbx_parse_fix
Fix bug in FBX parse changes
2017-01-16 10:27:52 -08:00
Brad Davis
67ce5040ec Fix bug in FBX parse changes 2017-01-16 10:09:47 -08:00
Seth Alves
bd67715cd2 don't early-exit from the loop that checks for loaded collision hulls because the check is what causes the hulls to be constructed 2017-01-16 08:54:56 -08:00
Chris Collins
2557c797af Merge pull request #9300 from zzmp/graphics/forward-opaque
Add opaques/skinned to forward rendering path
2017-01-16 08:48:18 -08:00
Seth Alves
050a7e87d2 load entity models that don't yet need to be rendered but are close enough to keep physics from being enabled. 2017-01-15 17:04:51 -08:00
Brad Hefta-Gaub
98699885f4 Merge pull request #9385 from kencooke/audio-mixformat-invalid
Fix audio failures
2017-01-14 14:53:01 -08:00
David Kelly
baed3bc3b3 Manage audio interval timer in PAL
Now, it is only running when PAL is up.  Was running (but doing nothing
before.  Somewhat more efficient this way.
2017-01-14 12:57:00 -07:00
Ken Cooke
42e13d1e97 Fix audio failures on systems that return incorrect/unsupported mixFormat 2017-01-14 10:26:13 -08:00
Zach Fox
a5343d9aa9 Final tweaks before PR! 2017-01-13 17:20:29 -08:00
Zach Fox
a89868dcad Make sliders appear only when row is selected 2017-01-13 15:41:17 -08:00
Zach Fox
8343769352 NameCard improvements & user feedback 2017-01-13 15:25:07 -08:00
samcake
584feef56d Merge pull request #9371 from jherico/fbx_parse_optimizations
Improve FBX parsing performance
2017-01-13 13:44:54 -08:00
Zach Fox
a69a10b8e4 Cleanup after rebase 2017-01-13 13:15:01 -08:00
Zach Fox
a9226e303c Pull out visual changess & move them to other PR 2017-01-13 13:00:23 -08:00
Zach Fox
b0b6aeac6c Ken's feedback 2017-01-13 13:00:03 -08:00
Zach Fox
b9cddc31a9 Checkpoint before implementing Ken's suggestions 2017-01-13 13:00:03 -08:00
Zach Fox
8c3766dfe8 Fixme 2017-01-13 12:59:24 -08:00
Zach Fox
503468e49b Style changes 2017-01-13 12:59:23 -08:00
Zach Fox
dcff873cd4 Modify slider function 2017-01-13 12:57:35 -08:00