ZappoMan
|
05a4a6aa9b
|
implement on-the-fly conversion of FBXMeshParts that are quads, into their triangle equivalents
|
2015-08-01 13:07:56 -07:00 |
|
ZappoMan
|
452225ddaf
|
removed QUADS from Font::drawString()
|
2015-08-01 11:51:07 -07:00 |
|
ZappoMan
|
1dd6c1117d
|
change GeometryCache::renderQuad() to use TRIANGLES as lower level render primitive
|
2015-08-01 11:29:28 -07:00 |
|
Stephen Birarda
|
bc5ddd3837
|
send a light ACK every 64, not each after 64
|
2015-07-31 20:12:48 -07:00 |
|
Stephen Birarda
|
826c8d5150
|
more stats in UDTTest for sender
|
2015-07-31 19:52:20 -07:00 |
|
Stephen Birarda
|
0c44fc53de
|
fix for process of timeout NAKs
|
2015-07-31 19:45:43 -07:00 |
|
Stephen Birarda
|
7f8c993bd7
|
make send rate actually send rate, don't sync as sender
|
2015-07-31 19:42:27 -07:00 |
|
Stephen Birarda
|
74a2d985eb
|
tell the send queue about ACKs on light ACK
|
2015-07-31 19:17:02 -07:00 |
|
Stephen Birarda
|
3833623cfe
|
fix assert for control packet type
|
2015-07-31 18:41:46 -07:00 |
|
Atlante45
|
29b3051aeb
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-31 18:39:52 -07:00 |
|
Atlante45
|
ca342fb3b4
|
Fix std::find_if
|
2015-07-31 18:39:24 -07:00 |
|
Stephen Birarda
|
8bc94454b4
|
pre-increment the _currentACKSubSequenceNumber
|
2015-07-31 18:39:09 -07:00 |
|
Atlante45
|
8f54cd6f7e
|
Fix find_if_not
|
2015-07-31 18:19:15 -07:00 |
|
Stephen Birarda
|
e74f47b64c
|
use a list of pairs of pairs for ACK2
|
2015-07-31 18:13:11 -07:00 |
|
Howard Stearns
|
2713115336
|
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
|
2015-07-31 18:05:47 -07:00 |
|
Howard Stearns
|
0dad1adf7d
|
Speculative guard against crashing.
|
2015-07-31 18:05:14 -07:00 |
|
Philip Rosedale
|
04bea4dc98
|
Merge pull request #5471 from ctrlaltdavid/fix-inspect-pan
Change the inspect.js pan direction and rate
|
2015-07-31 17:34:24 -07:00 |
|
Stephen Birarda
|
5e716c36f9
|
Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp
|
2015-07-31 17:32:32 -07:00 |
|
Atlante45
|
9537aea5c0
|
Fix nak timeout packet size
|
2015-07-31 17:31:30 -07:00 |
|
Stephen Birarda
|
22ead79988
|
fix another char allocation in PacketTests
|
2015-07-31 17:30:22 -07:00 |
|
Atlante45
|
667bb62f0e
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-31 17:27:34 -07:00 |
|
Stephen Birarda
|
41c6220731
|
resolve conflicts on merge with upstream/master
|
2015-07-31 17:27:23 -07:00 |
|
Atlante45
|
27400df391
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-31 17:21:36 -07:00 |
|
Stephen Birarda
|
ea5da73683
|
Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp
|
2015-07-31 17:19:23 -07:00 |
|
Stephen Birarda
|
df1e97c591
|
cleanup RTT stats, add assert for CT
|
2015-07-31 17:19:14 -07:00 |
|
Atlante45
|
2946cb7ed5
|
Collapse ControlPacket ctors
|
2015-07-31 17:15:10 -07:00 |
|
Stephen Birarda
|
0e3403833d
|
make capacitySpeedDelta a double
|
2015-07-31 17:00:53 -07:00 |
|
Atlante45
|
cba51ac63d
|
Fix congestion control
|
2015-07-31 16:53:43 -07:00 |
|
Stephen Birarda
|
15ce9aabc5
|
don't assert on moved CC
|
2015-07-31 16:52:59 -07:00 |
|
Stephen Birarda
|
fa6628e7eb
|
make sure we init CongestionControl
|
2015-07-31 16:52:09 -07:00 |
|
Stephen Birarda
|
84b8fc9f06
|
fix casing of onACK method in CC
|
2015-07-31 16:41:22 -07:00 |
|
Stephen Birarda
|
9b6c8bcf77
|
update EWMA for delivery rate and bandwidth
|
2015-07-31 16:37:38 -07:00 |
|
Stephen Birarda
|
2db540ffde
|
fix for double in PacketTimeWindow
|
2015-07-31 16:35:42 -07:00 |
|
Stephen Birarda
|
681c9afe90
|
add parens to PacketTimeWindow division
|
2015-07-31 16:31:42 -07:00 |
|
Stephen Birarda
|
e39611dc1c
|
fix for PacketTimeWindow calculations
|
2015-07-31 16:31:08 -07:00 |
|
Atlante45
|
f9c8f30083
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-31 16:16:06 -07:00 |
|
Atlante45
|
7083d84372
|
Fix ack timestamps
|
2015-07-31 16:15:21 -07:00 |
|
Stephen Birarda
|
d420bca88e
|
fix for ACK2 sending, output prettier stats
|
2015-07-31 16:14:33 -07:00 |
|
Atlante45
|
c5b92d319f
|
Update stats gathering
|
2015-07-31 16:14:19 -07:00 |
|
Atlante45
|
ed614521fd
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-31 15:12:15 -07:00 |
|
Atlante45
|
fcec53bdce
|
Fix sequence number crash
|
2015-07-31 15:09:58 -07:00 |
|
Stephen Birarda
|
ce21204151
|
add output of connection stats in UDTTest
|
2015-07-31 15:09:30 -07:00 |
|
Seth Alves
|
bbee001366
|
Merge pull request #5470 from birarda/master
fix for unique_ptr<char> allocations
|
2015-07-31 15:09:18 -07:00 |
|
Stephen Birarda
|
12ad60a6b5
|
add a missed char[] in OctreePacketProcessor
|
2015-07-31 14:48:54 -07:00 |
|
David Rowe
|
c88e0360b3
|
Change the inspect.js pan direction and rate
This makes camera zoom, orbit, and panning more similar to Second Life.
|
2015-07-31 14:46:43 -07:00 |
|
Stephen Birarda
|
b0afdb21ad
|
correct the unique_ptr char allocations
|
2015-07-31 14:29:05 -07:00 |
|
Andrew Meadows
|
661a916ebd
|
merge rig into cleanup (removal of legacy shapes)
Conflicts:
interface/src/avatar/Avatar.h
tests/physics/src/ShapeColliderTests.cpp
tests/physics/src/ShapeColliderTests.h
|
2015-07-31 13:40:51 -07:00 |
|
Zander Otavka
|
7973c2d469
|
Fix compile issue on Linux and Windows.
Shoutout to Andrew for help finding the missing #include.
|
2015-07-31 11:26:04 -07:00 |
|
Zander Otavka
|
9bd72e5769
|
Tweak PanelAttachable::setTransforms.
Use reference instead of pointer, and make it virtual.
|
2015-07-31 11:26:04 -07:00 |
|
Zander Otavka
|
c37c3ec2d2
|
Use images off the amazon bucket, not file://.
|
2015-07-31 11:26:04 -07:00 |
|