Niraj Venkat
|
85c9ee0feb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
Conflicts:
libraries/render-utils/src/AmbientOcclusionEffect.cpp
|
2015-07-20 14:53:19 -07:00 |
|
Atlante45
|
8d6ff2d9f9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
|
2015-07-20 14:50:44 -07:00 |
|
Brad Davis
|
c0859ffd4c
|
Removing some dead forward declarations
|
2015-07-20 14:33:10 -07:00 |
|
ZappoMan
|
d41d86c33c
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-07-20 14:31:58 -07:00 |
|
Andrew Meadows
|
7578a70c4c
|
Merge pull request #5359 from birarda/protocol
Network Protocol Refactor
|
2015-07-20 14:30:58 -07:00 |
|
Atlante45
|
59acfc9f47
|
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
|
2015-07-20 13:51:51 -07:00 |
|
Brad Davis
|
488a449cb1
|
Merge branch 'master' into homer
|
2015-07-20 13:34:21 -07:00 |
|
Stephen Birarda
|
0177513285
|
resolve conflicts on merge with upstream/master
|
2015-07-20 12:29:38 -07:00 |
|
Sam Gateau
|
1a9f6e12a5
|
something not compiling but just before merge with upstream
|
2015-07-20 12:20:04 -07:00 |
|
Brad Hefta-Gaub
|
c41e20b90f
|
Merge pull request #5366 from jherico/marge
Naked GL removal work
|
2015-07-20 12:12:22 -07:00 |
|
Brad Davis
|
3d09e772f9
|
Merge branch 'marge' into homer
|
2015-07-20 12:09:51 -07:00 |
|
ericrius1
|
dcb2012070
|
can toggle hit effect on and off from a script
|
2015-07-20 12:02:01 -07:00 |
|
ericrius1
|
e75a6feafe
|
can toggle hit effect on and off from a script
|
2015-07-20 11:58:26 -07:00 |
|
Brad Davis
|
23b058e4eb
|
Removing starfield tilt and reducing grid alpha
|
2015-07-20 11:40:12 -07:00 |
|
ericrius1
|
3439d45e0e
|
adding hit effect logic
|
2015-07-20 11:02:15 -07:00 |
|
Brad Davis
|
dcaaeec593
|
Removing AO effect (temporarily) and wireframe mode
|
2015-07-20 10:55:11 -07:00 |
|
Seth Alves
|
7c5286e804
|
Merge pull request #5356 from howard-stearns/isPlaying
Make sure that Audio isPlaying is correct
|
2015-07-20 10:51:58 -07:00 |
|
Atlante45
|
fc2956342e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
|
2015-07-20 10:39:16 -07:00 |
|
Brad Davis
|
cd677ccb18
|
Removing animation from star grid
|
2015-07-20 10:18:14 -07:00 |
|
Brad Davis
|
d4e637c5b8
|
Removing superfluous lighting and naked GL in mirror
|
2015-07-20 09:36:05 -07:00 |
|
Stephen Birarda
|
6b11495a20
|
resolve conflicts on merge with upstream master
|
2015-07-20 08:51:48 -07:00 |
|
Brad Davis
|
5159452335
|
Fixing invalid vector usage and strange picking crash
|
2015-07-19 23:03:46 -07:00 |
|
Brad Davis
|
4c3cfe1e82
|
Starfield jazz hands
|
2015-07-19 20:53:50 -07:00 |
|
Brad Davis
|
35f7307f30
|
More header cleanup
|
2015-07-18 22:15:50 -07:00 |
|
Brad Davis
|
c446bb307d
|
Adding convenience return *this to many transform methods
|
2015-07-18 16:56:32 -07:00 |
|
Bradley Austin Davis
|
5e0a0409bf
|
Removing setupWorldLight from viewstateinterface
|
2015-07-18 12:16:51 -07:00 |
|
Brad Davis
|
b7fdfd8663
|
Working on lighting
|
2015-07-18 10:55:53 -07:00 |
|
Brad Davis
|
d68618e206
|
Removing GL headers from most files, and some naked GL from application.cpp
|
2015-07-18 00:46:09 -07:00 |
|
Atlante45
|
640171d5bd
|
Restore AccountManager setup
|
2015-07-17 18:22:35 -07:00 |
|
Atlante45
|
1c965736e8
|
Remove merge error
|
2015-07-17 18:15:11 -07:00 |
|
Atlante45
|
052c3c987b
|
Fix some more smart pointer
|
2015-07-17 18:10:34 -07:00 |
|
Atlante45
|
256c786e28
|
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
|
2015-07-17 17:59:19 -07:00 |
|
ZappoMan
|
816fd41624
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-07-17 17:10:52 -07:00 |
|
Brad Hefta-Gaub
|
2423d25839
|
Merge pull request #5355 from ctrlaltdavid/20620
QA for #20620 - Make renderGrid handle changing position and dimensions
|
2015-07-17 17:10:43 -07:00 |
|
ZappoMan
|
9c52f28ff4
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-07-17 17:05:13 -07:00 |
|
Brad Davis
|
c822e66317
|
Merge pull request #5346 from samcake/daft
Adding the scissor rect in the Batch and a way to enable the scissor during clear command
|
2015-07-17 17:04:42 -07:00 |
|
Stephen Birarda
|
4661bd0075
|
resolve conflicts on merge with clement/protocol
|
2015-07-17 16:58:57 -07:00 |
|
Atlante45
|
c6e471256d
|
Fix atomic construction
|
2015-07-17 16:55:45 -07:00 |
|
Stephen Birarda
|
f8c832e50b
|
resolve conflicts on merge with upstream master
|
2015-07-17 16:48:46 -07:00 |
|
ZappoMan
|
26e8090ec1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL
|
2015-07-17 16:48:42 -07:00 |
|
Brad Hefta-Gaub
|
3ea348b73b
|
Merge pull request #5349 from jherico/marge
Working on text rendering overlays
|
2015-07-17 16:47:48 -07:00 |
|
Niraj Venkat
|
0580c8477e
|
3-step groundwork for AO in the pipeline
|
2015-07-17 16:42:03 -07:00 |
|
Stephen Birarda
|
9794770815
|
put back correct include for memcpy
|
2015-07-17 16:38:20 -07:00 |
|
Stephen Birarda
|
6419e49f4b
|
call QIODevice constructor from Packet copy
|
2015-07-17 16:35:26 -07:00 |
|
Stephen Birarda
|
c846efb203
|
fix type in Packet constructor
|
2015-07-17 16:24:25 -07:00 |
|
Stephen Birarda
|
1a1c2d6bbe
|
prepend module to QIODevice include
|
2015-07-17 16:20:53 -07:00 |
|
Stephen Birarda
|
30ee80313e
|
add memory include for PacketList
|
2015-07-17 16:18:58 -07:00 |
|
Stephen Birarda
|
487f9dc45d
|
add atomic include for NetworkPeer
|
2015-07-17 16:17:10 -07:00 |
|
Stephen Birarda
|
1fd4a1f0c3
|
resolve conflicts on merge with upstream master
|
2015-07-17 16:07:45 -07:00 |
|
Stephen Birarda
|
331bb54144
|
remove unused variable
|
2015-07-17 15:59:39 -07:00 |
|
Stephen Birarda
|
39272652e5
|
fix seeks in InboundAudioStream
|
2015-07-17 15:59:24 -07:00 |
|
Atlante45
|
151481d5bf
|
Remove seek
|
2015-07-17 15:58:58 -07:00 |
|
Stephen Birarda
|
35c8a60f3b
|
seek to correct place for bulk avatar data
|
2015-07-17 15:57:52 -07:00 |
|
Stephen Birarda
|
b71678dfdb
|
repair constructor that takes QByteArray in PacketList
|
2015-07-17 15:47:37 -07:00 |
|
Sam Gateau
|
9eff19b0f7
|
add th emissing function
|
2015-07-17 15:47:17 -07:00 |
|
Stephen Birarda
|
9c9c3d5120
|
remove extra debug in PacketList
|
2015-07-17 15:44:17 -07:00 |
|
Stephen Birarda
|
0f534b9f7b
|
fixes for new read and NLPacketList
|
2015-07-17 15:43:20 -07:00 |
|
Stephen Birarda
|
59e14dfd65
|
Merge branch 'protocol' of https://github.com/huffman/hifi into atp
|
2015-07-17 15:32:09 -07:00 |
|
ZappoMan
|
ccd2f98a76
|
one more try
|
2015-07-17 15:28:25 -07:00 |
|
Stephen Birarda
|
9a4cc1308d
|
fix packet list segment break
|
2015-07-17 15:27:57 -07:00 |
|
Ryan Huffman
|
1e7691941c
|
Add raw data read to Packet
|
2015-07-17 15:27:29 -07:00 |
|
Andrew Meadows
|
32b1fe0918
|
proper fix for incorrect render of scaled entities
|
2015-07-17 15:21:02 -07:00 |
|
Stephen Birarda
|
fe0cdc0529
|
put AvatarHashMap slots back to private
|
2015-07-17 14:35:38 -07:00 |
|
Stephen Birarda
|
8a2bb55231
|
add back a removed comment from jurisdiction map
|
2015-07-17 14:00:02 -07:00 |
|
Stephen Birarda
|
08bd2adb51
|
remove dead listeners from set of directly connected objects
|
2015-07-17 13:58:14 -07:00 |
|
Andrew Meadows
|
1c7afbda04
|
workaround for bad sphere radius
|
2015-07-17 12:14:53 -07:00 |
|
Andrew Meadows
|
f09b3eb736
|
set creation time when loading unknown timestamp
|
2015-07-17 12:14:07 -07:00 |
|
Howard Stearns
|
2d277a2abd
|
Fix https://app.asana.com/0/30233891560551/41734486809354/f
|
2015-07-17 11:28:25 -07:00 |
|
Stephen Birarda
|
7a13c867ae
|
quit the ScriptEngine thread once the script is done
|
2015-07-17 11:18:14 -07:00 |
|
Stephen Birarda
|
eaeaa23f03
|
resolve conflicts on merge with origin/protocol
|
2015-07-17 11:10:30 -07:00 |
|
Stephen Birarda
|
33f42bec78
|
Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp
|
2015-07-17 11:07:17 -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 |
|
Atlante45
|
cf453952f4
|
Rename should nack
|
2015-07-17 10:52:27 -07:00 |
|
Stephen Birarda
|
0811553c41
|
add a direct registration for EntityEditPacketSender
|
2015-07-17 10:49:24 -07:00 |
|
Stephen Birarda
|
2d5428276a
|
shouldNack default to true
|
2015-07-17 09:56:27 -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 |
|
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 |
|
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
|
ce6585ccc8
|
fix AC monitor and AM double register
|
2015-07-16 17:44:43 -07:00 |
|
Stephen Birarda
|
e8de73427b
|
fix suppression of hash mismatch messages
|
2015-07-16 17:25:55 -07:00 |
|
Stephen Birarda
|
b257daaef1
|
fix supression of repeated messages for version mismatch
|
2015-07-16 17:23:00 -07:00 |
|
Stephen Birarda
|
2a2eb39066
|
repairs for DS path query and response
|
2015-07-16 17:08:06 -07:00 |
|
Brad Davis
|
ae10d58142
|
Fixing font class
|
2015-07-16 16:42:29 -07:00 |
|
ZappoMan
|
398075e45a
|
hacking on more naked GL
|
2015-07-16 16:26:28 -07:00 |
|
Stephen Birarda
|
14e92ceeea
|
remove environment data from packet headers
|
2015-07-16 16:25:13 -07:00 |
|
Stephen Birarda
|
6d7b659dff
|
remove the environment data process from header
|
2015-07-16 16:24:26 -07:00 |
|
Stephen Birarda
|
eb0ed438ec
|
remove environment data packet
|
2015-07-16 16:23:57 -07:00 |
|
Stephen Birarda
|
b1be617481
|
add back MAX_PACKET_HEADER_BYTES
|
2015-07-16 16:12:01 -07:00 |
|
Stephen Birarda
|
1a85e95f71
|
remove implementation of packetTypeForPacket
|
2015-07-16 16:09:48 -07:00 |
|
Stephen Birarda
|
271575c832
|
remove unused octree method
|
2015-07-16 16:08:21 -07:00 |
|
Stephen Birarda
|
846506901a
|
more removals from PacketHeaders
|
2015-07-16 16:06:56 -07:00 |
|
Stephen Birarda
|
1bb3e1789a
|
remove more PacketHeader methods
|
2015-07-16 16:05:27 -07:00 |
|
Stephen Birarda
|
61653bd88d
|
remove old PacketHeader methods
|
2015-07-16 16:04:12 -07:00 |
|
Stephen Birarda
|
648f9868f0
|
add back space in PacketHeaders
|
2015-07-16 15:58:34 -07:00 |
|
Stephen Birarda
|
83f98a3e57
|
remove line number comment for enum
|
2015-07-16 15:58:18 -07:00 |
|
Stephen Birarda
|
eb5fdd7214
|
clear unused types and push version to 10
|
2015-07-16 15:57:19 -07:00 |
|
Brad Davis
|
89faf85ad9
|
Working on text rendering overlays
|
2015-07-16 15:56:01 -07:00 |
|
Stephen Birarda
|
a6641908fb
|
check if audio mixer is alive before packet send
|
2015-07-16 15:49:15 -07:00 |
|
Stephen Birarda
|
c5047ec76d
|
fix sequence number packing for audio injector
|
2015-07-16 15:47:25 -07:00 |
|
Atlante45
|
56886e479d
|
Use BulkAvatarData packet type for AvatarMixer upstrea
|
2015-07-16 15:28:53 -07:00 |
|
Atlante45
|
7cb4afd718
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-16 14:22:40 -07:00 |
|
Stephen Birarda
|
f31675c4c6
|
fix ice-server packets
|
2015-07-16 14:21:37 -07:00 |
|
Ryan Huffman
|
b561014d77
|
Add head-lean reading back into AvatarData
|
2015-07-16 14:11:36 -07:00 |
|
Ryan Huffman
|
3429f0f57c
|
Merge branch 'protocol' of github.com:Atlante45/hifi into protocol
|
2015-07-16 14:06:21 -07:00 |
|
Ryan Huffman
|
f8f47f99c6
|
Temporarily disable body lean in avatar
|
2015-07-16 14:03:36 -07:00 |
|
Atlante45
|
00fbff112f
|
Process avatar data
|
2015-07-16 14:03:11 -07:00 |
|
Atlante45
|
a7754ad085
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-16 13:52:32 -07:00 |
|
Stephen Birarda
|
ed928e8a6b
|
actual fix for AddressManager address with port
|
2015-07-16 13:52:18 -07:00 |
|
Atlante45
|
246b39a18a
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-16 13:42:08 -07:00 |
|
Stephen Birarda
|
5d84d2ec30
|
add port to current address if not default
|
2015-07-16 13:39:14 -07:00 |
|
Stephen Birarda
|
76d47eb4e7
|
mark the DataServerConfirm packet unused
|
2015-07-16 13:22:18 -07:00 |
|
Atlante45
|
b4121eb464
|
Remove unnecessary move
|
2015-07-16 13:14:17 -07:00 |
|
Stephen Birarda
|
05dd49a4c5
|
seek back after track of octree packet
|
2015-07-16 13:02:20 -07:00 |
|
Sam Gateau
|
50a521e1f2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
|
2015-07-16 12:38:47 -07:00 |
|
Stephen Birarda
|
60ae02e4e9
|
some formatting changes in entities
|
2015-07-16 12:38:39 -07:00 |
|
Sam Gateau
|
4ca333efe1
|
Adding the scissor rect in the Batch and a way to enable the scissor test locally for clear commands
|
2015-07-16 12:38:11 -07:00 |
|
Ryan Huffman
|
87f891288f
|
Merge branch 'atp' of github.com:birarda/hifi into protocol
|
2015-07-16 12:14:46 -07:00 |
|
Ryan Huffman
|
10c69fefe1
|
Merge branch 'protocol' of github.com:Atlante45/hifi into protocol
|
2015-07-16 12:14:36 -07:00 |
|
Ryan Huffman
|
1d1962d5f5
|
Fix avatar data processing
|
2015-07-16 12:10:28 -07:00 |
|
Stephen Birarda
|
7a48463f4e
|
Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp
|
2015-07-16 12:09:55 -07:00 |
|
Stephen Birarda
|
8921f59e23
|
fix entity packet send from interface client
|
2015-07-16 12:09:35 -07:00 |
|
Stephen Birarda
|
61f23f6a5e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
|
2015-07-16 11:56:26 -07:00 |
|
Stephen Birarda
|
336967e580
|
fix edit packet sending from client
|
2015-07-16 11:17:49 -07:00 |
|
Atlante45
|
bf637f8f18
|
Fix broadcast to nodes
|
2015-07-16 10:50:05 -07:00 |
|
Atlante45
|
ae8e79750b
|
Stop ping timer in handle node kill
|
2015-07-16 10:00:54 -07:00 |
|
Atlante45
|
8424e91ae1
|
Added sequence number to packets
|
2015-07-16 10:00:01 -07:00 |
|
Atlante45
|
c6f6dbd845
|
Fix QByteArray from rqw data
|
2015-07-16 09:59:15 -07:00 |
|
Niraj Venkat
|
022529f03f
|
Render depth buffer to quad
Useful for graphics debugging
|
2015-07-16 09:46:28 -07:00 |
|
Ryan Huffman
|
6f112f38c3
|
Merge branch 'atp' of github.com:birarda/hifi into protocol
|
2015-07-16 07:57:18 -07:00 |
|
Stephen Birarda
|
039ef0750c
|
set jurisdiction listener object name for thread identification
|
2015-07-15 18:52:59 -07:00 |
|
Stephen Birarda
|
6fa17dafff
|
open packets for write with ReadWrite
|
2015-07-15 18:27:43 -07:00 |
|
Stephen Birarda
|
000232a55d
|
fix copied packet buffer creation
|
2015-07-15 17:59:37 -07:00 |
|
Stephen Birarda
|
863cc3390a
|
fix send of mixed audio stream packet from AM
|
2015-07-15 17:41:00 -07:00 |
|
Stephen Birarda
|
765e8cbb87
|
Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp
|
2015-07-15 17:37:51 -07:00 |
|
Stephen Birarda
|
333cd77d9c
|
cleanup call to parseAudioData
|
2015-07-15 17:20:02 -07:00 |
|
samcake
|
b7ac84e174
|
Merge pull request #5342 from ZappoMan/removeNakeGL
remove some more dead code and naked gl
|
2015-07-15 17:07:55 -07:00 |
|
Stephen Birarda
|
9318f464a4
|
fix position of read in InboundAudioStream
|
2015-07-15 16:42:58 -07:00 |
|
Atlante45
|
6c98c23524
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-15 16:36:22 -07:00 |
|
ZappoMan
|
5165210e11
|
fix Sams comment about comments
|
2015-07-15 16:35:20 -07:00 |
|
Stephen Birarda
|
273e92f1fd
|
pass correct size for audio read
|
2015-07-15 16:34:00 -07:00 |
|
Atlante45
|
43e2961810
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-15 16:33:24 -07:00 |
|
Stephen Birarda
|
3cba3d0dcd
|
fix packet receiver cleanup
|
2015-07-15 16:33:12 -07:00 |
|
Atlante45
|
ce5bcb8de1
|
Check ptr
|
2015-07-15 16:33:04 -07:00 |
|
Ryan Huffman
|
6502359f04
|
Update NodeList's PacketReceiver to be a pointer
|
2015-07-15 16:29:15 -07:00 |
|
Atlante45
|
cb64b0353e
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-15 16:26:11 -07:00 |
|
Stephen Birarda
|
8f8845d78d
|
remove accidentally re-added PacketHeaders
|
2015-07-15 16:25:04 -07:00 |
|
Atlante45
|
a2644752a4
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-15 16:20:11 -07:00 |
|
Stephen Birarda
|
05dde9d8f5
|
resolve conflicts on merge with upstream/master
|
2015-07-15 16:18:47 -07:00 |
|
Stephen Birarda
|
00c1dce3e5
|
disconnect readyRead in LimitedNodeList dtor
|
2015-07-15 16:16:26 -07:00 |
|
Atlante45
|
2b27918953
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-15 16:10:51 -07:00 |
|
Stephen Birarda
|
dd4c2eaccd
|
add seek back for ping packet
|
2015-07-15 16:10:32 -07:00 |
|
Atlante45
|
644545b965
|
Seek to start of ping packet
|
2015-07-15 16:10:08 -07:00 |
|
Sam Gateau
|
9657d146f7
|
Clearing Model.cpp from naked gl call references
|
2015-07-15 16:09:53 -07:00 |
|
Atlante45
|
4db2a77f9f
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-15 15:58:28 -07:00 |
|
Atlante45
|
f065638748
|
Ping code cleanup
|
2015-07-15 15:58:14 -07:00 |
|
Stephen Birarda
|
97936c82f2
|
add a missing library link
|
2015-07-15 15:58:05 -07:00 |
|
Stephen Birarda
|
85a5d7059c
|
fix naming of variable in timePingReply
|
2015-07-15 15:56:31 -07:00 |
|
ZappoMan
|
d1e511efcb
|
more naked gl cleanup, deleting dead code, tweaking comments so they don't give false positives in searching for more naked gl
|
2015-07-15 15:52:12 -07:00 |
|
Ryan Huffman
|
c6b14ec9fb
|
Merge branch 'atp' of github.com:birarda/hifi into protocol
|
2015-07-15 15:51:56 -07:00 |
|
Stephen Birarda
|
52fdce4a44
|
fix fromRawData call for silent audio packet
|
2015-07-15 15:41:45 -07:00 |
|
ZappoMan
|
2ad2c4d554
|
remove some dead code
|
2015-07-15 15:33:28 -07:00 |
|
ZappoMan
|
293ccc1713
|
remove some dead code
|
2015-07-15 15:32:02 -07:00 |
|
Atlante45
|
725383e43a
|
Check ptr, not addr
|
2015-07-15 15:30:54 -07:00 |
|
Atlante45
|
8483b168be
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-15 15:26:34 -07:00 |
|
Atlante45
|
85391cefbb
|
Bug fixes
|
2015-07-15 15:26:22 -07:00 |
|
Stephen Birarda
|
5a2d59c530
|
fix ScriptEngine cleanup for Agent
|
2015-07-15 15:07:34 -07:00 |
|
Ryan Huffman
|
9a3ba20f11
|
Merge branch 'atp' of github.com:birarda/hifi into protocol
|
2015-07-15 15:02:17 -07:00 |
|
Ryan Huffman
|
07e3cf1348
|
Add COMPARE_DATA to QTestExtensions
|
2015-07-15 15:01:56 -07:00 |
|
Ryan Huffman
|
ad61c3db41
|
Fix bytesLeftToRead
|
2015-07-15 15:01:27 -07:00 |
|
Ryan Huffman
|
2d86e807b0
|
Move PACKET_WRITE_ERROR to Packet class
|
2015-07-15 15:00:59 -07:00 |
|
samcake
|
de7aed1abc
|
Merge pull request #5338 from ZappoMan/removeGlowEffect
Remove the glow effect.
|
2015-07-15 14:50:15 -07:00 |
|
Niraj Venkat
|
0ee916fb6f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
|
2015-07-15 14:10:42 -07:00 |
|
Niraj Venkat
|
1b13f837bd
|
Porting AO to new pipeline
|
2015-07-15 14:10:17 -07:00 |
|
Stephen Birarda
|
3d02cfc6ad
|
only print no listener for packet one time
|
2015-07-15 14:06:19 -07:00 |
|
Stephen Birarda
|
6c06d4c49e
|
use fromRawData for writeDatagram, correct type for PingReply
|
2015-07-15 13:59:58 -07:00 |
|
Stephen Birarda
|
7207bdfe2b
|
Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp
|
2015-07-15 13:50:40 -07:00 |
|
Stephen Birarda
|
7dfbb74d67
|
ping packets are verified packets
|
2015-07-15 13:49:34 -07:00 |
|
Atlante45
|
43c6fba94a
|
Register DomainServerAddedNode
|
2015-07-15 13:49:06 -07:00 |
|
Atlante45
|
8b5a577a5d
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-15 13:42:14 -07:00 |
|
Atlante45
|
5a5a396b62
|
Check we have an AM before sending packet
|
2015-07-15 13:41:35 -07:00 |
|
Stephen Birarda
|
d4680ee1dd
|
fix for no current packet in PacketList
|
2015-07-15 13:41:28 -07:00 |
|
Stephen Birarda
|
312780a2f6
|
fix offset for source UUID and verification hash
|
2015-07-15 13:31:36 -07:00 |
|
Stephen Birarda
|
6b05b7ef31
|
Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp
|
2015-07-15 13:17:38 -07:00 |
|
Stephen Birarda
|
a79c8ab193
|
fix check for writing of packet header
|
2015-07-15 13:17:32 -07:00 |
|
Atlante45
|
2730201a3e
|
erge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-15 13:14:21 -07:00 |
|
Atlante45
|
f3800cacda
|
Don't unregister packet listeners when no nodelist
|
2015-07-15 13:10:16 -07:00 |
|
ZappoMan
|
c17794849d
|
more GlowEctomy
|
2015-07-15 12:58:15 -07:00 |
|
ZappoMan
|
819fa852b8
|
first pass at GlowEctomy
|
2015-07-15 12:47:59 -07:00 |
|
Stephen Birarda
|
e90ace6231
|
fix child assignment UUID, adjust for NLPacket after unpack
|
2015-07-15 12:37:30 -07:00 |
|