Commit graph

3049 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Ken Cooke
84af90ad96 Bump the audio packet version 2017-01-04 19:59:50 -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
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 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