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