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 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
