Stephen Birarda
9ee62a8a38
fix for connection denied packet in Application
2015-07-10 17:52:51 -07:00
Ryan Huffman
99aaefbd03
Fix and update signature of Application::handleDomainConnectionDeniedPacket
2015-07-10 15:00:29 -07:00
Ryan Huffman
5e65f422fa
Move mute environment handling to Application
2015-07-09 15:30:25 -07:00
Ryan Huffman
dd9dea7a97
Merge remote-tracking branch 'birarda/protocol' into receive_packets
...
Conflicts:
interface/src/DatagramProcessor.cpp
interface/src/octree/OctreePacketProcessor.cpp
libraries/entities/src/EntityEditPacketSender.cpp
libraries/networking/src/LimitedNodeList.h
libraries/networking/src/NLPacket.h
2015-07-09 14:08:35 -07:00
Stephen Birarda
1b4e333c49
Merge pull request #3 from birarda/atp
...
initial networking API changes for new protocol
2015-07-09 16:51:37 -04:00
Stephen Birarda
a363f42bb2
pass const NLPacket& for all sendUnreliablePacket calls
2015-07-09 11:42:18 -07:00
Brad Hefta-Gaub
fb07956689
Merge pull request #5284 from hyperlogic/ajt/mirror-view-fix
...
fix for mirror rendering on windows
2015-07-09 08:38:55 -07:00
Stephen Birarda
19c5f0b67c
resolve conflicts on merge with upstream/master
2015-07-08 22:54:36 -07:00
Stephen Birarda
8c2cf2cf25
fix an unused variable warning
2015-07-08 22:48:44 -07:00
Anthony J. Thibault
1be0e7ebc3
fix for mirror rendering on windows
...
* added preScale to Transform class.
* preScale by -1 about the xAxis instead of post scale.
I think this was working on Mac due to the different code paths in
GLBackendTransform::updateTransform for core vs legacy gl profile.
2015-07-08 21:33:27 -07:00
Brad Davis
b173ac397c
Merge pull request #5278 from samcake/yellow
...
Adding more NSight instrumentation
2015-07-08 20:28:18 -07:00
Stephen Birarda
658ad6bd02
fix eachNode lambda in Application
2015-07-08 18:55:26 -07:00
Stephen Birarda
da3502eb6c
resolve conflicts on merge with upstream/master
2015-07-08 18:41:48 -07:00
Stephen Birarda
cf15cbc62f
fix a cast, move a packet
2015-07-08 18:37:25 -07:00
Stephen Birarda
dc7c268467
fixes for changed API in Application
2015-07-08 18:27:10 -07:00
Stephen Birarda
9c18277e9c
packet fixes in script-engine and Application
2015-07-08 18:24:49 -07:00
ZappoMan
7790e35d24
added bytes consumed result to decode, and exit early after bytes consumed
2015-07-08 18:19:12 -07:00
ZappoMan
e885ac1821
improved performance of ByteCountCoding<> decode
2015-07-08 17:32:51 -07:00
Sam Gateau
4c44eb63da
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-08 14:25:41 -07:00
Sam Gateau
f992e875b4
Adding intrsumentation for nsight and hiding the nsight specific code in cpp
2015-07-08 14:25:13 -07:00
Ryan Huffman
0b0446e527
Add handleComainConnectionDeniedPacket to Application
2015-07-08 11:54:22 -07:00
Ryan Huffman
b960d86f80
Remove datagramProcessor from Application
2015-07-08 11:54:06 -07:00
Philip Rosedale
574758eae9
Merge pull request #5252 from ctrlaltdavid/20601
...
DO NOT MERGE - QA for #20601 - Fix and improve eye gaze
2015-07-08 11:37:40 -07:00
Stephen Birarda
74940a2132
replace lingering PacketTypes in old format
2015-07-08 10:18:13 -07:00
Stephen Birarda
1f68ad892a
replace PacketList usage with NLPacketList
2015-07-07 16:14:57 -07:00
Stephen Birarda
11d5aa9803
fix queryPacket initialization in Application
2015-07-07 15:41:07 -07:00
Stephen Birarda
56880e8858
return fixes for NAK PacketLists
2015-07-07 15:33:03 -07:00
Stephen Birarda
45b549398d
use PacketList for application nack packets
2015-07-07 15:31:58 -07:00
Stephen Birarda
e05470a11c
change to new packet sending in Application
2015-07-07 11:11:20 -07:00
Stephen Birarda
a9420d4212
replace controlled broadcast to nodes in Application
2015-07-02 17:55:26 -07:00
Stephen Birarda
0d64e82fe2
replace PacketType declarations with PacketType::Value
2015-07-02 16:38:52 -07:00
David Rowe
87ca7626d7
Merge branch 'master' into 20601
2015-07-02 15:45:32 -07:00
David Rowe
9efeda9716
Adjust gaze target for someone looking at me
2015-07-02 15:43:23 -07:00
Sam Gateau
8d8a902328
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-02 15:06:32 -07:00
David Rowe
3a92878544
Reinstate making someone looking at me look at my camera instead of face
2015-07-02 13:47:52 -07:00
Brad Davis
d5fe6f0bdb
Inhibiting log spam unless a menu item is selected
2015-07-02 12:34:32 -07:00
Clément Brisset
b616fff222
Merge pull request #5220 from howard-stearns/avatar-collision-sounds
...
Avatar collision sounds
2015-07-02 10:27:24 -07:00
David Rowe
c20cd40275
Merge branch 'master' into 20601
...
Conflicts:
interface/src/avatar/Head.cpp
2015-07-02 09:51:47 -07:00
Brad Hefta-Gaub
f16b8d5083
Merge pull request #5246 from jherico/inter_idle_timing
...
Instrument the inter-idle time and tweaking the timeout setting
2015-07-02 09:01:44 -07:00
David Rowe
026f6d3690
Add mouth as third gaze target in addition to left and right eyes
2015-07-01 21:22:30 -07:00
David Rowe
4ced0dc6c4
Only deflect eyes for Faceshift; DDE doesn't provide eye pitch or yaw
2015-07-01 20:24:47 -07:00
David Rowe
26cbb14f45
Alternative look-at gaze left/right with face trackers too
...
Instead of looking at one or other eye depending on look direction.
2015-07-01 20:09:36 -07:00
David Rowe
fada70fe02
Remove redundant code
2015-07-01 18:32:33 -07:00
David Rowe
bc4c635106
Fix gazing at avatar (when no head tracking or HMD)
...
Randomly look at avatar's left and right eyes if the face is visible.
Otherwise just look at their head.
2015-07-01 18:31:16 -07:00
Sam Gateau
d019ef4373
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-01 18:12:11 -07:00
Sam Gateau
e8b11f1198
Exposing the display Item Status to js to turn it on/off
2015-07-01 17:27:41 -07:00
Brad Davis
88a733181e
Fixing comment to reflect code
2015-07-01 16:54:59 -07:00
Brad Davis
4cffa26c01
CR comments and fixing the microsecond display
2015-07-01 16:53:12 -07:00
Brad Davis
59027959b8
CR comments and fixing the average calculation
2015-07-01 16:30:42 -07:00
Brad Hefta-Gaub
af932fde29
Merge pull request #5247 from ericrius1/handRender
...
Fixed broken rendering of hydra visualization paraphernalia
2015-07-01 16:21:32 -07:00
