Brad Hefta-Gaub
05995163cf
add support for tuning sorting
2017-02-22 09:49:47 -08:00
Brad Hefta-Gaub
a58ddad3aa
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements
2017-02-21 14:36:03 -08:00
Stephen Birarda
3b996f2b7f
bump packet version for new JSON query options
2017-02-21 09:29:07 -08:00
Brad Hefta-Gaub
d49c83cac3
fix build buster, some tweaks
2017-02-16 14:19:14 -08:00
Brad Hefta-Gaub
d532b3a4b8
more work on multi-core
2017-02-16 13:25:51 -08:00
Stephen Birarda
a3c123818d
Merge pull request #9661 from Atlante45/fix/possible-race
...
Fix possible race condition
2017-02-15 18:38:01 -08:00
David Kelly
5184cbe615
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2
2017-02-15 12:08:55 -07:00
Zach Pomerantz
2f52c09320
alphabetize io_stats
2017-02-14 23:17:11 +00:00
Zach Pomerantz
276c1abd0a
Merge branch 'master' of https://github.com/highfidelity/hifi into load/audio/packets-in
2017-02-14 23:06:36 +00:00
Brad Hefta-Gaub
f433347362
Merge pull request #9652 from sethalves/avatar-as-child-fixes
...
some fixes for when an avatar is a child of something else
2017-02-14 09:07:47 -08:00
Seth Alves
4393bc3c2e
Merge pull request #9656 from humbletim/21114-part1
...
CR-1 21114 -- ScriptCache/ScriptEngine cleanup, loader states, accessible load errors
2017-02-14 06:49:05 -08:00
David Kelly
156e365eff
update version
...
since new property was added, things will appear broken if this
version is used with old version (server or client).
2017-02-13 15:02:31 -07:00
Seth Alves
3d7633a11f
Merge branch 'master' of github.com:highfidelity/hifi into avatar-as-child-fixes
2017-02-13 13:44:05 -08:00
Atlante45
a1371a4f06
Fix possible race
2017-02-13 13:20:31 -08:00
Seth Alves
27d55d6ff0
bump avatar-mixer protocol version
2017-02-13 07:30:33 -08:00
Brad Hefta-Gaub
d82edaa36e
implement support for larger message payloads
2017-02-12 13:33:07 -08:00
humbletim
831bf93500
* refactor ScriptCache per FIXMEs
...
* include error details in BatchLoader results
* update EntityServerScript properties in edtior to reflect more granular statuses
* ScriptEngine plumbing in prep for require/module integration
2017-02-11 04:47:31 -05:00
Brad Hefta-Gaub
765500ebce
remove debug and fix bug in test script
2017-02-10 10:09:03 -08:00
Brad Hefta-Gaub
f6d4dbb7a4
some debugging
2017-02-10 09:18:04 -08:00
Zach Pomerantz
9b0f9e8d33
log full i/o stats
2017-02-10 04:32:42 -05:00
Brad Hefta-Gaub
6a4f66677e
Merge branch 'master' of https://github.com/highfidelity/hifi into binaryDataOverMessages
2017-02-09 21:10:10 -08:00
Brad Hefta-Gaub
987f147ed4
implement support for binary data over messages
2017-02-09 20:41:34 -08:00
Atlante45
fcb74bce10
First draft for entity script server log streaming
2017-02-09 13:04:43 -08:00
samcake
24a3a514a4
Merge pull request #9594 from AndrewMeadows/cap-fbx-texture-size
...
Cap fbx texture size
2017-02-07 12:46:22 -08:00
David Kelly
9788b4bdaf
Merge pull request #9601 from davidkelly/dk/deadlockPrevention
...
Minor cleanup
2017-02-07 12:56:03 -07:00
Seth Alves
e3af5032c0
send UserActivityLogger events when tablet is opened or closed
2017-02-06 16:49:26 -08:00
Andrew Meadows
b3ae6f9aec
cap size of textures from FBX files
2017-02-06 11:53:37 -08:00
howard-stearns
8b44e83d9e
Add new EntityPhysics packet type.
2017-02-06 11:11:18 -08:00
David Kelly
8612302f07
Revert "I like this better"
...
This reverts commit 069c85c7c2
2017-02-03 10:08:46 -07:00
David Kelly
069c85c7c2
I like this better
2017-02-03 08:52:33 -07:00
David Kelly
93fee0cf83
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/deadlockPrevention
2017-02-03 08:29:28 -07:00
David Kelly
77ca4cf515
Avoid holding 2 locks at same time
...
If they are always called in same order, you are fine. But just in
case, lets instead grab one lock, update the data, release it and then
grab the other. No possible deadlock in that, even if the order is
changed in one place or another.
2017-01-26 17:38:32 -07:00
ZappoMan
3c3dcbbbaa
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-26 08:20:03 -08:00
Atlante45
f540c94113
Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr
2017-01-25 13:06:49 -08:00
ZappoMan
29fff2e556
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-23 13:09:59 -08:00
Clément Brisset
6da188b6ae
Merge pull request #33 from huffman/feat/entity-server-script-property
...
Fix compilation error and move MessageID to CilentServerUtils
2017-01-20 17:37:01 -08:00
Ryan Huffman
e9c6e9dd5c
Move MessageID to ClientServerUtils
2017-01-20 16:43:11 -08:00
Stephen Birarda
7e9dffc028
fix version number for EntityQuery JSON filter
2017-01-20 14:08:28 -08:00
Ryan Downe Karpf
03851d4188
Merge pull request #9441 from davidkelly/dk/makeUsSomeAnalytics
...
Some initial analytics for PAL usage
2017-01-20 08:30:46 -08:00
Atlante45
3203e8c7c2
Use Huffman's version of getEntityScriptDetails
2017-01-19 15:49:40 -08:00
Ryan Huffman
091c353a85
Add comment to endif in EntityScriptUtils
2017-01-19 15:47:52 -08:00
Ryan Huffman
36a46c1bd6
Add EntityScriptUtils
2017-01-19 15:44:15 -08:00
Ryan Huffman
ff65d0c8cb
Fix property assignment in GetScriptStatusRequest
2017-01-19 15:33:17 -08:00
Ryan Huffman
465f5c6789
Add getters to ScriptStatusRequest
2017-01-19 15:09:16 -08:00
Ryan Huffman
fa28933464
Update EntityScriptClient to receive more status information
2017-01-19 13:27:44 -08:00
David Kelly
d9fbf832e2
Some initial analytics for PAL usage
2017-01-19 11:35:17 -08:00
Clément Brisset
89d1242925
Merge pull request #10 from huffman/feat/entity-server-script-property
...
Entity script status + reload
2017-01-19 11:19:40 -08:00
Stephen Birarda
ed68d5a7a2
add JSON filter to OctreeQuery
2017-01-18 14:58:36 -08:00
Zach Fox
0ec01c0dc5
CR feedback
2017-01-18 14:55:53 -08:00
Zach Fox
346cfbfe02
First checkpoint
2017-01-18 12:55:24 -08:00
