Atlante45
|
1d498af76e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
|
2015-12-04 15:18:25 -08:00 |
|
Stephen Birarda
|
ad4f818b21
|
only attempt to stop QTimer if active
|
2015-12-04 14:12:41 -08:00 |
|
Stephen Birarda
|
d2fdf6a04b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into log-handler-crash
|
2015-12-04 13:55:57 -08:00 |
|
Stephen Birarda
|
165db97cb2
|
cleanup double reset debug on assignment-client restart
|
2015-12-04 11:50:27 -08:00 |
|
Brad Hefta-Gaub
|
84b98c93a1
|
Merge pull request #6559 from birarda/log-handler-crash
reset the NodeList on its own thread
|
2015-12-04 11:44:06 -08:00 |
|
Ryan Huffman
|
89c412c324
|
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
|
2015-12-04 11:38:28 -08:00 |
|
Stephen Birarda
|
d5f79b84fc
|
make the NodeList reset a blocking queued connection
|
2015-12-04 11:20:46 -08:00 |
|
Stephen Birarda
|
918342df5f
|
make sure the NodeList is reset on its own thread
|
2015-12-04 11:18:46 -08:00 |
|
Stephen Birarda
|
ca84fcd7f4
|
parent the keepalive timer to the NL thread
|
2015-12-04 11:01:18 -08:00 |
|
Ryan Huffman
|
d9eddbe738
|
Remove unnecessary ptr get() in PacketList
|
2015-12-02 13:32:56 -08:00 |
|
Atlante45
|
70dd8ec19a
|
Remove left/right relative pos/rot from c++
|
2015-12-01 11:44:42 -08:00 |
|
Atlante45
|
3bbd20a7bd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball-test
|
2015-11-30 18:02:34 -08:00 |
|
Seth Alves
|
b7ebe5b92b
|
merge from upstream
|
2015-11-30 16:59:52 -08:00 |
|
Stephen Birarda
|
f07314f4ef
|
resolve conflicts on merge with huffman/baseball
|
2015-11-30 13:34:36 -08:00 |
|
Stephen Birarda
|
4573e5c59e
|
resolve conflicts on merge with upstream/master
|
2015-11-30 13:32:38 -08:00 |
|
Ryan Huffman
|
5849befb3d
|
Add caching back to AssetRequest
|
2015-11-30 11:53:53 -08:00 |
|
Ryan Huffman
|
304b105dac
|
Add proper message failure handling to Connection
|
2015-11-30 11:53:08 -08:00 |
|
Ryan Huffman
|
2e76f0e0d8
|
Update ReceivedMessage progress to only trigger every 100 packets
|
2015-11-30 11:52:49 -08:00 |
|
Ryan Huffman
|
5e27af5076
|
Remove old comment in PacketReceiver
|
2015-11-30 11:52:21 -08:00 |
|
Ryan Huffman
|
242167ebf2
|
Remove debug messages
|
2015-11-30 11:52:07 -08:00 |
|
Ryan Huffman
|
bb6bb85d12
|
Update comment in ReceivedMessage
|
2015-11-30 09:16:57 -08:00 |
|
Ryan Huffman
|
dc48b9a266
|
Limit progress signal in ReceivedMessage to once every 50 packets
|
2015-11-30 09:15:25 -08:00 |
|
Ryan Huffman
|
4220d7a3cc
|
Add atp hash checking back in
|
2015-11-30 09:13:59 -08:00 |
|
Seth Alves
|
ca75802b9c
|
unmangle merge
|
2015-11-26 06:43:28 -08:00 |
|
Anthony J. Thibault
|
2a9adafc09
|
Bumped avatar packet version number
|
2015-11-25 12:13:40 -08:00 |
|
Ryan Huffman
|
dac491ef41
|
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
|
2015-11-24 09:59:22 -08:00 |
|
samcake
|
a1668cdc73
|
Let the AssertClient JS interface use global vars
|
2015-11-23 22:28:59 -08:00 |
|
Seth Alves
|
f013f95e9b
|
merge from upstream
|
2015-11-21 08:43:00 -08:00 |
|
Clément Brisset
|
5d75fcbfce
|
Merge pull request #6430 from birarda/unique_linked_data
use a unique_ptr for linkedData in Node
|
2015-11-20 15:01:41 -08:00 |
|
Brad Hefta-Gaub
|
c7673aad4a
|
Merge pull request #6447 from huffman/polyline-texture
Add texture property to polyline entity type
|
2015-11-20 13:31:34 -08:00 |
|
Brad Davis
|
eef01f8a13
|
Merge pull request #6443 from ZappoMan/assetJS
fix crash with no asset server
|
2015-11-20 12:58:16 -08:00 |
|
Stephen Birarda
|
b34934b849
|
resolve conflicts on merge with upstream/master
|
2015-11-20 11:52:53 -08:00 |
|
Brad Hefta-Gaub
|
f1badc017b
|
CR feedback
|
2015-11-20 11:43:50 -08:00 |
|
Brad Hefta-Gaub
|
caa8b0b5b6
|
fix unix build
|
2015-11-20 11:07:01 -08:00 |
|
Brad Hefta-Gaub
|
4bbfcb6092
|
Merge branch 'master' of https://github.com/highfidelity/hifi into messaging
|
2015-11-20 10:30:38 -08:00 |
|
Ryan Huffman
|
0d6279da17
|
Merge remote-tracking branch 'origin/polyline-texture' into baseball
|
2015-11-20 10:19:30 -08:00 |
|
Brad Hefta-Gaub
|
0e5e33446e
|
handle old protocol case
|
2015-11-20 09:57:30 -08:00 |
|
Brad Hefta-Gaub
|
abf169ebd9
|
fix senderID in messages, dry up code
|
2015-11-20 09:03:21 -08:00 |
|
Brad Hefta-Gaub
|
5c6cd9b06c
|
fix thread safety and crash with no asset server
|
2015-11-19 18:53:12 -08:00 |
|
Brad Hefta-Gaub
|
f80a765a29
|
add Assets.uploadData() and Assets.downloadData()
|
2015-11-19 17:28:20 -08:00 |
|
Ryan Huffman
|
07d21514c5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
|
2015-11-19 10:47:37 -08:00 |
|
Stephen Birarda
|
271387f96e
|
use a unique_ptr for linkedData in Node
|
2015-11-18 18:03:31 -08:00 |
|
Ryan Huffman
|
2a416ebc61
|
Merge branch 'master' of https://github.com/highfidelity/hifi into received-message
|
2015-11-18 16:52:23 -08:00 |
|
Stephen Birarda
|
08e6b63090
|
cleanup debug of received domain-server settings
|
2015-11-18 15:43:31 -08:00 |
|
Ryan Huffman
|
c2648fd6dd
|
Remove _packetListenerMap
|
2015-11-18 15:30:43 -08:00 |
|
Ryan Huffman
|
f0ad7f85dc
|
Add readHead* to ReceivedMessage
|
2015-11-18 15:30:30 -08:00 |
|
Stephen Birarda
|
f2ecce6043
|
use safer domain settings request in audio-mixer
|
2015-11-18 15:13:29 -08:00 |
|
Stephen Birarda
|
1a066abb26
|
fix some indentation for UDT_CONNECTION_DEBUG lines
|
2015-11-18 14:43:56 -08:00 |
|
Stephen Birarda
|
65142a3963
|
clean up agent comment for domain settings request
|
2015-11-18 14:20:56 -08:00 |
|
Ryan Huffman
|
3d0afc3c5f
|
Update entities version number for polyline change
|
2015-11-18 14:00:00 -08:00 |
|
Stephen Birarda
|
c54dffac12
|
fix entity-server avg ping, remove debug
|
2015-11-18 10:32:35 -08:00 |
|
Stephen Birarda
|
0e3d3451d7
|
make keep alive pings the responsibility of NL
|
2015-11-18 10:24:10 -08:00 |
|
Brad Hefta-Gaub
|
293914b84f
|
added NodeActivated signal to make it easier for users to know when a recently added node has an active socket
|
2015-11-17 16:31:34 -08:00 |
|
Brad Hefta-Gaub
|
073215d067
|
handle socketActivated
|
2015-11-17 15:55:41 -08:00 |
|
Brad Hefta-Gaub
|
9c4286b6ca
|
Merge branch 'master' of https://github.com/highfidelity/hifi into messaging
|
2015-11-17 15:50:54 -08:00 |
|
Stephen Birarda
|
f5ec458a5e
|
make activeSocket checks more consistent
|
2015-11-17 15:38:03 -08:00 |
|
Stephen Birarda
|
3906a747b8
|
fix a couple of bad checks
|
2015-11-17 15:33:57 -08:00 |
|
Stephen Birarda
|
34b8fca83b
|
add socketActivated signal to NetworkPeer for punch success
|
2015-11-17 15:04:31 -08:00 |
|
Stephen Birarda
|
7dfdb3c72e
|
protect LNL packet sending without active socket
|
2015-11-17 15:04:14 -08:00 |
|
Brad Hefta-Gaub
|
3efbcb7062
|
debug the late connect case
|
2015-11-17 14:47:59 -08:00 |
|
Brad Hefta-Gaub
|
d8a3927311
|
debug the late connect case
|
2015-11-17 14:43:06 -08:00 |
|
Brad Hefta-Gaub
|
85aa3b3f83
|
handle subscribe when messages mixer is not available
|
2015-11-17 14:28:51 -08:00 |
|
Brad Hefta-Gaub
|
8112b3b57e
|
add senderUUID to the messageReceived signal
|
2015-11-17 14:16:22 -08:00 |
|
Brad Hefta-Gaub
|
2d3fe497e4
|
fix typo
|
2015-11-17 13:29:28 -08:00 |
|
Brad Hefta-Gaub
|
5b9791d800
|
add message received signal
|
2015-11-17 11:50:10 -08:00 |
|
Brad Hefta-Gaub
|
60ae1259fa
|
more cleanup work
|
2015-11-17 11:06:27 -08:00 |
|
Brad Hefta-Gaub
|
034debc483
|
cleanup
|
2015-11-17 10:59:53 -08:00 |
|
Brad Hefta-Gaub
|
f9a674bca5
|
implement subscribe/unsubscribe in MessagesClient
|
2015-11-17 10:01:31 -08:00 |
|
Brad Hefta-Gaub
|
6b61ec569c
|
more work on channels
|
2015-11-17 09:47:50 -08:00 |
|
ZappoMan
|
f712fae4d2
|
more hacking
|
2015-11-17 08:56:21 -08:00 |
|
Brad Hefta-Gaub
|
12f206e2f0
|
more work on messages
|
2015-11-16 17:00:03 -08:00 |
|
Brad Hefta-Gaub
|
40e69f6946
|
Merge branch 'master' of https://github.com/highfidelity/hifi into messaging
|
2015-11-16 15:31:06 -08:00 |
|
Brad Hefta-Gaub
|
d42a1a721f
|
first cut at messages-mixer
|
2015-11-16 15:26:17 -08:00 |
|
Ryan Huffman
|
5154fbc8c5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
|
2015-11-16 12:23:26 -08:00 |
|
Stephen Birarda
|
584e35e4ab
|
have killNodeWithUUID return success to avoid double lookup
|
2015-11-16 10:58:11 -08:00 |
|
Stephen Birarda
|
ea38c4cc49
|
don't allow domain check-ins while shutting down
|
2015-11-12 18:04:15 -08:00 |
|
Stephen Birarda
|
6b2987eef8
|
handle domain server node removal in NodeList
|
2015-11-12 17:47:51 -08:00 |
|
Stephen Birarda
|
e52e9be44c
|
re-broadcast disconnects from domain-server
|
2015-11-12 17:23:39 -08:00 |
|
Stephen Birarda
|
1c9396d66e
|
handle disconnect request in domain-server
|
2015-11-12 15:43:03 -08:00 |
|
Stephen Birarda
|
8bdb81d832
|
send disconnect packet from node when leaving domain
|
2015-11-12 15:03:19 -08:00 |
|
Stephen Birarda
|
0a64242160
|
cleanup string grabbing for PacketType enum
|
2015-11-12 14:43:25 -08:00 |
|
Stephen Birarda
|
288ee0e9e8
|
add a NodeDisconnect packet
|
2015-11-12 11:39:32 -08:00 |
|
Atlante45
|
aca5cb2559
|
Renamed header version
|
2015-11-10 14:18:27 -08:00 |
|
Atlante45
|
d79221edd2
|
AvatarActionHold can ignore IK
|
2015-11-10 14:06:59 -08:00 |
|
Atlante45
|
6a53021818
|
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
|
2015-11-09 13:23:31 -08:00 |
|
ericrius1
|
31fe5fa953
|
Bump version num, use different shader for additive blending effect
|
2015-11-03 17:15:10 -08:00 |
|
Ryan Huffman
|
7f4a8e9d7d
|
Merge branch 'master' of github.com:Atlante45/hifi into baseball
|
2015-11-02 12:25:51 -08:00 |
|
Seth Alves
|
3ac0fef1ea
|
merge from upstream
|
2015-11-01 15:22:57 -08:00 |
|
samcake
|
393f6a4c76
|
Fixing a bad field ID for keyLight.AmbientURL and bumping the domain version
|
2015-10-30 11:35:50 -07:00 |
|
Clément Brisset
|
a37c94bd3c
|
Merge pull request #6202 from birarda/asset-parenting
don't force parenting of AssetUpload/AssetRequest
|
2015-10-30 09:45:42 -07:00 |
|
Stephen Birarda
|
06897aa474
|
don't force parenting of AssetRequest/AssetUpload
|
2015-10-27 19:29:54 -07:00 |
|
Atlante45
|
5f8c3a6b4b
|
Fix AssetResourceRequest crash
|
2015-10-27 10:27:37 -07:00 |
|
samcake
|
bc7ad9d3f7
|
Move the keyLIght properties in their own group and add the ambientURL in
|
2015-10-26 09:27:06 -07:00 |
|
Seth Alves
|
778dc8dc15
|
add parentID and parentJointIndex EntityItemProperties
|
2015-10-22 11:52:56 -07:00 |
|
Stephen Birarda
|
1e39c9359f
|
don't force parenting of AssetRequest/AssetUpload
|
2015-10-21 11:53:38 -07:00 |
|
Ryan Huffman
|
9ddcfdf94d
|
Cleanup PacketReceier and ReceivedMessage
|
2015-10-16 09:21:10 -07:00 |
|
Ryan Huffman
|
7682ab00e3
|
Add ReceivedMessage and receive progress
|
2015-10-15 14:09:53 -07:00 |
|
Brad Hefta-Gaub
|
b7c40c2df1
|
fix Queue OUT stat
|
2015-10-15 11:41:04 -07:00 |
|
Stephen Birarda
|
2caa7f6d64
|
change getUrl to getATPUrl, use in ATPAssetMigrator
|
2015-10-13 16:56:20 -07:00 |
|
Stephen Birarda
|
76bfc6218a
|
add back block removed in merge
|
2015-10-13 16:36:10 -07:00 |
|
Stephen Birarda
|
fc82ea8541
|
resolve conflicts on merge with upstream/master
|
2015-10-13 16:12:54 -07:00 |
|
Stephen Birarda
|
c328941b9d
|
Merge pull request #6074 from huffman/fix-empty-hash
Fix crash when atp url is empty
|
2015-10-13 16:02:28 -07:00 |
|
Ryan Huffman
|
c468cabe7e
|
Fix crash when atp url is empty
|
2015-10-13 15:12:01 -07:00 |
|
Stephen Birarda
|
cf74cfb50e
|
add an ATPAssetMigrator for bulk ATP migration
|
2015-10-13 10:38:52 -07:00 |
|
Atlante45
|
b7ba99380a
|
Pretty up loading debug
|
2015-10-12 15:32:44 -07:00 |
|
Atlante45
|
7eadb11404
|
Remove optional upload caching
|
2015-10-12 15:09:17 -07:00 |
|
Atlante45
|
0e0a8301eb
|
Collapse line
|
2015-10-12 15:06:51 -07:00 |
|
Atlante45
|
0cdad78581
|
Move debug to helper functions
|
2015-10-12 15:03:37 -07:00 |
|
Atlante45
|
4abac35c72
|
Cache on upload
|
2015-10-12 15:03:37 -07:00 |
|
Atlante45
|
51acf07c15
|
Factor couple methods in AssetUtils
|
2015-10-12 15:03:37 -07:00 |
|
Brad Hefta-Gaub
|
f8956a853b
|
Merge pull request #6051 from jherico/marge
Cleanup CMake files
|
2015-10-11 16:22:56 -07:00 |
|
Brad Davis
|
cd1b758534
|
PR comments
|
2015-10-11 00:32:31 -07:00 |
|
Brad Davis
|
6f5f6450df
|
Cleanup CMake files
|
2015-10-11 00:01:03 -07:00 |
|
Brad Davis
|
e5fc2e5525
|
Low level support for URL overrides when loading content
|
2015-10-10 23:00:15 -07:00 |
|
Stephen Birarda
|
b84109a781
|
Merge pull request #6040 from huffman/fix-null-node
Fix case where we deref a null pointer in OctreeInboundPacketProcessor
|
2015-10-09 14:57:16 -07:00 |
|
Clément Brisset
|
a5f0b75e25
|
Merge pull request #6043 from huffman/fix-uninitialized-arr
Fix uninitialized pointer in AssetResourceRequest
|
2015-10-09 13:36:58 -07:00 |
|
Clément Brisset
|
aa221741e5
|
Merge pull request #6041 from birarda/packet-corruption
fix for re-send timeout in SendQueue
|
2015-10-09 13:33:34 -07:00 |
|
Ryan Huffman
|
c02df56ceb
|
Fix uninitialized pointer in AssetResourceRequest
|
2015-10-09 13:15:13 -07:00 |
|
Stephen Birarda
|
58f9830a94
|
fix for re-send timeout in SendQueue
|
2015-10-09 10:04:35 -07:00 |
|
Ryan Huffman
|
36aaffce43
|
Revert "Fix _packets not being cleaned up in ReceivedPacketProcessor"
This reverts commit 4dddb508a8 .
|
2015-10-09 10:01:53 -07:00 |
|
Ryan Huffman
|
21e9d30bbe
|
Move qdeclare/qregister calls to their respective class header
|
2015-10-09 09:58:32 -07:00 |
|
Ryan Huffman
|
4dddb508a8
|
Fix _packets not being cleaned up in ReceivedPacketProcessor
|
2015-10-09 09:21:36 -07:00 |
|
Clément Brisset
|
7caf8755d1
|
Merge pull request #6039 from birarda/packet-corruption
hold the sent packets lock while re-sending a packet
|
2015-10-08 19:57:08 -07:00 |
|
Stephen Birarda
|
8985427516
|
maintain sent packets lock while re-sending packet
|
2015-10-08 19:47:15 -07:00 |
|
Clément Brisset
|
6d694b877d
|
Merge pull request #6036 from birarda/packet-corruption
fix for registration of meta types in Socket
|
2015-10-08 18:29:03 -07:00 |
|
Clément Brisset
|
a2b5748f54
|
Merge pull request #6027 from birarda/net-crashes
clean up Nodes via deleteLater on the network thread
|
2015-10-08 18:22:40 -07:00 |
|
Stephen Birarda
|
1cd76bb937
|
fix for registration of meta types in Socket
|
2015-10-08 18:17:24 -07:00 |
|
Stephen Birarda
|
aa2a8edc6f
|
use _segmentStartIndex before changing its value
|
2015-10-08 15:44:18 -07:00 |
|
Stephen Birarda
|
0d9421a65e
|
constantize the PacketList write error
|
2015-10-08 15:40:49 -07:00 |
|
Stephen Birarda
|
519df1565a
|
fix comment format in PacketList
|
2015-10-08 15:38:41 -07:00 |
|
Stephen Birarda
|
dc4f987a2e
|
fix segmented write logic in PacketList
|
2015-10-08 15:38:41 -07:00 |
|
Stephen Birarda
|
8ce3ee0d60
|
have nodes be cleaned up on the NL thread
|
2015-10-08 13:22:43 -07:00 |
|
Brad Hefta-Gaub
|
a86e34f9f9
|
Merge pull request #6018 from hyperlogic/tony/avatar-mixer-stats-improvements
Separated AvatarMixer inbound and outbound bandwidth on stats overlay
|
2015-10-07 16:04:13 -07:00 |
|
Anthony J. Thibault
|
00f3b7b1b5
|
Renamed delt to averageTimeBetweenPackets
|
2015-10-07 15:46:42 -07:00 |
|
Anthony J. Thibault
|
0cebeb7fe9
|
Separated AvatarMixer inbound and outbound bandwidth on stats overlay
Also, small bug fix to BandwidthRecorder. It would incorrectly
calculate outbound pps if the input pps was 0.
|
2015-10-07 15:32:10 -07:00 |
|
Brad Hefta-Gaub
|
bfd014203e
|
fix a bunch of warnings
|
2015-10-07 14:48:42 -07:00 |
|
Brad Hefta-Gaub
|
ef054ffc6d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings
Conflicts:
libraries/networking/src/udt/PacketHeaders.cpp
libraries/networking/src/udt/PacketHeaders.h
|
2015-10-07 11:27:50 -07:00 |
|
Stephen Birarda
|
022c4276b9
|
Merge pull request #5892 from Atlante45/protocol
Add channels to UDT
|
2015-10-07 11:06:22 -07:00 |
|
Ryan Huffman
|
74c89ad099
|
Merge pull request #5984 from Atlante45/cleanup_app
Application cleanup
|
2015-10-06 16:58:05 -07:00 |
|
Atlante45
|
3a8deff53e
|
Return if innactive
|
2015-10-06 16:38:16 -07:00 |
|
Atlante45
|
ca575bee89
|
Remove unecessary move
|
2015-10-06 16:15:51 -07:00 |
|
Atlante45
|
5ee966261d
|
Start thread right away
|
2015-10-06 16:12:50 -07:00 |
|
Atlante45
|
81b88cb096
|
Renamed MessagePart > MessagePartNumber
|
2015-10-06 16:12:04 -07:00 |
|
Stephen Birarda
|
fbf6d166b7
|
add wire size to BasePacket
|
2015-10-06 14:48:28 -07:00 |
|
Stephen Birarda
|
9079f891e9
|
repair broken node bandwidth stats
|
2015-10-06 14:09:21 -07:00 |
|
Atlante45
|
77a7814854
|
Move sendPingPackets
|
2015-10-06 13:56:20 -07:00 |
|
Atlante45
|
0f18db886c
|
Remove 4 Application static methods
- Replace by lambda
- Cleaned up global scope
|
2015-10-06 13:56:19 -07:00 |
|
Atlante45
|
f5f349e13a
|
Bumped packet version numbers
|
2015-10-02 14:20:20 -07:00 |
|
Brad Hefta-Gaub
|
57bf69cc48
|
Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings
Conflicts:
libraries/entities/src/ModelEntityItem.cpp
libraries/networking/src/udt/PacketHeaders.cpp
|
2015-10-02 14:19:15 -07:00 |
|
Atlante45
|
1e56d0c99b
|
Add parenthesis to quiet gcc warning
|
2015-10-02 14:18:18 -07:00 |
|
Atlante45
|
1f07ba46d0
|
Fix in-class initialization for windows build
|
2015-10-02 14:18:18 -07:00 |
|
Atlante45
|
48ff912dd2
|
Use one channel per packet list
|
2015-10-02 14:18:18 -07:00 |
|
Atlante45
|
3db99f50e5
|
Change takeFront name
|
2015-10-02 14:18:18 -07:00 |
|
Atlante45
|
7007d9f223
|
Use message part to check recieved packet list
|
2015-10-02 14:18:17 -07:00 |
|
Atlante45
|
c3fc6f4f79
|
Add message part to Packet
|
2015-10-02 14:18:17 -07:00 |
|
Atlante45
|
8cecb95bf2
|
Use array for stats
|
2015-10-02 14:16:47 -07:00 |
|
Atlante45
|
f1a9aba704
|
Magic number
|
2015-10-02 14:16:46 -07:00 |
|
Atlante45
|
91c779ddd8
|
Templatized DoubleLock
|
2015-10-02 14:16:46 -07:00 |
|
Atlante45
|
732ad41080
|
Introduce PacketQueue
|
2015-10-02 14:16:46 -07:00 |
|
Atlante45
|
709dab6beb
|
Release send queue before cleanup
|
2015-10-02 14:16:45 -07:00 |
|
Atlante45
|
290a0e573d
|
House cleaning
|
2015-10-02 14:16:45 -07:00 |
|
Atlante45
|
b0fe8535fd
|
Release _sendQueue before cleanup
|
2015-10-02 14:16:45 -07:00 |
|
Atlante45
|
eb8b37309d
|
Use lock_guard when possible
|
2015-10-02 14:16:44 -07:00 |
|
Atlante45
|
a4d383b384
|
Check handshake separately
|
2015-10-02 14:16:44 -07:00 |
|
Atlante45
|
3a61e6b6a3
|
Coding standart for locks
|
2015-10-02 14:16:44 -07:00 |
|
Atlante45
|
a34e1d85a5
|
Close current packet fix
|
2015-10-02 14:16:44 -07:00 |
|
Brad Hefta-Gaub
|
e6fb587a8c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings
|
2015-10-02 13:04:14 -07:00 |
|
Anthony J. Thibault
|
fc7b6dee84
|
Merge branch 'master' into transmit-joint-translation
|
2015-10-02 11:40:33 -07:00 |
|
Anthony J. Thibault
|
fa864d29f9
|
Merge branch 'master' into transmit-joint-translation
|
2015-10-01 16:55:24 -07:00 |
|
Brad Hefta-Gaub
|
f2e65f5a98
|
Merge pull request #5936 from birarda/tv-es-lockup
fix a timer leak, line width in PacketList
|
2015-10-01 14:39:40 -07:00 |
|
Brad Hefta-Gaub
|
6aa9ef9910
|
first cut at migrating animation settings into a property group
|
2015-09-30 20:51:25 -07:00 |
|
Stephen Birarda
|
5da5bd47af
|
add a missing rename for socket Q_ASSERT_X
|
2015-09-30 21:45:22 -04:00 |
|
Brad Hefta-Gaub
|
9cf49597a6
|
fix possible crash from null coming from _sentPackets
|
2015-09-30 14:16:41 -07:00 |
|
Brad Hefta-Gaub
|
46e1a298c8
|
Merge pull request #5951 from huffman/cc-rng-fix
Fix infinite recursion error with CC rng
|
2015-09-30 12:36:35 -07:00 |
|
Ryan Huffman
|
1e9593029c
|
Fix infinite recursion error with CC rng
On some std::random implementations tryin get a range [low, high) where
high < low will cause infinite recursion.
|
2015-09-30 11:34:11 -07:00 |
|
Stephen Birarda
|
82ac0b1a27
|
use a mutable mutex to keep const-ness
|
2015-09-30 14:23:18 -04:00 |
|
Stephen Birarda
|
f7e7b07441
|
fix constness of SentPacketHistory in OEPS
|
2015-09-30 14:15:22 -04:00 |
|
Stephen Birarda
|
cc6b0adb7d
|
guard insert/get in SentPacketHistory
|
2015-09-30 14:15:04 -04:00 |
|
Stephen Birarda
|
f4bc3f8e38
|
fix a timer leak, line width in PacketList
|
2015-09-29 16:35:24 -04:00 |
|
Seth Alves
|
50dd8eba45
|
Relay joint translations across network. Apply animation's root-joint translation to avatar.
|
2015-09-26 11:40:39 -07:00 |
|
David Rowe
|
eb01ba9812
|
Merge branch 'master' into 20681
|
2015-09-23 09:42:56 -07:00 |
|
Brad Hefta-Gaub
|
efda121619
|
fix a bunch of warnings on windows
|
2015-09-22 16:40:17 -07:00 |
|
David Rowe
|
03194437f5
|
Merge branch 'master' into 20681
Conflicts:
examples/entityScripts/sprayPaintCan.js
|
2015-09-18 12:04:02 -07:00 |
|
Sam Gateau
|
d0f7ddd3a6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2015-09-18 00:03:19 -07:00 |
|
David Rowe
|
12e2cf3ce9
|
Emit in all directions from a point or the surface of a spheroid
|
2015-09-17 17:14:35 -07:00 |
|
Stephen Birarda
|
285a6cc738
|
use erase directly for cleanupConnection
|
2015-09-17 14:51:48 -07:00 |
|
Stephen Birarda
|
a914ec82c3
|
more comment correctness for Socket
|
2015-09-17 14:17:43 -07:00 |
|
Stephen Birarda
|
1f9bb22b9e
|
fix some wording in Socket comment
|
2015-09-17 14:17:03 -07:00 |
|
Stephen Birarda
|
36e2d4fc76
|
add check for NotStarted state in PL queue
|
2015-09-17 14:16:03 -07:00 |
|
Stephen Birarda
|
4758dd2a53
|
correct locking races in SendQueue/Connection cleanup
|
2015-09-17 14:13:24 -07:00 |
|
David Rowe
|
d51cab3e3d
|
Replace particle velocity with speed and orientation
|
2015-09-16 14:51:08 -07:00 |
|
Sam Gateau
|
d45547aa1a
|
Merge and update
|
2015-09-16 13:46:07 -07:00 |
|
Stephen Birarda
|
cc8ad868b8
|
don't parent DS timer to object in another thread
|
2015-09-16 12:27:57 -07:00 |
|
Stephen Birarda
|
500a96ee7c
|
guard perpetual AC domain connection if NL thread locked
|
2015-09-16 12:25:03 -07:00 |
|
Atlante45
|
88d073b4ac
|
More disk cache debug info
|
2015-09-16 15:20:48 +02:00 |
|
Atlante45
|
dd0244b15d
|
Added a couple comments
|
2015-09-16 15:17:15 +02:00 |
|
Atlante45
|
9678e70444
|
Asset caching
|
2015-09-16 15:17:15 +02:00 |
|
Atlante45
|
eabee9857a
|
Enum coding standard
|
2015-09-16 15:17:14 +02:00 |
|
Brad Hefta-Gaub
|
54972515dc
|
make sure timer is owned
|
2015-09-15 17:04:40 -07:00 |
|
Ryan Huffman
|
8c3d8bc7de
|
Merge pull request #5809 from birarda/phrc
timing fixes for default time_point on windows
|
2015-09-15 15:29:30 -07:00 |
|