Seth Alves
b8322556a6
address code-review comments
2015-02-26 17:34:24 -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
89ebb45c03
Revert "Merge pull request #4332 from birarda/master"
...
This reverts commit 3230857b0d1b669af79d
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 087e2babde5202d2136a
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
