Eric Levin
fe99941de3
fixed problem with particle entities not showing up on other clients by adding properties to decodeEditEntityPacket and encodeEntityEditPacket methods in EntityItemProperties.cpp
2015-05-21 19:35:27 -07:00
Seth Alves
52ce26d80d
Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux
2015-05-21 09:20:56 -07:00
Seth Alves
aa1d3eb82a
respond to code review
2015-05-20 17:31:57 -07:00
Stephen Birarda
7373bb6817
contain QSharedMemory for local server port to reader
2015-05-20 17:11:08 -07:00
Seth Alves
4a59dc24c5
split entity-add and entity-edit messages
2015-05-20 14:52:03 -07:00
Seth Alves
124ff68cee
make EntityItemID a subclass of QUuid
2015-05-20 14:22:08 -07:00
Seth Alves
b32e069f1d
bump protocol version
2015-05-19 14:45:01 -07:00
Stephen Birarda
2eb796eca6
resolve conflicts on merge with upstream/master
2015-05-18 10:25:24 -07:00
Stephen Birarda
5645fdc8b9
send user to token creation page
2015-05-14 15:21:33 -07:00
Andrew Meadows
d28c400cea
add restitution and friction Entity properties
2015-05-14 12:36:59 -07:00
Howard Stearns
ef187b390b
Server versioning.
2015-05-13 15:52:05 -07:00
Stephen Birarda
ca87d64dc7
fix for audio-mixer shutdown hang, removing spaces
2015-05-13 12:03:21 -07:00
Philip Rosedale
349886c146
Merge pull request #4847 from birarda/domain-paths
...
add initial support for local paths in domain
2015-05-12 17:09:13 -07:00
Seth Alves
db704874b9
bump protocol version for line entities
2015-05-12 16:02:45 -07:00
Stephen Birarda
332601b91c
final fixes for path query from DS
2015-05-12 14:34:14 -07:00
Stephen Birarda
7330e5255d
handle path query response from DS in NL/AM
2015-05-12 13:48:41 -07:00
Stephen Birarda
0562fee82a
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-paths
2015-05-12 12:39:05 -07:00
Stephen Birarda
e0ccc986b1
add a method to DS to respond to path query
2015-05-12 12:29:09 -07:00
Stephen Birarda
d8b17ffeb0
add packets for a path query and path response
2015-05-12 12:00:03 -07:00
Anthony Thibault
e1cbfcd901
Merge branch 'master' into ajt/particle-system-improvements
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-05-11 19:24:13 -07:00
Anthony Thibault
b3af515224
Particle entity improvements based on code review.
...
* Updated variable naming to match coding standards.
* Changed particle raw float arrays to vectors.
* Bug fix: changing maxParticles will no longer lead to memory corruption.
* Made particle ring buffer more explicit, added _particleTailIndex.
* Added getLivingParticleCount() private method.
* Moved integration and bounds code into private methods.
* Bug fix: high emit rates now properly integrate particles forward for the
remaing frame time, not the entire frame.
* Bug fix: new particles were not initiaized to origin.
* Added more particles to ajt-test.js.
* Bug fix: ajt-test.js script was not shutting down properly.
* Removed random seed, unless we have a psudo random number generator per
particle system instance, it's unlikely that this will preserve sync.
* Bumped packet version number.
2015-05-11 19:21:33 -07:00
Seth Alves
866a6fba9b
Merge pull request #4823 from birarda/master
...
repairs to AC stop and clean shutdown
2015-05-11 18:11:52 -07:00
Brad Davis
c12b74ebd0
Merge pull request #4816 from ctrlaltdavid/fix-pragma
...
Disable pragma that Windows doesn't know about
2015-05-11 12:30:54 -07:00
Stephen Birarda
8c6715e4fc
resolve conflicts on merge with upstream/master
2015-05-11 11:10:22 -07:00
Clément Brisset
5160eb5b94
Merge pull request #4819 from ZappoMan/moreZoneProperties
...
More Zone Atmosphere Work: add automatic day/hour calculation
2015-05-11 19:38:27 +02:00
Seth Alves
d86b22f7c8
Merge pull request #4824 from howard-stearns/cache-mod-time
...
Cache mod time
2015-05-11 10:38:23 -07:00
Clément Brisset
421ebeb3d7
Merge pull request #4795 from birarda/sequence-numbers
...
add sequence number support to NL, don't double send data from AvatarMixer
2015-05-11 19:23:33 +02:00
Howard Stearns
cdef09c9dd
Add comment (and force previous change to the right branch).
2015-05-11 10:12:03 -07:00
Howard Stearns
aed165809c
Use resource cache as long as it is no older than network resource.
...
This allows chache to be used when cdn provides different values for get-vs-head, or for cdn with different resource times in different requests of different sessions.
2015-05-11 10:01:49 -07:00
David Rowe
662f07a921
Better #if condition for clang
2015-05-11 09:31:12 -07:00
Seth Alves
e6023c59c1
if _reply is NULL, it doesn't make sense to worry about if it's finished loading or not.
2015-05-10 17:15:48 -07:00
ZappoMan
17c3c1a18d
add support for automatic hour/day calculations and backward compatibility on stage properties
2015-05-10 15:22:02 -07:00
David Rowe
70f7329a7e
Disable pragma that Windows doesn't know about
2015-05-09 17:59:10 -07:00
Stephen Birarda
897ed84cca
remove debug calls used to find ACApp stall
2015-05-08 14:56:49 -07:00
Stephen Birarda
0a295bada1
add debugging to catch AC kill hang
2015-05-08 14:32:16 -07:00
Stephen Birarda
99a9f2df90
don't allow an AC monitor to take over other local ACs
2015-05-08 14:02:19 -07:00
Stephen Birarda
be58347aec
consider assignment completed when worker thread is gone
2015-05-08 10:40:04 -07:00
Stephen Birarda
0f71e93c7f
ensure no new OST creation on OctreeServer shutdown
2015-05-08 10:12:14 -07:00
Stephen Birarda
a3ce02181e
fix ThreadedAssignment setFinished debug
2015-05-07 17:06:09 -07:00
Stephen Birarda
d75d204ff6
standardize cleanup of ThreadedAssignments
2015-05-07 17:03:43 -07:00
Stephen Birarda
305835ea79
Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers
2015-05-07 15:38:35 -07:00
Stephen Birarda
bfccf02912
use lamdbas for linkedDataCreateCallback
2015-05-07 15:37:02 -07:00
Stephen Birarda
e3acf861ff
fix for unverified datagram writes
2015-05-07 14:07:14 -07:00
Stephen Birarda
e540a6dbb3
fix packet sequence number unmarshal
2015-05-06 14:48:10 -07:00
Stephen Birarda
ff676958e8
fix hash replacement in PacketHeaders
2015-05-06 14:24:11 -07:00
Stephen Birarda
c5e189bbf2
use new PacketHeaders calls from LimitedNodeList
2015-05-06 11:52:03 -07:00
Stephen Birarda
ba9ed12415
store last sequence number sent with data
2015-05-06 11:35:34 -07:00
Stephen Birarda
e2986f5702
add get seq num, cleanup PacketHeaders methods
2015-05-06 11:34:58 -07:00
Stephen Birarda
b0c7af1714
store last seq for node/packet type combo
2015-05-06 10:41:41 -07:00
Stephen Birarda
5b1514a390
Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers
2015-05-06 10:12:17 -07:00
