David Rowe
550e9224c5
Mute / un-mute face tracking when menu item is changed from script
2015-07-17 11:45:15 -07:00
ZappoMan
33464dfd6c
cleanup dead code
2015-07-17 11:35:42 -07:00
Stephen Birarda
7a13c867ae
quit the ScriptEngine thread once the script is done
2015-07-17 11:18:14 -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
bwent
b22fd3f4a0
fixed lagging issues
2015-07-17 10:58:30 -07:00
Ryan Huffman
68564a79b0
Merge branch 'protocol' of github.com:Atlante45/hifi into protocol
2015-07-17 09:59:05 -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
7d60b86f52
kill the PacketLister (AKA Huffman 1 : PacketListener 0)
2015-07-17 09:07:39 -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
ceea5143e1
Avoid string copy
2015-07-16 16:55:37 -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
ZappoMan
069620b2d9
hacking on more naked GL
2015-07-16 16:36:48 -07:00
ZappoMan
09430b6596
hacking on more naked GL
2015-07-16 16:27:41 -07:00
ZappoMan
398075e45a
hacking on more naked GL
2015-07-16 16:26:28 -07:00
Stephen Birarda
eb0ed438ec
remove environment data packet
2015-07-16 16:23:57 -07:00
Brad Davis
89faf85ad9
Working on text rendering overlays
2015-07-16 15:56:01 -07:00
David Rowe
f5b02c1731
Remove dead code
...
Camera mode cannot be mirror
2015-07-16 14:06:42 -07:00
David Rowe
6c6e3eb758
Rename and refactor eye deflection slider
2015-07-16 14:05:34 -07:00
Atlante45
b4121eb464
Remove unnecessary move
2015-07-16 13:14:17 -07:00
David Rowe
9980233a0d
Use estimated eye pitch and yaw from DDE to deflect eyes
2015-07-16 13:03:33 -07:00
Stephen Birarda
05dd49a4c5
seek back after track of octree packet
2015-07-16 13:02:20 -07:00
David Rowe
228e8d4fc0
Velocity filter eye pitch and yaw
2015-07-16 12:37:47 -07:00
bwent
854a098180
keep track of channel id's within addChannel function, pass in when updating
2015-07-16 12:28:43 -07:00
Stephen Birarda
3d6b246782
check version against version in OPP
2015-07-16 12:18:27 -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
David Rowe
6b523ada2b
Calculate eye pitch and yaw from DDE coefficients
2015-07-16 10:48:21 -07:00
David Rowe
ba733f730b
Move towards saccade target at speed taking into account frame rate
2015-07-15 18:05:10 -07:00
David Rowe
8336b318e1
Scale saccade per target distance when calculating eye rotation
...
So that saccades still show when looking into distance.
2015-07-15 18:05:09 -07:00
bwent
4c70c197e6
keep track of channel index with global variable
2015-07-15 17:19:57 -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
Howard Stearns
01a3701b52
Merge pull request #5329 from SamGondelman/hydraFix
...
Hydra hand and mouse fixes
2015-07-15 19:03:04 -05:00
Kevin M. Thomas
671263909a
Moved reload content item to nested Network menu item.
2015-07-15 19:47:37 -04:00
bwent
0654bb5e36
Pass by reference into initialize and update function, remove dead code
2015-07-15 16:40:55 -07:00
ZappoMan
d5a6e87a02
remove naked gl from Avatar::calculateDisplayNameTransform()
2015-07-15 16:34:23 -07:00
Kevin M. Thomas
b93ae7b527
Move reload content item to developer menu.
2015-07-15 19:25:18 -04:00
Stephen Birarda
6a02e6d001
resolve final conflict in Application
2015-07-15 16:23:23 -07:00
Stephen Birarda
05dde9d8f5
resolve conflicts on merge with upstream/master
2015-07-15 16:18:47 -07:00
bwent
c159068701
Make pointers member variables
2015-07-15 16:10:41 -07:00
ZappoMan
7795eaace6
remove more naked gl
2015-07-15 15:56:27 -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
Atlante45
8aa2892fde
Remove OctreePacketProcessor dtor
2015-07-15 15:35:13 -07:00
ZappoMan
2ad2c4d554
remove some dead code
2015-07-15 15:33:28 -07:00
Brad Hefta-Gaub
7d8f2e906b
Merge pull request #5340 from cozza13/20617
...
CR for Job #20617 - Change default Minimum Desktop FPS
2015-07-15 14:59:43 -07:00
samcake
de7aed1abc
Merge pull request #5338 from ZappoMan/removeGlowEffect
...
Remove the glow effect.
2015-07-15 14:50:15 -07:00
Brad Hefta-Gaub
ae6e7f05b6
Merge pull request #5341 from samcake/daft
...
Remove the glGet( viewport ) from DeferredLightingEffect
2015-07-15 14:26:08 -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
Atlante45
039bdc8900
Check dependencyManager return value
2015-07-15 14:06:39 -07:00
ZappoMan
849b584596
more GlowEctomy
2015-07-15 13:16:38 -07:00
Chris Collins
ff288fdd5d
While we work on FPS I have decreased the default LOD FPS
...
While we work on FPS I have decreased the default LOD FPS. In a new
users preferences this will now show as 15 desktop and 30 HMD.
2015-07-15 13:09:55 -07:00
Atlante45
aa517adb73
Fix Application inheritance formatting
2015-07-15 13:09:34 -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
bwent
70e3e7caa4
Merge branch 'master' into audioStatsDialog
2015-07-15 12:29:33 -07:00
bwent
2c24251b52
Clean up from previous commit
2015-07-15 11:41:26 -07:00
Sam Gateau
48f23a6eaf
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-15 11:29:41 -07:00
Stephen Birarda
8b5026a817
cleanup some warnings
2015-07-15 11:20:55 -07:00
bwent
5b0b7229ba
Added a dialog box to display audio network statistics
2015-07-15 11:10:39 -07:00
ZappoMan
6b06987700
remove dead code for magnifier
2015-07-15 10:48:07 -07:00
Stephen Birarda
e127c5c06d
rename Packet methods for clarity
2015-07-15 10:40:40 -07:00
ZappoMan
0eeddddd6b
removed naked GL from drawOnHUD overlays.
2015-07-15 09:46:58 -07:00
ZappoMan
53c3e3d731
fix CR feedback
2015-07-15 09:03:07 -07:00
David Rowe
fc0ae17a87
Mirror head when using face tracker in fullscreen mirror
...
Mirror translation, yaw, and roll in the same manner as done for HMD
case, to mimic what you would expect to see in a mirror.
2015-07-15 07:27:55 -07:00
David Rowe
0af62ca946
Convert tabs to spaces
2015-07-15 07:27:54 -07:00
samcake
9df26c8488
removing naked glViewport from DeferredLightingEffect by adding the current viewport in renderArgs
2015-07-15 00:24:43 -07:00
samcake
c9112966ba
revert debug code
2015-07-14 22:00:32 -07:00
ZappoMan
e39ea72daf
removed dead code
2015-07-14 21:25:49 -07:00
ZappoMan
5d43c98ebc
fix image overlays to not use Naked GL
2015-07-14 20:56:36 -07:00
ZappoMan
8bb6616a25
remove nakedGL from skeleton IK constraint rendering
2015-07-14 18:47:35 -07:00
Sam Gateau
98a3141e11
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-07-14 18:38:21 -07:00
Sam Gateau
440464f884
Trying to improve the GLBackendINtpu cahce a bit and thinking about moving to core profile
2015-07-14 18:35:11 -07:00
ZappoMan
5a927c4c90
remove dead code
2015-07-14 18:25:50 -07:00
Sam Gondelman
6a0df442f9
emulated mouse events don't get sent back to the keyboard (can't right click and drag with sixense, etc)
2015-07-14 17:59:59 -07:00
ZappoMan
f1b85aefa9
more dead code removal: NodeBounds
2015-07-14 17:59:20 -07:00
Sam Gondelman
f3cb25065f
can't move when hydras at base, hands can deactivate individually
2015-07-14 17:36:22 -07:00
ZappoMan
23b89a6f7d
remove naked gl/dead code from line and cube overlays
2015-07-14 17:04:07 -07:00
Atlante45
fbb6a94579
Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol
2015-07-14 16:36:28 -07:00
Philip Rosedale
17ec524253
Merge pull request #5324 from ZappoMan/fixLaggingTouch
...
fix lagging touch events
2015-07-14 16:28:00 -07:00
Ryan Huffman
c6ffda12f9
Merge branch 'atp' of github.com:birarda/hifi into receive_packets
2015-07-14 16:21:57 -07:00
Stephen Birarda
e596733c8b
fix for stats grab from iterator
2015-07-14 16:21:34 -07:00
Ryan Huffman
ede9217483
Merge branch 'atp' of github.com:birarda/hifi into receive_packets
2015-07-14 16:15:01 -07:00
Stephen Birarda
e4849d29ec
re-use iterator when checking _octreeServerSceneStats
2015-07-14 16:14:43 -07:00
ZappoMan
68f4fe6566
fix lagging touch events
2015-07-14 16:03:44 -07:00
Ryan Huffman
bd345cdccd
Merge branch 'atp' of github.com:birarda/hifi into receive_packets
...
Conflicts:
libraries/networking/src/PacketReceiver.cpp
2015-07-14 15:59:16 -07:00
Stephen Birarda
bbe5a3d682
remove commented out call to resetCounters
2015-07-14 15:51:32 -07:00
Stephen Birarda
fb7cb7ff53
add the option for PacketReceiver to drop packets
2015-07-14 15:49:54 -07:00
Philip Rosedale
221a92eeee
Merge pull request #5322 from ctrlaltdavid/fix-eye-direction
...
Fix eye directions so that they're correct when avatar leans backwards
2015-07-14 15:38:56 -07:00
Stephen Birarda
789235b8c7
make NodeList deleter be deleteLater
2015-07-14 15:28:38 -07:00
Ryan Huffman
56b5c9acff
Merge branch 'atp' of github.com:birarda/hifi into receive_packets
...
Conflicts:
assignment-client/src/entities/EntityServer.cpp
domain-server/src/DomainServer.cpp
2015-07-14 14:53:45 -07:00
Ryan Huffman
677ffb7068
Remove redundant lookup for packetType
2015-07-14 14:50:36 -07:00
Stephen Birarda
e2188415fe
fix ref to qApp, connection to audioIO
2015-07-14 14:45:26 -07:00
Stephen Birarda
4dd3dd6386
swap m for comma in Menu
2015-07-14 14:44:04 -07:00
Stephen Birarda
23548a99bc
move NACK packet disabling to EntityEditPacketSender
2015-07-14 14:43:01 -07:00
Stephen Birarda
8d4c945874
cleanup audioIO connections in Application
2015-07-14 14:34:39 -07:00
Stephen Birarda
1f4ac0f17c
emit mutedByMixer signal for a noisy mute
2015-07-14 14:30:46 -07:00
Stephen Birarda
d617b71232
remove SharedNodePointer from some packet callbacks
2015-07-14 14:27:26 -07:00
Atlante45
bbb00b9d3a
Merge branch 'protocol' of https://github.com/birarda/hifi into protocol
2015-07-14 14:11:41 -07:00
David Rowe
bfad3ee02a
Fix eye directions so that they're correct when avatar leans backwards
2015-07-14 14:07:32 -07:00
Stephen Birarda
0637f589b5
add PacketListener to help unregister for packets
2015-07-14 13:52:38 -07:00
Atlante45
a32f54da2f
Cleanup
2015-07-14 12:36:18 -07:00
Atlante45
7bf45308b6
Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart
2015-07-14 12:31:37 -07:00
Brad Hefta-Gaub
049419cec7
Merge pull request #5307 from howard-stearns/remove-octreeFades
...
Remove old octreeFade code that wasn't working anyway
2015-07-14 10:24:01 -07:00
Ryan Huffman
0edc909818
Merge branch 'protocol' of github.com:birarda/hifi into receive_packets
...
Conflicts:
assignment-client/src/audio/AudioMixer.cpp
interface/src/Application.cpp
libraries/networking/src/Packet.cpp
2015-07-14 10:21:31 -07:00
Stephen Birarda
821c16cbc4
resolve conflicts on merge with uptream/master
2015-07-14 09:52:20 -07:00
Brad Davis
684d466b44
Merge pull request #5308 from venkatn93/avatar
...
Avatars rendered correctly based on Scene.shouldRenderAvatars
2015-07-14 09:06:49 -07:00
Niraj Venkat
ef3c6b25e0
More coding standard changes
2015-07-14 00:45:38 -07:00
Niraj Venkat
1f1a5f8e75
Coding standard and fixing pointers
2015-07-13 22:57:11 -07:00
Philip Rosedale
c81053fc83
Merge pull request #5318 from samcake/punk
...
Fixing the ImageOverlay Bug
2015-07-13 22:25:46 -07:00
Clément Brisset
a432752c39
Merge pull request #5316 from ctrlaltdavid/20604
...
QA for #20604 - Add an "is looking at me" indicator above avatars' heads
2015-07-13 16:40:11 -07:00
Sam Gateau
f08c608195
Remove dead code
2015-07-13 16:33:04 -07:00
Sam Gateau
5555ccd225
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-07-13 16:19:09 -07:00
Sam Gateau
4743bbad80
Adding shaders to the lib for rendering simple textured quad and solve the ImageOverlay issue for edit.js
2015-07-13 16:18:39 -07:00
Clément Brisset
c99382ee74
Merge pull request #5287 from ctrlaltdavid/20607
...
CR for Job #20607 - Interface upgrade message has bad formatting
2015-07-13 16:07:17 -07:00
Clément Brisset
24eb4c8263
Merge pull request #5309 from sethalves/quiet-compiler
...
quiet compiler
2015-07-13 15:55:35 -07:00
Stephen Birarda
34f9b1881e
fix registration of OctreePacketProcessor for set of types
2015-07-13 15:40:55 -07:00
Atlante45
c80df94b06
Update includes for moved files
2015-07-13 15:28:55 -07:00
Niraj Venkat
10e0a93ac0
Fix for avatar rendering not working on domain exit/entry
2015-07-13 15:22:00 -07:00
David Rowe
59f456a2f2
Add an "is looking at me" indicator above avatars' heads
...
Menu item: Developer > Avatar > Show Who's Looking at Me
2015-07-13 14:16:39 -07:00
Stephen Birarda
ca1ff9b0f5
fix a couple of compile errors for avatar changes
2015-07-13 13:34:36 -07:00
Stephen Birarda
859122db5d
update signature of callbacks for avatar packets
2015-07-13 13:32:46 -07:00
Stephen Birarda
d990420565
repairs to octree packet receiving in interface
2015-07-13 13:10:57 -07:00
Atlante45
957e6394a9
sendPacket function take Node& not a pointer
2015-07-13 11:57:20 -07:00
Stephen Birarda
264f39fa59
resolve conflicts on merge with upstream/master
2015-07-13 11:25:24 -07:00
Stephen Birarda
f3d5b8f7c6
add a missing semicolon
2015-07-13 11:18:20 -07:00
Stephen Birarda
3d62162812
cleanup octree networking code to use new API
2015-07-13 09:40:26 -07:00
Howard Stearns
d1952583ab
Merge branch 'master' of https://github.com/highfidelity/hifi into remove-octreeFades
2015-07-13 07:24:08 -07:00
Seth Alves
fb23eb0faf
Merge pull request #5301 from samcake/yellow
...
Rename gpu::Batch::setUniformTexture into gpu::Batch::setResourceTexture
2015-07-12 11:36:03 -07:00
Seth Alves
c17c9f1818
quiet compiler
2015-07-12 10:29:43 -07:00
Atlante45
80fe090a94
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-10 20:20:03 -07:00
Andrew Meadows
9ce9c541de
fix activation of object when action changes
2015-07-10 18:45:40 -07:00
Stephen Birarda
ffcd8e1613
update connection for packet version mismatch
2015-07-10 17:54:51 -07:00
Stephen Birarda
9ee62a8a38
fix for connection denied packet in Application
2015-07-10 17:52:51 -07:00
Niraj Venkat
f95bd3f7bd
Fixing build error
2015-07-10 17:46:20 -07:00
Niraj Venkat
bbd7b2a65e
Removed unused functions
2015-07-10 17:31:49 -07:00
Niraj Venkat
dacc6f66c0
Avatars rendered correctly based on Scene.shouldRenderAvatars
2015-07-10 17:26:56 -07:00
Howard Stearns
51be245159
Remove old octreeFade code that wasn't working anyway.
2015-07-10 16:55:45 -07:00
Atlante45
ec7e1df8c0
Move and rename menu item
2015-07-10 15:47:46 -07:00
Atlante45
a3848f08d2
Conditionnal fixes.
2015-07-10 15:36:17 -07:00
Sam Gateau
98f10e72ec
fix the wrong function name that happened missing a merge
2015-07-10 15:20:49 -07:00
Ryan Huffman
dee117500b
Remove process() from OctreePacketProcessor
2015-07-10 15:00:46 -07:00
Ryan Huffman
99aaefbd03
Fix and update signature of Application::handleDomainConnectionDeniedPacket
2015-07-10 15:00:29 -07:00
Ryan Huffman
6e53a5ad97
Update OctreePacketProcessor to use SharedNodePointer
2015-07-10 14:23:09 -07:00
Andrew Meadows
9cb7e86877
cleanup of AvatarActionHold deserialization
2015-07-10 12:34:12 -07:00
Atlante45
5cfa1605df
Made Texture safe with resource refresh
2015-07-10 12:28:06 -07:00
Sam Gateau
2c05349b06
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-10 11:10:07 -07:00
Sam Gateau
7fc9fd97ff
Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers.
2015-07-10 11:03:12 -07:00
Atlante45
4702b39130
Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart
2015-07-10 10:56:11 -07:00
Andrew Meadows
1759f0553d
Merge pull request #5290 from BingShearer/CrashFixes
...
Crash fixes
2015-07-10 10:42:47 -07:00
Ryan Huffman
78ff6477bd
Update OctreePacketProcessor to use QSharedPointer<NLPacket>
2015-07-10 08:45:21 -07:00
Brad Hefta-Gaub
33016e2797
Merge pull request #5293 from jherico/bart
...
More profiling ranges and updated performance testing scripts
2015-07-09 19:10:45 -07:00
Brad Hefta-Gaub
af20969eb9
Merge pull request #5298 from jherico/lisa
...
Restore audio scope
2015-07-09 19:03:29 -07:00
Brad Hefta-Gaub
74ef91550c
Merge pull request #5296 from venkatn93/master
...
Entities are now added/removed from rendering based on Scene.shouldRenderEntities
2015-07-09 18:54:06 -07:00
Brad Davis
a92a7980d7
Restore audio scope
2015-07-09 17:49:25 -07:00
Andrew Meadows
270ea7af9e
Merge pull request #5292 from sethalves/palm-rotation
...
action changes to allow "hold" action to track palm rotation
2015-07-09 17:44:28 -07:00
Niraj Venkat
007d662db1
Re-added for shouldRenderEntities
2015-07-09 17:40:14 -07:00
Niraj Venkat
706f85e4ce
Fixes to comply with coding standard
2015-07-09 17:31:38 -07:00
Seth Alves
d0d0b2a143
Merge pull request #5295 from birarda/master
...
potential fix for windows domain connect cycling
2015-07-09 17:04:06 -07:00
Atlante45
bfeb095fb4
Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart
2015-07-09 16:30:56 -07:00
Niraj Venkat
adf5b95835
Changing formatting
2015-07-09 16:25:29 -07:00
Niraj Venkat
52095fd38d
Fixing merge
2015-07-09 16:23:40 -07:00
Niraj Venkat
1dce5f80cc
Entities are now added/removed from rendering based on Scene.shouldRenderEntities
2015-07-09 16:17:58 -07:00
Brad Davis
214405a0e5
Fixing typo
2015-07-09 16:06:27 -07:00
Ryan Huffman
2380fb23c3
Update OctreePacketProcessor to use NLPacket&
2015-07-09 16:05:52 -07:00
Stephen Birarda
efb89c281f
fix creation of QTimer parented by NodeList
2015-07-09 16:02:29 -07:00
Stephen Birarda
a4f1145f06
fix QTimer connection to nodeList
2015-07-09 16:01:41 -07:00
Stephen Birarda
408ecb9735
move domain server check in timer to node thread
2015-07-09 15:59:32 -07:00
Brad Davis
446f800aee
More profiling ranges and updated performance testing scripts
2015-07-09 15:43:30 -07:00
Ryan Huffman
6f9907a22d
Stub in process() for OctreePacketProcessor
2015-07-09 15:31:45 -07:00
Ryan Huffman
8da50d342c
Remove DatagramProcessor.h from Application
2015-07-09 15:31:01 -07:00
Ryan Huffman
5e65f422fa
Move mute environment handling to Application
2015-07-09 15:30:25 -07:00
Bing Shearer
99c563602f
Fixed Else case where _renderImage is true but the texture has 0 size, else case did not previously exist.
2015-07-09 15:25:37 -07:00
Seth Alves
2dc4922da3
bring over code from entity-level-locking branch
2015-07-09 15:23:05 -07:00
Seth Alves
5312beeaf4
if an action changes its own arguments, cause reserialisation
2015-07-09 14:50:31 -07:00
Seth Alves
a01fb6f1dc
if an action changes its own arguments, cause reserialisation
2015-07-09 14:32:34 -07:00
Bing Shearer
85f6fdb8cf
Fixed bug which would cause program to crash if there was no image associated with an overlay in windows build (see checkbox in sunLightExample)
2015-07-09 14:20:10 -07:00
Bing Shearer
25708678f6
Fixed shutdown procedure for Datagrams so that there is no crash on exit
2015-07-09 14:18:53 -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
Seth Alves
050c472d6a
Merge branch 'master' of github.com:highfidelity/hifi into palm-rotation
2015-07-09 13:39:37 -07:00
Brad Hefta-Gaub
489a8b4b3d
Merge pull request #5285 from jherico/homer
...
Move log file writing to a separate thread
2015-07-09 12:22:13 -07:00
Seth Alves
d197bf2a85
use palm rotation data in hold action
2015-07-09 12:18:32 -07:00
Stephen Birarda
a363f42bb2
pass const NLPacket& for all sendUnreliablePacket calls
2015-07-09 11:42:18 -07:00
Seth Alves
08d63b7fd8
first attempt at palm rotation
2015-07-09 11:03:02 -07:00
David Rowe
daf34053a8
Tweak button positions
2015-07-09 10:15:28 -07:00
Brad Davis
2fff560ff9
Fixing log file viewer
2015-07-09 09:54:35 -07:00
David Rowe
db7f1d6d27
Change font to Trebuchet
2015-07-09 09:35:22 -07:00
Ryan Huffman
3b7ad982a4
Update OctreePacketProcessor to use packet callbacks
2015-07-09 09:23:50 -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
Brad Davis
63dfd570f1
Adding priority support to GenericThread
2015-07-08 22:54:31 -07:00
Stephen Birarda
8c2cf2cf25
fix an unused variable warning
2015-07-08 22:48:44 -07:00
Brad Davis
08d1364f81
Move file log persistence to a separate thread
2015-07-08 22:35:23 -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
c5840d085c
replace packet header size check with 0
2015-07-08 18:35:56 -07:00
Stephen Birarda
dfa5be1a0c
fix for killPacket in MyAvatar and DatagramProcessor header check
2015-07-08 18:35:04 -07:00
Brad Davis
625cc86f83
Merge pull request #5283 from ZappoMan/optimizeByteCountCoded
...
Optimize ByteCountCoded<> to not do extra heap allocations
2015-07-08 18:35:02 -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
Atlante45
ee3a8b1b6e
Clear resource caches instead of restarting
2015-07-08 18:23:16 -07:00
ZappoMan
7790e35d24
added bytes consumed result to decode, and exit early after bytes consumed
2015-07-08 18:19:12 -07:00
Seth Alves
7bea4a54a3
Merge pull request #5274 from AndrewMeadows/argon
...
cleanup of EntityActionInterface and friends
2015-07-08 17:54:52 -07:00
ZappoMan
e885ac1821
improved performance of ByteCountCoding<> decode
2015-07-08 17:32:51 -07:00
Ryan Huffman
1b5d526444
Add new packet processing to AvatarManager
2015-07-08 15:06:50 -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
c365ea60ad
Add packet listening to AvatarManager
2015-07-08 13:13:21 -07:00
Atlante45
ed296850e2
Rename to clear cache and restart
2015-07-08 12:24:45 -07:00
Atlante45
39cb5100a3
Clear cache and restart first draft
2015-07-08 12:23:22 -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
122fd61451
fix a bad replacement in DatagramProcessor
2015-07-08 10:44:40 -07:00
Stephen Birarda
818521864b
fix missed bad PacketType replacement
2015-07-08 10:27:32 -07:00
Ryan Huffman
9d25612ff8
Move DatagramProcessor to PacketProcessor
2015-07-08 10:24:30 -07:00
Ryan Huffman
e89dbe8541
Update PacketType in DatagramProcessor
2015-07-08 10:24:30 -07:00
Ryan Huffman
b1c09d71f7
Add packet listeners to DatagramProcessor
2015-07-08 10:21:15 -07:00
Stephen Birarda
74940a2132
replace lingering PacketTypes in old format
2015-07-08 10:18:13 -07:00
Andrew Meadows
a0a1b01ea9
coalesce dupe action data members: _id and _type
2015-07-07 17:50:08 -07:00
Andrew Meadows
e9df8cacc7
make some arguments const, cleanup some #includes
2015-07-07 17:50:08 -07:00
Andrew Meadows
77bd7b2821
some ObjectAction methods should be const
2015-07-07 17:50:08 -07:00
David Rowe
abc54f2e3f
Polished fonts, colors, etc.
2015-07-07 17:08:02 -07:00
Stephen Birarda
6c6143f21e
remove NetworkPacket and replace with NodePacketPair
2015-07-07 16:56:05 -07:00
David Rowe
b123e280d6
Add release numbers to associated text
2015-07-07 16:22:01 -07:00
David Rowe
cd258262d2
Use proper Interface logo
2015-07-07 16:21:24 -07:00
Stephen Birarda
1f68ad892a
replace PacketList usage with NLPacketList
2015-07-07 16:14:57 -07:00
David Rowe
1774ad9c53
Rework buttons
2015-07-07 15:59:34 -07:00
David Rowe
98cd706528
Add border around update details
2015-07-07 15:48:39 -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
David Rowe
0994cd97dc
Rework header and add logo
...
Use HiFi logo as placeholder for now until Interface SVG is available.
2015-07-07 15:14:15 -07:00
David Rowe
085d87e035
Make background squared, white, and dragable
2015-07-07 14:16:45 -07:00
David Rowe
46e58cd106
Rework dialog container and layout
2015-07-07 13:56:47 -07:00
Atlante45
9889dcdd64
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
2015-07-07 12:29:00 -07:00
Howard Stearns
1c2972bd7c
Expose avatar collisions to scripts, and include velocityChange in exposed collision data.
2015-07-07 11:49:55 -07:00
Stephen Birarda
e05470a11c
change to new packet sending in Application
2015-07-07 11:11:20 -07:00
Atlante45
2ba6bd3afc
Double display name offset
2015-07-06 18:39:43 -07:00
Atlante45
687f9dda4a
Restore old offset behaviors
2015-07-06 18:21:17 -07:00
Atlante45
541d9ae431
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_billboard
2015-07-06 18:05:43 -07:00
Brad Davis
bd938d5f4c
Merge pull request #5263 from ZappoMan/inBoundStats
...
Additional inbound entity stats
2015-07-06 17:12:19 -07:00
ZappoMan
05f28064bf
add stats for PPS for inbound from network into OctreePacketProcessor and processing out of OctreePacketProcessor
2015-07-06 16:03:42 -07:00
Atlante45
4a777f600f
Change DDE Packet struct name to avoid collision
2015-07-06 15:11:36 -07:00