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
07b9d73edf
bump protocol version
2015-04-17 11:20:35 -07:00
Seth Alves
1dd01cde00
expand svo to hold acceleration and id of current simulator node
2015-04-08 15:39:34 -07:00
Ryan Huffman
81cb1e98ba
Rename attribution to marketplaceID
2015-03-27 13:35:58 -07:00
ZappoMan
81bf7138a4
also attempt to clean up placement of PROP_ATTRIBUTION in the stream
2015-03-20 13:21:29 -07:00
Atlante45
8b5ade10b8
Initial add of the Attribution property
2015-03-18 18:57:05 +01: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
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
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
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
ZappoMan
5c3c94a618
remove metavoxels
2015-03-02 17:21:43 -08:00
Ryan Huffman
a7f84bcd30
Update entity server version number
2015-02-27 13:46:04 -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
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
Andrew Meadows
b983f6fccf
bump entity packet version
2015-02-11 08:52:49 -08:00
ZappoMan
3c38a9eb53
add last simulated to the protocal
2015-01-23 13:32:38 -08:00
ZappoMan
b940dcfdb3
more voxel-ectomy cleaning up some remaining references to voxels
2015-01-06 09:27:48 -08:00
ZappoMan
67595ea571
more voxelEctomy
2014-12-30 20:35:21 -08:00
Atlante45
b5abf44aa3
Comment packt type number every 5
2014-11-19 14:31:49 -08:00
Atlante45
46eebe9d40
Give noisy mutes their own packet type
2014-11-17 10:26:47 -08:00
Atlante45
f47620231e
Entities have user data
2014-11-13 16:16:20 -08:00
ZappoMan
8ad3ce7daf
bump packet version
2014-11-13 09:32:59 -08:00
Atlante45
6072fd4066
Added audio env packet type
2014-10-24 10:41:54 -07:00
ZappoMan
fc507850be
Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles
2014-10-16 20:36:28 -07:00
Stephen Birarda
c4b0dc9dcc
initial handling of username signature in domain-server
2014-10-14 16:03:35 -07:00
ZappoMan
4c85e9f581
removing particles
2014-10-13 14:10:57 -07:00
Stephen Birarda
b368e866fb
change oauth request packet type to username request
2014-10-08 14:26:23 -07:00
Stephen Birarda
63877b0756
handle domain connection via ICE from NodeList
2014-10-02 16:51:12 -07:00
Stephen Birarda
970ba2296a
initial response from ice server to nodes
2014-10-02 14:50:48 -07:00
Stephen Birarda
cca1c30207
build out more of the ice-server, make connect requests from NodeList
2014-10-02 13:39:58 -07:00
ZappoMan
b78b8ccbb0
first cut at replacing radius with dimensions
2014-09-09 13:33:05 -07:00
ZappoMan
f234dbf9a1
converting voxel files to new versioned format with buffer breaks
2014-09-05 10:51:08 -07:00
ZappoMan
3a5a38c342
support chunk sizes in SVO file, allows for chunk based reading of SVO file and fixes issues with entities spanning chunks in file
2014-08-19 10:53:45 -07:00
ZappoMan
3a8c5018ee
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
interface/src/Application.h
libraries/entities/src/EntityTreeElement.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelItem.h
libraries/models/src/ModelTree.cpp
libraries/models/src/ModelTree.h
libraries/models/src/ModelTreeElement.cpp
libraries/networking/src/PacketHeaders.h
libraries/octree/src/OctreeEditPacketSender.cpp
libraries/octree/src/OctreeEditPacketSender.h
2014-08-04 12:01:23 -07:00
Stephen Birarda
ce4336894a
actually send signed transaction from PaymentManager
2014-07-31 09:26:18 -07:00
ZappoMan
fe30d3807c
more renaming to entity from model where we're really talking about an entity
2014-07-01 17:07:16 -07:00
ZappoMan
865566414c
Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities
...
Conflicts:
interface/src/entities/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelTree.cpp
libraries/models/src/ModelTreeElement.cpp
libraries/models/src/ModelsScriptingInterface.cpp
tests/octree/CMakeLists.txt
tests/octree/src/ModelTests.cpp
2014-07-01 16:32:47 -07:00
ZappoMan
ccc9eabd33
first cut at renaming Models to Entities
2014-06-26 16:39:52 -07:00
ZappoMan
52a04c5270
support old format models.svo files
2014-06-25 19:28:53 -07:00
wangyix
591bfa14b9
added PacketTypeAudioStreamStats for j-buffer stats
...
...instead of packing that info into audio packets.
2014-06-25 11:38:56 -07:00
wangyix
5f62b43ba6
added edit nack types to non-verified list
2014-06-17 12:14:44 -07:00
wangyix
2b20720f51
added sendNackPackets() to OctreeInboundPacketProcessor
...
added rollover handling in _missingSequenceNumbers pruning; added
EditNack packet types; added getMyEditNackType() to OctreeServer
subclasses; added code to randomly skip edit packet sequence numbers for
testing in OctreeEditPacketSender
2014-06-16 09:57:05 -07:00
