Stephen Birarda
|
33f42bec78
|
Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp
|
2015-07-17 11:07:17 -07:00 |
|
Atlante45
|
fec6b6b0bb
|
Merge branch 'protocol' of https://github.com/huffman/hifi into protocol
|
2015-07-17 11:07:13 -07:00 |
|
Stephen Birarda
|
eb80922325
|
Merge branch 'protocol' of https://github.com/huffman/hifi into atp
|
2015-07-17 11:07:10 -07:00 |
|
Stephen Birarda
|
357963b6e0
|
fix reference to packet that is now buffer
|
2015-07-17 11:06:39 -07:00 |
|
Atlante45
|
6da9825bac
|
Include stdlib string instead of cstring
|
2015-07-17 11:06:23 -07:00 |
|
Stephen Birarda
|
e5722098f6
|
resolve conflicts on merge with upstream/master
|
2015-07-17 11:06:01 -07:00 |
|
Ryan Huffman
|
9725184b24
|
Move dataSent signal from PacketReceiver to LimitedNodeList
|
2015-07-17 11:05:07 -07:00 |
|
Atlante45
|
fbaf25f3f9
|
Remove unused header
|
2015-07-17 11:04:54 -07:00 |
|
bwent
|
b22fd3f4a0
|
fixed lagging issues
|
2015-07-17 10:58:30 -07:00 |
|
Atlante45
|
cf453952f4
|
Rename should nack
|
2015-07-17 10:52:27 -07:00 |
|
Atlante45
|
7487f708b9
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-17 10:49:40 -07:00 |
|
Stephen Birarda
|
0811553c41
|
add a direct registration for EntityEditPacketSender
|
2015-07-17 10:49:24 -07:00 |
|
Ryan Huffman
|
68564a79b0
|
Merge branch 'protocol' of github.com:Atlante45/hifi into protocol
|
2015-07-17 09:59:05 -07:00 |
|
Atlante45
|
7f9d6dafce
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-17 09:56:41 -07:00 |
|
Stephen Birarda
|
2d5428276a
|
shouldNack default to true
|
2015-07-17 09:56:27 -07:00 |
|
Ryan Huffman
|
988fc79126
|
Merge branch 'atp' of github.com:birarda/hifi into protocol
|
2015-07-17 09:55:50 -07:00 |
|
Philip Rosedale
|
ee435d9732
|
remove comment
|
2015-07-17 09:43:33 -07:00 |
|
Philip Rosedale
|
689b0e2571
|
Improve to run correctly on startup as AC
|
2015-07-17 09:41:48 -07:00 |
|
Atlante45
|
bc1569be6b
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-17 09:32:44 -07:00 |
|
Stephen Birarda
|
9466d5eca5
|
add the stop node packet to list of non sourced
|
2015-07-17 09:29:59 -07:00 |
|
ZappoMan
|
efa2001325
|
Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL
|
2015-07-17 09:25:37 -07:00 |
|
Stephen Birarda
|
7d2495e289
|
set the generic thread priority once it's actually started
|
2015-07-17 09:24:00 -07:00 |
|
Stephen Birarda
|
97312f9898
|
remove dead listener from map right before invoke
|
2015-07-17 09:21:10 -07:00 |
|
Stephen Birarda
|
7d60b86f52
|
kill the PacketLister (AKA Huffman 1 : PacketListener 0)
|
2015-07-17 09:07:39 -07:00 |
|
Philip Rosedale
|
db219905f3
|
re-use audio injectors, don't check if isPlaying immediately after starting play out
|
2015-07-17 00:30:31 -07:00 |
|
Philip Rosedale
|
5c29eb97ef
|
remove debug
|
2015-07-16 23:32:40 -07:00 |
|
Philip Rosedale
|
cf9365e616
|
Add new sample script with flocking
|
2015-07-16 22:46:41 -07:00 |
|
David Rowe
|
c46533d9a6
|
Make renderGrid handle changing position and dimensions
So that audio scope grid moves when Interface window is resized.
|
2015-07-16 21:05:14 -07:00 |
|
Andrew Meadows
|
2441be21e2
|
restore order of setting properties
|
2015-07-16 20:58:34 -07:00 |
|
ericrius1
|
220b54e5f7
|
added reference to correct zombie game script
|
2015-07-16 18:30:24 -07:00 |
|
Stephen Birarda
|
e7249594e1
|
unregister the AvatarHashMap packet registrations
|
2015-07-16 17:55:29 -07:00 |
|
Stephen Birarda
|
040c7557da
|
fix double register for Agent avatar packets
|
2015-07-16 17:51:06 -07:00 |
|
Andrew Meadows
|
18d0cb5158
|
cleanup of EntityItem ctors and friends
|
2015-07-16 17:48:28 -07:00 |
|
Stephen Birarda
|
49f5a5ffcb
|
remove double declaration of PacketReceiver
|
2015-07-16 17:46:46 -07:00 |
|
Atlante45
|
b1821fc686
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-16 17:45:00 -07:00 |
|
Stephen Birarda
|
ce6585ccc8
|
fix AC monitor and AM double register
|
2015-07-16 17:44:43 -07:00 |
|
Brad Davis
|
7e32bfb85e
|
Fixing mac/linux build
|
2015-07-16 17:35:05 -07:00 |
|
Atlante45
|
fb67dd9858
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-16 17:30:43 -07:00 |
|
Stephen Birarda
|
e8de73427b
|
fix suppression of hash mismatch messages
|
2015-07-16 17:25:55 -07:00 |
|
Brad Davis
|
e6e9f017c0
|
Fixing test code
|
2015-07-16 17:23:25 -07:00 |
|
Stephen Birarda
|
b257daaef1
|
fix supression of repeated messages for version mismatch
|
2015-07-16 17:23:00 -07:00 |
|
Atlante45
|
95f0dfbc43
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-16 17:09:22 -07:00 |
|
Stephen Birarda
|
2a2eb39066
|
repairs for DS path query and response
|
2015-07-16 17:08:06 -07:00 |
|
Atlante45
|
ceea5143e1
|
Avoid string copy
|
2015-07-16 16:55:37 -07:00 |
|
Atlante45
|
497e311a2e
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-16 16:47:53 -07:00 |
|
Atlante45
|
6ce710f237
|
Fix domain request denied reason read
|
2015-07-16 16:47:09 -07:00 |
|
ZappoMan
|
410e0a99ad
|
hacking on more naked GL
|
2015-07-16 16:45:58 -07:00 |
|
Stephen Birarda
|
487969ef7a
|
pack reason size as quint16
|
2015-07-16 16:45:16 -07:00 |
|
Brad Davis
|
ae10d58142
|
Fixing font class
|
2015-07-16 16:42:29 -07:00 |
|
ZappoMan
|
069620b2d9
|
hacking on more naked GL
|
2015-07-16 16:36:48 -07:00 |
|