Andrew Meadows
6ea6477c73
Merge pull request #9683 from jherico/cache_flush
...
Clear caches on domain switch
2017-03-06 11:05:44 -08:00
Zach Pomerantz
6a7ee4321b
suppress logs for file_cache
2017-03-02 13:30:51 -05:00
Zach Pomerantz
cca1f2fb25
include <atomic> in FileCache
2017-03-02 11:28:49 -05:00
Zach Pomerantz
1425eb0936
Merge branch 'smarter_textures' of github.com:highfidelity/hifi into 2-27
2017-03-01 21:01:37 -05:00
Zach Pomerantz
febeeeca3a
namespace cache::FileCache and use unique_ptr
2017-03-01 20:58:00 -05:00
Zach Pomerantz
c71e614dd5
add loading from persisted files
2017-03-01 20:18:31 -05:00
Zach Pomerantz
a6a0fd3851
fix FileCache persistence
2017-03-01 11:32:11 -05:00
David Kelly
efe44425a6
cr feedback, plus something I missed
2017-03-01 09:26:03 -07:00
Zach Pomerantz
de23a11dee
wip
2017-02-28 17:25:56 -05:00
David Kelly
c10b0389de
Add a getAvatarGain method to NodeList and UsersScriptingInterface
2017-02-28 14:45:34 -07:00
Zach Pomerantz
b03f51dd26
fix double fclose
2017-02-28 16:08:54 -05:00
Zach Pomerantz
8969d7df1d
FileCache
2017-02-27 17:58:48 -05:00
Seth Alves
73774a6590
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
2017-02-24 11:34:59 -08:00
Seth Alves
0a2a1b1637
include visible_to_others in UserActivityLoggerScriptingInterface::openedTablet
2017-02-23 15:25:09 -08:00
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
Brad Hefta-Gaub
a526db1779
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements
2017-02-21 14:18:36 -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
Brad Davis
127a014b46
Clear caches on domain switch
2017-02-15 15:21:08 -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
Ryan Huffman
3b5b88e719
Move MessageID to AssetUtils
2017-01-18 11:17:13 -08:00
Ryan Huffman
8137c59ef7
Add support for sending requests to entity script server
2017-01-18 11:15:29 -08:00
Zach Fox
7a568ed8a7
Merge pull request #9401 from zfox23/PAL_DisplayName
...
PAL: Editable Display Names & Immediate Update
2017-01-17 16:00:41 -08:00
Ryan Huffman
812aaee48c
Add Entities.reloadServerScripts
2017-01-17 14:47:57 -08:00
Ryan Huffman
b0c2a9d614
Add serverScripts entity property
2017-01-17 14:47:06 -08:00
Atlante45
163d65d784
Setup basic EntityScriptServer
2017-01-17 13:47:45 -08:00
Zach Fox
246f5fb7f5
Add log; fix whitespace
2017-01-17 11:51:09 -08:00
David Kelly
2460e89a57
CR feedback
2017-01-17 09:53:04 -08:00
David Kelly
6c07a9aece
remove debuggng logspam
2017-01-16 19:06:36 -08:00
David Kelly
6c701bb0f0
remove ignored avatars from PAL when they disconnect
2017-01-16 18:22:53 -08:00
Zach Fox
1e8effdcc4
Packet verison bump
2017-01-16 15:28:53 -08:00
ZappoMan
c884b276e2
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-14 22:15:22 -08:00
Zach Fox
b0b6aeac6c
Ken's feedback
2017-01-13 13:00:03 -08:00
Zach Fox
8c3766dfe8
Fixme
2017-01-13 12:59:24 -08:00
Zach Fox
8bb200902f
First pass
2017-01-13 12:57:35 -08:00
Brad Davis
e256f7cccc
Remove sendqueue spam in traces
2017-01-11 14:27:27 -08:00
Brad Hefta-Gaub
ef7b9bfde0
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-09 10:07:05 -08:00
Zach Fox
dec41f67cc
Fix bugs and generally fix behavior
2017-01-06 13:58:23 -08:00
Zach Fox
b7d64804c1
Remove errant //FIXME
2017-01-05 21:55:09 -08:00
Zach Fox
495925a017
This behavior was harder to change than expected...
2017-01-05 16:58:32 -08:00
Brad Hefta-Gaub
5242375215
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-05 08:57:10 -08:00
Ken Cooke
84af90ad96
Bump the audio packet version
2017-01-04 19:59:50 -08:00
Brad Hefta-Gaub
acca9dbe87
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
...
Conflicts:
libraries/networking/src/udt/PacketHeaders.cpp
libraries/networking/src/udt/PacketHeaders.h
2017-01-04 18:07:22 -08:00
Zach Fox
e80ae92327
Also clear personalmutedlist upon reset()
2017-01-04 15:06:18 -08:00
Howard Stearns
3d8da683db
Merge pull request #9290 from zfox23/PersonalMute
...
Personal mute; Quasi-ignore; Reversible PAL actions
2017-01-04 14:37:09 -08:00
Zach Fox
14def61eb8
More CR comments; 1 bug remaining re: sig slot
2017-01-03 17:32:47 -08:00
Zach Fox
899dd21328
Lots of CR feedback
2017-01-03 15:43:30 -08:00
Brad Hefta-Gaub
60d48bcd49
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-03 14:42:59 -08:00
Zach Fox
10b5b957f2
Ahh...It's beautiful and simple now.
2016-12-29 13:09:40 -08:00
Zach Fox
24eac77115
I'm about to refactor this.
2016-12-29 11:57:51 -08:00
Zach Fox
bb2b48d424
Getting very close.
2016-12-29 11:35:20 -08:00
Brad Hefta-Gaub
a72f60152b
audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate
2016-12-29 08:53:37 -08:00
Zach Fox
af1c67a252
Progress!
2016-12-28 17:23:56 -08:00
Zach Fox
e26d347682
It seems to be working, minus removing from list
2016-12-28 15:15:39 -08:00
Zach Fox
46e8bf5283
First steps, holding off til Howard finishes
2016-12-28 15:12:21 -08:00
Zach Fox
800389cf20
Remove HRS logging
2016-12-28 14:37:19 -08:00
David Kelly
38a3ee4104
Some code review feedback
...
more to come
2016-12-27 10:17:39 -08:00
howard-stearns
a9e781f565
naming consistentcy. No functional changes.
2016-12-27 10:17:39 -08:00
howard-stearns
8b9c1446cd
protocol versions
2016-12-27 10:17:39 -08:00
howard-stearns
2f2940b7cc
fixes
2016-12-27 10:14:28 -08:00
Howard Stearns
344272f24a
unignore checkpoint (untested)
2016-12-27 10:14:24 -08:00
howard-stearns
0ad9786f6b
requestsDomainsListData
2016-12-27 10:14:20 -08:00
Brad Hefta-Gaub
02a6060b5e
hacking on new format
2016-12-22 16:16:44 -08:00
Brad Davis
e58623bcc0
Working on test/trace script interface
2016-12-22 11:46:40 -08:00
Brad Hefta-Gaub
be62df2001
Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer
2016-12-21 08:59:29 -08:00
David Kelly
50554e934e
Merge branch 'master' of github.com:highfidelity/hifi into dk/noFingerprintWhenLoggedIn
2016-12-20 16:30:10 -08:00
Brad Hefta-Gaub
d09afa9454
Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer
...
Conflicts:
assignment-client/src/avatars/AvatarMixer.h
assignment-client/src/avatars/AvatarMixerClientData.h
libraries/avatars/src/AvatarData.cpp
libraries/networking/src/udt/PacketHeaders.h
2016-12-20 16:25:12 -08:00
David Kelly
4a25b727d8
Add comment back, with interest
2016-12-20 14:26:45 -08:00
David Kelly
7750e86c13
Only send machine fingerprint when not logged in
...
While at it, no longer grabbing it at all when starting up, as that
was just a dev thing. Should consider not sending MAC address too, but
we may revisit that later.
2016-12-20 13:47:58 -08:00
Brad Hefta-Gaub
9b11c7cc9c
Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam
...
Conflicts:
libraries/networking/src/NodeList.cpp
2016-12-20 10:46:57 -08:00
Howard Stearns
9aad93465d
Merge pull request #9227 from howard-stearns/sessionDisplayNames
...
Session display names
2016-12-20 10:07:05 -08:00
Howard Stearns
9ff06e53d4
Merge pull request #9235 from davidkelly/dk/fingerprintInPAL
...
Expose Machine Fingerprint in PAL
2016-12-20 10:06:36 -08:00
Brad Hefta-Gaub
c65471e880
Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam
...
Conflicts:
libraries/script-engine/src/FileScriptingInterface.cpp
2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
dbbed462b4
cleanup naked qDebug() calls
2016-12-19 22:24:25 -08:00
Chris Collins
61c60fca2d
Merge pull request #8968 from ctrlaltdavid/21089
...
Clara.io marketplace improvements
2016-12-19 18:21:45 -08:00
David Kelly
4feec85337
CR feedback
...
Though this seems like a hard place to remember, when we make further
changes.
2016-12-19 17:23:24 -08:00
David Kelly
5b9c19b39e
Versioning
2016-12-19 16:06:12 -08:00
howard-stearns
60cb7acb50
Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames
2016-12-19 15:28:07 -08:00
David Kelly
36792e005a
initial commit
2016-12-19 14:19:39 -08:00
David Kelly
c0d7c06d4a
Merge pull request #9221 from davidkelly/dk/machineFingerprintToDS
...
Adding Machine Fingerprint to Domain Server permissions
2016-12-19 11:49:33 -08:00
Zach Fox
a912fec496
PR comments; need particular fix on Master for full QA
2016-12-19 10:20:08 -08:00
Zach Fox
e940daf5b4
Comments and clarity
2016-12-19 10:20:08 -08:00
Zach Fox
2c5db54b08
Super close
2016-12-19 10:20:08 -08:00
Zach Fox
802e283508
Another checkpoint, getting closer
2016-12-19 10:20:08 -08:00
Zach Fox
c9dc91900f
Checkpoint
2016-12-19 10:20:08 -08:00
howard-stearns
9d9345cb65
Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames
2016-12-19 09:19:14 -08:00
Brad Davis
ee3c8e6efd
Merge pull request #9225 from jherico/chrome_tracing
...
Additional work on tracing
2016-12-16 17:53:55 -08:00
David Kelly
0553dbdcb7
CR feedback
2016-12-16 17:17:10 -08:00
Ryan Huffman
8f536fcf5e
Fix syntax error in UserActivityLogger
2016-12-16 15:05:17 -08:00
Ryan Huffman
f3f6317c91
Add controller name and update version in tutorial user stats
2016-12-16 15:05:17 -08:00
howard-stearns
3adc78fecc
Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames
2016-12-16 14:16:06 -08:00
howard-stearns
49fd4216de
sessionDisplayName set at server and passed to all clients (including
...
oneself)
2016-12-16 14:15:20 -08:00
Brad Davis
30a9961362
tracing polish
2016-12-16 14:02:27 -08:00
David Kelly
126ae52cb4
Merge branch 'master' of github.com:highfidelity/hifi into dk/machineFingerprintToDS
2016-12-16 12:17:54 -08:00
Brad Davis
a12b8b4b62
Cleanup dead code
2016-12-16 09:21:41 -08:00
David Kelly
7a346b99b9
Add CoreFoundation to libraries we link to on MacOS
...
Turns out vhacd-util and ice-server don't link to it, and we need
it for machine fingerprint. So the build system doesn't make mac
vhacd-util or ice-server builds I guess, or this would have shown
up awhile ago.
2016-12-16 08:58:20 -08:00
Ryan Huffman
7bb2755913
Add chrome tracing support
2016-12-16 01:14:01 -08:00
David Rowe
9459b967be
Merge branch 'master' into 21089
2016-12-16 20:02:43 +13:00
Brad Hefta-Gaub
8497ad1e29
Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer
2016-12-15 16:42:41 -08:00
Seth Alves
26639aac15
Merge pull request #8789 from Atlante45/fix/settings
...
Use JSON for application Settings
2016-12-15 07:00:46 -08:00
David Kelly
2566778654
Handle no setting manager case
...
Can't save the fallback generated UUID for machine fingerprint if
the user of this stuff doesn't have a settings file. Found this when
I noticed needed to initialize com for all the assignment clients
2016-12-14 16:43:37 -08:00
David Kelly
cb14b0e3e0
inital cut, passing fingerprint in
...
does permissions same as mac address, more or less. Not exposed
yet, just a beginning.
2016-12-14 16:09:13 -08:00
Brad Hefta-Gaub
a7750501c6
first cut at adding view frustum support to avatar mixer
2016-12-13 18:58:11 -08:00
Zach Fox
44c6eb303b
Fix the bug
2016-12-13 12:46:31 -08:00
