Stephen Birarda
2c0604afd1
fix string JSON unmarshal, add basic avatar values
2015-04-30 08:55:08 -07:00
Seth Alves
09eea83461
don't give timers owners while also keeping track of them in as class instance variables
2015-04-29 19:18:58 -07:00
Seth Alves
e985f56b12
cleanups
2015-04-29 15:30:13 -07:00
Seth Alves
009bb9dc71
all 4 types of assignment-client appear to exit cleanly, now
2015-04-29 15:16:00 -07:00
Stephen Birarda
31c067cac5
fix change of keypath after handling array index
2015-04-29 15:10:04 -07:00
Stephen Birarda
b55889597d
complete unmarshal of breakable json using QVariant
2015-04-29 15:03:49 -07:00
Stephen Birarda
b17191a20f
add method to convert a QStringList back to QJsonObject
2015-04-29 12:40:24 -07:00
Seth Alves
e7d8bccd5d
cleanups
2015-04-29 12:03:54 -07:00
Seth Alves
d2cd4fc405
types 0 and 1 exit cleanly, type 6 crashes
2015-04-29 11:56:45 -07:00
Stephen Birarda
24576574ae
add breaking of marshaled buffer to QStringList
2015-04-29 11:20:07 -07:00
Stephen Birarda
c7a7bc1646
handle sending of JSONBreakableMarshal data via sendStats
2015-04-29 10:44:17 -07:00
Seth Alves
02fd9987c7
rework audio mixer so it can exit cleanly
2015-04-28 18:38:41 -07:00
Stephen Birarda
68998f4423
cleanup AudioMixer stats to be properly nested
2015-04-28 18:19:16 -07:00
Stephen Birarda
4e6979cac8
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-mixer-throttling
2015-04-28 16:50:07 -07:00
Stephen Birarda
698fcdfbbf
add JSONBreakableMarshal to help with MTU stats sending
2015-04-28 16:50:00 -07:00
Stephen Birarda
404cd67bb7
Merge pull request #4716 from sethalves/assignment-client-exits
...
assignment-client shouldn't try to save contents of its nonexistent address bar
2015-04-28 19:40:44 -04:00
Seth Alves
a234c02d7d
Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-exits
2015-04-28 13:41:56 -07:00
Seth Alves
28ad80936a
assignment-client shouldn't try to save contents of its nonexistent address bar. interface still needs to save the address.
2015-04-28 13:21:14 -07:00
Seth Alves
f9c0493c61
when a login is completed, reset the node list in order to force a re-connection to the domain-server (thereby giving the interface any new rights it deserves, such as the ability to edit entities)
2015-04-28 10:23:08 -07:00
Seth Alves
b69cba1aba
respond to code-review
2015-04-25 10:50:18 -07:00
Seth Alves
0fb1a83e3b
quiet compiler, remove some trailing control-Ms
2015-04-25 09:20:00 -07:00
Atlante45
8dc98d86b5
Bump entities packet version
2015-04-22 21:16:03 +02:00
ZappoMan
19386d5a5d
Merge branch 'master' of https://github.com/highfidelity/hifi into ZoneEntity2
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-04-22 09:35:08 -07:00
ZappoMan
e436c95212
first cut at reworking zones
2015-04-21 14:36:13 -07:00
Seth Alves
f452e47577
Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol
2015-04-20 08:49:33 -07:00
Seth Alves
07b9d73edf
bump protocol version
2015-04-17 11:20:35 -07:00
Stephen Birarda
64d17f101a
obfuscate set access token from AM log
2015-04-17 10:44:01 -07:00
Seth Alves
1dd01cde00
expand svo to hold acceleration and id of current simulator node
2015-04-08 15:39:34 -07:00
Seth Alves
9014397167
try again without macro
2015-04-07 09:59:04 -07:00
Seth Alves
7af32bd67a
put audio and script-engine logging into their own QLoggingCategory
2015-04-06 15:57:18 -07:00
Seth Alves
cb7ff86386
put networking library into its own QLoggingCategory
2015-04-06 15:11:48 -07:00
Bradley Austin Davis
44c9d4a742
Working on removing some of the warnings in the xcode build
2015-04-02 16:12:44 -07:00
Stephen Birarda
1d5f1807f7
Merge pull request #4562 from sethalves/editors-are-rezzers
...
add a bool value to Node which indicates if it is allowed to rez new ent...
2015-03-31 18:53:29 -07:00
Seth Alves
8bca8ad4ef
bump protocol versions for PacketTypeDomainList and PacketTypeDomainListRequest
2015-03-31 18:37:42 -07:00
Seth Alves
4e83301c65
add a bool value to Node which indicates if it is allowed to rez new entities
2015-03-31 18:27:46 -07:00
Philip Rosedale
6a171c2f22
Merge pull request #4559 from birarda/constant-metaverse-url
...
add a networking constants class with the metaverse server URL
2015-03-31 18:13:41 -07:00
Seth Alves
d17289f566
Merge pull request #4556 from birarda/damaged-xcode
...
handle a domain-server port change once connection initiated
2015-03-31 17:12:01 -07:00
Stephen Birarda
e22b33e96d
fix QUrl include for ubuntu
2015-03-31 17:00:04 -07:00
Stephen Birarda
61806935bb
add a networking constants class with metaverse URL
2015-03-31 16:40:21 -07:00
Stephen Birarda
64921c38b6
don't overlock in killNodeWithUUID
2015-03-31 16:25:22 -07:00
Stephen Birarda
cf7a6dda74
Merge branch 'master' of https://github.com/highfidelity/hifi into damaged-xcode
2015-03-31 16:14:59 -07:00
Stephen Birarda
740438d08d
handle domain-server local port changes once connected
2015-03-31 16:11:41 -07:00
Brad Hefta-Gaub
d77333953e
Merge pull request #4552 from sethalves/island
...
Fix various collision-model related bugs
2015-03-31 15:47:53 -07:00
David Rowe
154dacf791
Fix typo
2015-03-31 14:21:56 -07:00
Seth Alves
9e0118492e
make sure to not leave in-use resources in UnusedResource list
2015-03-31 14:04:21 -07:00
Seth Alves
186cb1ec7a
merge from upstream
2015-03-30 11:28:47 -07:00
Philip Rosedale
685de8cc7f
Merge pull request #4522 from huffman/rename-attribution
...
Rename attribution to marketplaceID
2015-03-30 10:57:28 -07:00
Seth Alves
fd69a54f10
Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions
2015-03-27 15:55:20 -07:00
Ryan Huffman
81cb1e98ba
Rename attribution to marketplaceID
2015-03-27 13:35:58 -07:00
Seth Alves
087248dffc
fix locking in ResourceCache::checkAsynchronousGets
2015-03-27 13:14:20 -07:00
Andrew Meadows
b9b2c30bba
use QObject::deleteLater() not explicit delete
2015-03-27 09:01:44 -07:00
Seth Alves
7da87d6e15
set up a way to request ResourceCache downloads from a non-networking thread.
2015-03-26 18:37:55 -07:00
Stephen Birarda
ef0281ab43
use the new placename entry as entry point
2015-03-25 15:30:03 -07:00
Ryan Huffman
1c0e7e26a2
Merge pull request #4507 from birarda/friends-only-location
...
make friends-only discoverability mode work as described
2015-03-25 13:48:08 -07:00
Stephen Birarda
4bf8e9f625
change AccountManager request API, leverage in networking and DS
2015-03-25 12:04:04 -07:00
Leonardo Murillo
c3c1d4a5ae
Switching to .com
2015-03-25 12:36:37 -06:00
ZappoMan
81bf7138a4
also attempt to clean up placement of PROP_ATTRIBUTION in the stream
2015-03-20 13:21:29 -07:00
Atlante45
0a3d936427
Merge branch 'master' of https://github.com/highfidelity/hifi into attribution_property
2015-03-20 17:28:32 +01:00
Brad Davis
599fe09e75
type & squish
2015-03-19 17:24:58 -07:00
Atlante45
d3ae7cf5cf
Merge branch 'master' of https://github.com/highfidelity/hifi into attribution_property
2015-03-19 16:25:26 +01:00
Brad Davis
160f666d89
Merge branch 'master' into avatar
2015-03-18 12:55:56 -07:00
Atlante45
8b5ade10b8
Initial add of the Attribution property
2015-03-18 18:57:05 +01:00
Seth Alves
5475e76516
merge from upstream
2015-03-17 14:16:00 -07:00
Brad Davis
6415ff99f6
Work in progress
2015-03-17 12:04:04 -07:00
Seth Alves
069c358aa3
Work around a deadlock:
...
thread 15 locks Octree
thread 1 blocks waiting for Octree lock
thread 15 tries to pass a message to thread 1 with QMetaObject::invokeMethod, and hangs
thread 15 is blocked on qt message passing to thread 1
ResourceCache::getResource libraries/networking/src/ResourceCache.cpp:57
GeometryCache::getGeometry libraries/render-utils/src/GeometryCache.cpp:1774
ModelEntityItem::isReadyToComputeShape libraries/entities/src/ModelEntityItem.cpp:431
PhysicsEngine::addEntityInternal libraries/physics/src/PhysicsEngine.cpp:67
EntitySimulation::addEntity libraries/entities/src/EntitySimulation.cpp:129
EntityTree::postAddEntity libraries/entities/src/EntityTree.cpp:91
^ locks simulation
EntityTreeElement::readElementDataFromBuffer libraries/entities/src/EntityTreeElement.cpp:773
Octree::readElementData libraries/octree/src/Octree.cpp:301
Octree::readElementData libraries/octree/src/Octree.cpp:354
...
Octree::readBitstreamToTree libraries/octree/src/Octree.cpp:439
OctreeRenderer::processDatagram libraries/octree/src/OctreeRenderer.cpp:136
^ lockForWrite Octree::_lock
OctreePacketProcessor::processPacket interface/src/octree/OctreePacketProcessor.cpp:91
ReceivedPacketProcessor::process libraries/networking/src/ReceivedPacketProcessor.cpp:51
thread 1 is blocked on lockForWrite of Octree::_lock
Octree::lockForWrite libraries/octree/src/Octree.h:292
EntityTree::update libraries/entities/src/EntityTree.cpp:668
^ lockForWrite on Octree:_lock
EntityTreeRenderer::update libraries/entities-renderer/src/EntityTreeRenderer.cpp:258
Application::update interface/src/Application.cpp:2189
^ calls _physicsEngine.stepSimulation() before this
Application::idle interface/src/Application.cpp:1535
timer
2015-03-17 11:38:42 -07:00
Brad Davis
86881fb4d4
Merge branch 'master' into avatar
2015-03-17 09:44:10 -07:00
Brad Davis
d7b1852164
Creating eachMatchingNode and using it in avatar mixer
2015-03-16 15:25:44 -07:00
Stephen Birarda
a874f933c6
go to sandbox if location not present in settings
2015-03-16 11:00:04 -07:00
Seth Alves
019ea55d24
minimize diff
2015-03-15 08:21:57 -07:00
Seth Alves
50798398ff
merge from upstream
2015-03-13 18:04:55 -07:00
Stephen Birarda
641581a825
Merge pull request #4446 from huffman/marketplace-window
...
Marketplace window
2015-03-13 17:51:44 -07:00
samcake
8581e6b4a9
Merge pull request #4445 from Atlante45/resource_cache_bug
...
Fix the timeout crash
2015-03-13 17:29:23 -07:00
Ryan Huffman
f44ab9da8f
Update OAuthNetworkAccessManager to only send auth to metaverse
2015-03-13 17:29:01 -07:00
Atlante45
405301f861
Don't refresh if no lastModified tag in http request
2015-03-13 20:24:52 +01:00
Atlante45
691b078efc
Fix the timeout crash
2015-03-13 18:43:51 +01:00
Seth Alves
89b58e2681
trying to get loaded callback for model hooked up to PhysicsEngine
2015-03-13 09:11:15 -07:00
Stephen Birarda
0fe843db01
Revert "remove the launch activity from UserActivityLogger"
...
This reverts commit bc6ac9081f
.
2015-03-12 15:53:05 -07:00
Stephen Birarda
bc6ac9081f
remove the launch activity from UserActivityLogger
2015-03-12 15:08:05 -07:00
Stephen Birarda
0b55a0f123
remove the close event from UserActivityLogger
2015-03-12 15:06:44 -07:00
Stephen Birarda
df8864f9b0
Revert "make sure UserActivityLogger::close() waits for the pending log message to complete"
...
This reverts commit 3bd3f5a6d2
.
2015-03-12 15:04:51 -07:00
Stephen Birarda
09e2c0987e
use Dependency customDeleter for Application NL
2015-03-12 12:27:48 -07:00
Stephen Birarda
7bfc747748
Revert "Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList""
...
This reverts commit 9269b2a0b2
.
2015-03-12 12:13:32 -07:00
Stephen Birarda
9269b2a0b2
Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList"
2015-03-12 11:28:07 -07:00
Stephen Birarda
4da9186045
Merge pull request #4429 from birarda/master
...
NOT MERGEABLE: graceful cleanup on Application dtor for NodeList
2015-03-12 11:26:56 -07:00
Stephen Birarda
851d020390
remove QThread include required for debug
2015-03-11 17:21:49 -07:00
Stephen Birarda
7a8e94f1e5
remove extra debug information for node thread cleanup
2015-03-11 17:18:49 -07:00
Stephen Birarda
5d9a3811ca
more graceful cleanup for Application NodeList and DatagramProcessor
2015-03-11 17:14:20 -07:00
Stephen Birarda
9f754e40d0
move all silent node timers into LimitedNodeList
2015-03-11 16:59:06 -07:00
ZappoMan
e87e0a1e0b
some cleanup of dead code related to timers
2015-03-11 16:27:04 -07:00
ZappoMan
3bd3f5a6d2
make sure UserActivityLogger::close() waits for the pending log message to complete
2015-03-10 14:23:23 -07:00
Seth Alves
99300a5bc8
merge from master
2015-03-09 13:39:51 -07:00
Andrew Meadows
51d05cc43e
merge upstream/master into andrew/isentropic
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
2015-03-09 08:51:49 -07:00
Seth Alves
08c3fa6363
merge from upstream
2015-03-08 17:29:05 -07:00
Brad Hefta-Gaub
21cd7e36e0
Merge pull request #4381 from Atlante45/disk_cache
...
Disk cache tweaks
2015-03-08 11:40:40 -07:00
Jason
0fd9540bc3
Sync to upstream
...
Did "fetch upstream", "merge upstream/master", and resolved one
conflict.
2015-03-07 21:40:06 -08:00
Seth Alves
1a1863679d
bump entity-data message version number
2015-03-07 20:32:41 -08:00
Seth Alves
d713d5596f
bump entity-data message version number
2015-03-07 20:32:28 -08:00
Seth Alves
b8cdf1a318
quiet warning
2015-03-07 20:31:53 -08:00
Seth Alves
bb0f6b4d28
uninitialized variable
2015-03-07 11:27:52 -08:00
Seth Alves
6772847d0b
make it so I don't have to count
2015-03-07 07:52:39 -08:00
Andrew Meadows
f5352333f0
entities use radians per second for angular velocity
2015-03-06 16:42:06 -08:00
Jason
7a5669f14e
Interview project updates.
...
Tried to address all of Brad's notes, most of which were related to
matching the coding style for the project. Also used GeometryCache
instead of making direct calls to OpenGL to do drawing, took a different
approach to seeding rand(), updated the packet version, and fixed a bug
that I noticed in the setting of the dimensions for the particle effect
entity.
2015-03-06 15:52:21 -08:00
Atlante45
1b7fdf5d16
Improve disk cache usage
...
Now we always load from the disk cache if the file is in there.
Then we check the last modidied date from the network file
against the one in the cache.
If needed, we redownload.
2015-03-05 18:49:52 +01:00
Andrew Meadows
49eee89c19
merge upstream/master into andrew/isentropic
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-03-05 08:22:02 -08:00
Andrew Meadows
aede107058
change version of Entity update packet
2015-03-04 09:41:07 -08:00
Stephen Birarda
3005f74411
fix localhost port check to not kill user lookup
2015-03-03 23:11:02 -08:00
samcake
6b1f42df83
Merge pull request #4366 from ZappoMan/removeMetavoxels
...
remove metavoxels
2015-03-03 15:50:53 -08:00
Brad Hefta-Gaub
b88d52a310
Merge pull request #4363 from huffman/block-restricted-users
...
Add permission-checking to edit entities
2015-03-03 11:04:46 -08:00
Stephen Birarda
eb8e8e9a62
Merge pull request #4356 from sethalves/domain-server-http-port-in-shmem
...
pass more localhost ports via shared memory
2015-03-03 10:05:24 -08:00
ZappoMan
5c3c94a618
remove metavoxels
2015-03-02 17:21:43 -08:00
Ryan Huffman
98e0f235cc
Merge branch 'master' of git://github.com/highfidelity/hifi into block-restricted-users
2015-03-02 14:47:26 -08:00
Ryan Huffman
64cb517856
Add LimitedNodeList::canAdjustLocksChanged signal
2015-03-02 10:40:11 -08:00
Ryan Huffman
a7f84bcd30
Update entity server version number
2015-02-27 13:46:04 -08:00
Seth Alves
fb4f2fe89c
Merge branch 'master' of github.com:highfidelity/hifi into domain-server-http-port-in-shmem
2015-02-27 10:19:06 -08:00
Seth Alves
b8322556a6
address code-review comments
2015-02-26 17:34:24 -08:00
Seth Alves
f157c5c60d
Merge branch 'master' of github.com:highfidelity/hifi into domain-server-http-port-in-shmem
2015-02-26 09:13:49 -08:00
Seth Alves
128a38100f
Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare-x
2015-02-25 14:13:55 -08:00
Seth Alves
af341f0ee5
if hifi uri is localhost, extract domain-server port from shared memory
2015-02-25 12:11:32 -08:00
Seth Alves
1a4808857e
put local domain server's http port into shared memeory
2015-02-25 11:30:54 -08:00
Seth Alves
89ebb45c03
Revert "Merge pull request #4332 from birarda/master"
...
This reverts commit 3230857b0d
, reversing
changes made to 1b669af79d
.
2015-02-24 17:09:05 -08:00
Stephen Birarda
09ffcbb2e8
Revert "Merge pull request #4324 from sethalves/assignment-client-keep-a-spare"
...
This reverts commit 087e2babde
, reversing
changes made to 5202d2136a
.
2015-02-24 12:30:40 -08:00
Seth Alves
5f9af610c2
coding convention
2015-02-24 10:41:58 -08:00
Seth Alves
0b9b7f06cc
address various comments from code review
2015-02-23 11:12:19 -08:00
Seth Alves
70c96e496f
don't print ^a to qDebug for unassigned node type
2015-02-20 14:25:13 -08:00
Seth Alves
4bba4fc387
cleanups
2015-02-20 13:44:37 -08:00
Seth Alves
feb0e7ac31
AssignmentClientMonitor doesn't keep a list of its children. Instead it knows about active children due to their entries in the NodeList. Every few seconds, if 2 or more children are idle, the Monitor will ask one to exit
2015-02-20 13:26:59 -08:00
Seth Alves
4b3183d820
AssignmentClients accept an id on the command-line.
...
AssignmentClientMonitor now has a NodeList. It stores its local port
in shared memory, like the DomainServer does. As it spawns children,
it addes Nodes to the NodeList for each one. The children send status
updates to the Monitor. The Monitor will notice if there are no
spares and fork another child.
2015-02-19 17:44:06 -08:00
Stephen Birarda
b2e587dbbd
remove use of include_dependency_includes and use cmake
2015-02-18 14:12:05 -08:00
Stephen Birarda
71482f6ad7
include tbb as system include, use project as prefix
2015-02-18 13:58:20 -08:00
Stephen Birarda
0a01a6f566
add TBB as external_project, handle on OS X
2015-02-18 13:24:59 -08:00
Andrew Meadows
488492126e
fix typo in comment
2015-02-17 10:08:20 -08:00
Andrew Meadows
9895df6e7e
merge upstream/master into andrew/thermonuclear
2015-02-17 10:05:36 -08:00
Andrew Meadows
a7d6d6d561
return non-trivial value
2015-02-17 10:04:21 -08:00
Andrew Meadows
b69ab6c80d
verify NodeList has a linkedData before using it
2015-02-16 12:56:12 -08:00
Stephen Birarda
20b0dee80c
add a NULL initializer for the linked data create callback
2015-02-16 12:07:22 -08:00
Stephen Birarda
6c25205856
fix audio cleanup and close action in Application
2015-02-12 13:35:22 -08:00
Andrew Meadows
9f59addbc2
merge upstream/master into andrew/thermonuclear
2015-02-11 13:35:28 -08:00
Andrew Meadows
d9b57de649
merge upstream/master into andrew/thermonuclear
2015-02-11 08:56:34 -08:00
Andrew Meadows
b983f6fccf
bump entity packet version
2015-02-11 08:52:49 -08:00
Stephen Birarda
fe79d8902e
replace data with metaverse for highfidelity urls
2015-02-10 10:05:38 -08:00
Stephen Birarda
5f7c4278b8
handle custom domain-server port if it is present
2015-02-09 13:01:38 -08:00
Brad Hefta-Gaub
390d2be48f
Merge pull request #4189 from birarda/android
...
add the gvr-interface target for GearVR
2015-02-06 14:07:28 -08:00
Stephen Birarda
219e78425b
resolve conflicts on merge with upstream master
2015-02-06 09:49:46 -08:00
Seth Alves
60a4f48985
rather than a list of allowed editors, a list of allowed lockers/unlockers
2015-02-06 09:14:40 -08:00
Seth Alves
485785be7f
Allowed Editors setting in DomainServer; domain-list wire protocol includes "you can edit" boolean after uuid; entity server checks canEdit flag of node who sends edit requests; interface does not attempt to do edits if DomainServer sent false for "you can edit"
2015-02-05 15:37:14 -08:00
Stephen Birarda
93a3158153
Merge branch 'master' of https://github.com/highfidelity/hifi into android
2015-02-04 15:16:23 -08:00
ZappoMan
698fcd8116
fix crash on shutdown
2015-02-04 13:54:14 -08:00
ZappoMan
4061e14c2d
move static members of ResourceManager into DependencyManager
2015-02-04 13:24:37 -08:00
Philip Rosedale
fe3f01be7e
Merge pull request #4225 from ZappoMan/memleak
...
actually delete resources... even on windows
2015-02-04 11:57:54 -08:00
ZappoMan
ded035094a
actually delete resources... even on windows
2015-02-04 10:45:04 -08:00
Stephen Birarda
11f3161029
resolve conflicts on merge with upstream/master
2015-02-04 10:38:05 -08:00
Stephen Birarda
a2002d169f
fix for exception handled lookup in LimitedNodeList
2015-02-04 10:27:33 -08:00
Brad Hefta-Gaub
de58c4a007
Merge pull request #4217 from Atlante45/master
...
Fix for fps bug/field of view
2015-02-03 19:13:52 -08:00
Stephen Birarda
dc84c336ea
handle login failure, have AccountManager generate keypair
2015-02-03 16:09:06 -08:00
Stephen Birarda
64fda3253e
add a LoginDialog and pass credentials to AccountManager
2015-02-03 15:53:07 -08:00
David Rowe
d9e353e498
Merge branch 'master' into 20280
...
Conflicts:
libraries/networking/src/LimitedNodeList.h
2015-02-03 14:46:27 -08:00
Atlante45
27459ba861
Settings update
2015-02-03 12:27:30 -08:00
Atlante45
aacf61609f
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-02-03 10:53:44 -08:00
Seth Alves
d2c70936e3
coding standard, remove unneeded asserts
2015-02-03 10:51:35 -08:00
Stephen Birarda
e07ce23825
resolve conflicts on merge with upstream master
2015-02-03 10:25:17 -08:00
Stephen Birarda
bd0552618f
resolve conflicts on merge with upstream/master
2015-02-02 17:10:13 -08:00
Seth Alves
38162380ad
coding standard
2015-02-02 15:37:28 -08:00
Seth Alves
82b8595af8
coding standard
2015-02-02 15:34:08 -08:00
Seth Alves
e779a55e22
remove stray debugging line
2015-02-02 12:30:11 -08:00
Seth Alves
4377105410
formatting and cleanups
2015-02-02 12:13:54 -08:00
Seth Alves
779a0086c4
BandwidthRecorder no longer knows about channel displays. cause overlay pps and Mbps to only update once per second
2015-02-02 11:56:50 -08:00
Seth Alves
f1cca2ac92
move bandwidth stats display details out of recorder class into dialog class
2015-02-02 09:26:09 -08:00
Seth Alves
c0a219678c
use DependencyManager to keep track of BandwidthRecorder
2015-02-02 08:55:55 -08:00
Seth Alves
b85456b1e9
refactoring, cause BandwidthDialog to only update numbers once per second
2015-02-02 05:28:28 -08:00
Seth Alves
fc07ecf83d
use BandwidthRecorder rather than recompute Mbps and pps in Application
2015-01-31 20:40:18 -08:00
Seth Alves
bee895ba0a
capture network bandwidth stats from NodeList rather than various places
2015-01-31 20:02:04 -08:00
Atlante45
1cfd98b2d7
Name threads
2015-01-31 00:50:12 -08:00
David Rowe
3c7cdc16ce
Merge branch 'master' into 20280
...
Conflicts:
interface/src/Application.h
2015-01-30 18:44:14 -08:00
David Rowe
5474c0634e
Merge branch 'master' into 20277
...
Conflicts:
libraries/script-engine/src/ScriptEngine.cpp
2015-01-30 13:49:45 -08:00
Stephen Birarda
3af97b7f8d
show GVRInterface in full screen on Android
2015-01-30 10:16:48 -08:00
Atlante45
4ef87b9919
Merge branch 'master' of https://github.com/highfidelity/hifi into android
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/DatagramProcessor.cpp
interface/src/Menu.cpp
interface/src/ui/PreferencesDialog.cpp
interface/src/ui/Stats.cpp
libraries/audio-client/src/AudioClient.cpp
libraries/audio-client/src/AudioClient.h
2015-01-28 13:13:32 -08:00
Atlante45
98fc1836d8
Revert "Use QDickCache for every QNAM"
...
This reverts commit 2f39b93823
.
2015-01-27 18:09:22 -08:00
Andrew Meadows
026c39e010
Merge pull request #4131 from Atlante45/pull_out_menu_mess
...
Settings - Part I
2015-01-27 16:23:23 -08:00
Stephen Birarda
d420674edd
apply orientation change to listening position for audio
2015-01-27 14:50:02 -08:00
Stephen Birarda
54660dd1a2
resolve conflicts on merge with upstream master
2015-01-27 14:24:48 -08:00
David Rowe
44083dd343
Add user warning if domain has mismatched packet versions
2015-01-27 13:10:11 -08:00
Atlante45
71b565c33c
Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess
...
Conflicts:
interface/src/Application.cpp
2015-01-27 01:21:33 -08:00
David Rowe
812fbc58fb
Use custom User-Agent string
2015-01-23 19:13:29 -08:00
Andrzej Kapolka
23f9c799dd
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-01-23 18:20:14 -08:00
Andrzej Kapolka
bc0fa0ed24
Push granularity option down the line in preparation for selectively
...
increasing resolution.
2015-01-23 13:58:51 -08:00
ZappoMan
3c38a9eb53
add last simulated to the protocal
2015-01-23 13:32:38 -08:00
Stephen Birarda
5b81fa27fc
fix for DEFAULT_NODE_AUTH_URL
2015-01-23 13:05:02 -08:00
Stephen Birarda
e34fb66be7
Merge branch 'master' of https://github.com/highfidelity/hifi into android
2015-01-21 12:41:20 -08:00
Atlante45
2f39b93823
Use QDickCache for every QNAM
2015-01-21 11:12:11 -08:00
Atlante45
e1725d1eee
Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess
2015-01-20 17:41:08 -08:00
Stephen Birarda
466ea12d0f
turn off verbose HTTP request debug
2015-01-20 15:44:14 -08:00
Atlante45
8d37f5ae00
More setting handles
2015-01-20 15:35:22 -08:00
Stephen Birarda
94a9bf52fa
handle gvr-interface address lookup
2015-01-20 14:38:33 -08:00
Stephen Birarda
b4d6a44fc2
Merge branch 'master' of https://github.com/highfidelity/hifi into android
2015-01-20 11:15:54 -08:00
Stephen Birarda
cd23876afc
fix QHttpMultiPart destroy from AccountManager
2015-01-20 11:00:08 -08:00
Stephen Birarda
a66888939c
add some debugging for domain switch
2015-01-20 10:51:11 -08:00
Stephen Birarda
483d072709
handle override path from address bar
2015-01-20 10:47:57 -08:00
Atlante45
6a00dcbf0a
More switches to new Settings
2015-01-20 00:30:29 -08:00
Andrzej Kapolka
f8f9c25d38
Back to JPG compression for heightfield colors.
2015-01-19 14:59:28 -08:00
Atlante45
43597ea29d
Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess
...
Conflicts:
interface/src/Application.cpp
interface/src/Menu.cpp
2015-01-19 14:18:22 -08:00