Andrew Meadows
|
21fa294839
|
remove cruft
|
2016-05-05 18:28:27 -07:00 |
|
Andrew Meadows
|
d97bd2bc52
|
remove cruft
|
2016-05-05 18:28:27 -07:00 |
|
Andrew Meadows
|
60a72c6660
|
getViewFrustum() provides const pointer
|
2016-05-05 18:28:27 -07:00 |
|
Brad Hefta-Gaub
|
f9c4959578
|
remove some debugging, tweak formatting
|
2016-04-21 09:53:00 -07:00 |
|
Brad Hefta-Gaub
|
ddf5b0f316
|
some debugging
|
2016-04-21 10:32:22 -07:00 |
|
Brad Hefta-Gaub
|
248ac8d760
|
fix warning
|
2016-04-20 19:04:39 -07:00 |
|
Brad Hefta-Gaub
|
31f9d592e0
|
support for larger than 35 minute clock skew
|
2016-04-20 18:42:00 -07:00 |
|
Zach Pomerantz
|
ac30aed948
|
Hold onto octree child after creation
|
2016-04-04 17:52:41 -07:00 |
|
Atlante45
|
807698f0bb
|
Make svo loading use ResourceManager
|
2016-03-28 18:07:48 -07:00 |
|
Zach Pomerantz
|
40aabe7fae
|
Delete used QNetworkReply
|
2016-03-21 13:30:01 -07:00 |
|
Brad Hefta-Gaub
|
6d211dd4e5
|
first cut at fixing the scene not stable bug
|
2016-03-08 14:52:21 -08:00 |
|
Andrew Meadows
|
ef433c0e01
|
legacy support for EntityViewer.setKeyholeRadius()
|
2016-02-25 22:24:37 -08:00 |
|
Andrew Meadows
|
c3dfc13f88
|
namechange ViewFrustum::location to ::intersection
|
2016-02-25 18:09:35 -08:00 |
|
Andrew Meadows
|
f964df6c97
|
final names for ViewFrustum intersection tests
|
2016-02-25 18:09:35 -08:00 |
|
Andrew Meadows
|
5d1e283508
|
namechange TouchesKeyhole to IntersectsKeyhole
|
2016-02-25 18:09:35 -08:00 |
|
Andrew Meadows
|
918880b058
|
use correct ViewFrustum overlap tests
|
2016-02-25 18:09:35 -08:00 |
|
Andrew Meadows
|
2591c5ee3e
|
cleanup names that use "keyhole"
|
2016-02-25 18:09:35 -08:00 |
|
Andrew Meadows
|
9558258f64
|
use cubeInKeyhole() where appropriate
|
2016-02-25 18:09:35 -08:00 |
|
Andrew Meadows
|
9409339230
|
add ViewFrustum::cubeInKeyhole()
|
2016-02-25 18:09:35 -08:00 |
|
Andrew Meadows
|
dfdf375853
|
use shapeInFrustum() names again
but at the same time make the code more redable
also: add some more efficient shape-touches-view methods
and cleanup some whitespace
|
2016-02-25 18:09:35 -08:00 |
|
Andrew Meadows
|
9c927ea36b
|
ViewFrustum method renames and whitespace cleanup
fooInFrustum() --> computeFooViewLocation()
except pointInFrustum() --> computeFrustumLocation()
|
2016-02-25 09:11:28 -08:00 |
|
samcake
|
9bfeb4a1d5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-02-12 11:31:47 -08:00 |
|
samcake
|
2d33bb83e1
|
Remove a dead comment
|
2016-02-12 10:30:44 -08:00 |
|
Brad Hefta-Gaub
|
477dfe1b10
|
use std::unordered_map<> instead of std::unordered_set<>
|
2016-02-11 20:42:42 -08:00 |
|
Brad Hefta-Gaub
|
26ab1bdac4
|
move back to unordered_set so that OctreeElementBag will handle uniqueness
|
2016-02-11 14:50:18 -08:00 |
|
samcake
|
ad3f3a6dcf
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-02-08 10:30:54 -08:00 |
|
samcake
|
a999e046b5
|
Showing the LOD angle
|
2016-02-04 17:59:35 -08:00 |
|
Andrew Meadows
|
af57f5d120
|
add simple and fast DirtyOctreeElementOperator
|
2016-02-04 13:26:07 -08:00 |
|
samcake
|
18d8a2fb42
|
Implementing the octree selection from frustum
|
2016-02-01 13:47:38 -08:00 |
|
Seth Alves
|
e365d93ed9
|
don't save entites with invalid parentIDs (or with IDs that indicates an avatar) to the persist file
|
2016-01-18 16:50:26 -08:00 |
|
samcake
|
29945bba92
|
Merge pull request #6837 from zzmp/feat/render-shadow
Add RenderShadowTask
|
2016-01-18 15:45:51 -08:00 |
|
Brad Hefta-Gaub
|
d10e1cc39d
|
CR feedback, dead code cleanup
|
2016-01-18 12:09:21 -08:00 |
|
Brad Hefta-Gaub
|
88af387214
|
cleanup
|
2016-01-18 10:10:24 -08:00 |
|
Brad Hefta-Gaub
|
2774df38bc
|
check for entity size before including it for LOD
|
2016-01-18 09:06:57 -08:00 |
|
Zach Pomerantz
|
986af50b71
|
Remove unneccessary const
|
2016-01-15 10:50:42 -08:00 |
|
Zach Pomerantz
|
e2158e48a1
|
Declare Corners explicitly
|
2016-01-14 18:03:58 -08:00 |
|
Zach Pomerantz
|
0776ae7e72
|
Add LightStage for rendering lights
|
2016-01-14 12:49:42 -08:00 |
|
Zach Pomerantz
|
ed5c53f23c
|
Add getCorners to ViewFrustum
|
2016-01-14 01:29:49 -08:00 |
|
Zach Pomerantz
|
293e432fe9
|
Fix setter named getFocalLength
|
2016-01-08 20:14:44 -08:00 |
|
Brad Hefta-Gaub
|
edc132efce
|
fix warning
|
2016-01-06 12:53:57 -08:00 |
|
Seth Alves
|
942e77166e
|
merge from upstream
|
2016-01-05 11:11:19 -08:00 |
|
Seth Alves
|
2d246a840f
|
better packing for qvector of bools
|
2016-01-04 18:14:29 -08:00 |
|
Seth Alves
|
0b9f92e50f
|
fix quat (un)packing
|
2016-01-04 18:01:48 -08:00 |
|
Seth Alves
|
69839b4b16
|
better packing of qvector of quats
|
2016-01-04 17:50:25 -08:00 |
|
Seth Alves
|
83f60d6e97
|
make entity properties for model-entity joint-states
|
2015-12-23 15:43:50 -08:00 |
|
Seth Alves
|
5e4a165b4d
|
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
|
2015-12-22 11:23:09 -08:00 |
|
Brad Davis
|
6ef77bc46a
|
Support the marketplace in QML
|
2015-12-21 11:34:03 -08:00 |
|
Seth Alves
|
008065ba38
|
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
|
2015-12-14 09:15:56 -08:00 |
|
Seth Alves
|
076e2b73a1
|
make AABox encoder and decode safer
|
2015-12-13 06:44:06 -08:00 |
|
Seth Alves
|
1492fd6090
|
merge from upstream
|
2015-12-12 12:37:57 -08:00 |
|
Seth Alves
|
24fb43e8cd
|
first steps toward a puffed-out query-box for child entities
|
2015-12-12 12:33:14 -08:00 |
|
Atlante45
|
d3224bfde3
|
More warning fixes
|
2015-12-11 16:03:44 -08:00 |
|
Atlante45
|
ce51350b65
|
Fix warnings on windows 64bit
|
2015-12-11 15:42:15 -08:00 |
|
Atlante45
|
f72eb679c6
|
More warning fixes
|
2015-12-11 15:04:33 -08:00 |
|
Atlante45
|
a07d7494f0
|
More OS X warning cleanup
|
2015-12-11 14:20:36 -08:00 |
|
Ryan Huffman
|
87e30a2157
|
Remove EntityQuery version and just append new data to end
|
2015-12-11 09:03:39 -08:00 |
|
Ryan Huffman
|
b5e3dce376
|
Add keyhole radius to OctreeQuery
|
2015-12-10 14:34:28 -08:00 |
|
Clément Brisset
|
42365acef5
|
Merge pull request #6561 from ZappoMan/cruftRemovalRedux
More Cruft Removal
|
2015-12-07 11:39:54 -08:00 |
|
Brad Hefta-Gaub
|
1eb5b21e48
|
fix warning
|
2015-12-04 15:17:16 -08:00 |
|
Brad Hefta-Gaub
|
be4bc7b2ca
|
going a different way, same packet version, but always send feature requests to old servers
|
2015-12-04 14:55:16 -08:00 |
|
Brad Hefta-Gaub
|
46946212cf
|
remove WANT_LOW_RES_MOVING_BIT from OctreeQuery always true
|
2015-12-04 14:24:31 -08:00 |
|
Brad Hefta-Gaub
|
f44a9daa21
|
remove WANT_DELTA from OctreeQuery
|
2015-12-04 14:04:57 -08:00 |
|
Brad Hefta-Gaub
|
0d9d5375c7
|
remove optional WANT_COMPRESSION from OctreeQuery
|
2015-12-04 13:29:18 -08:00 |
|
Ryan Huffman
|
89c412c324
|
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
|
2015-12-04 11:38:28 -08:00 |
|
Brad Hefta-Gaub
|
18e62290f3
|
fix warnings
|
2015-12-04 08:37:46 -08:00 |
|
Brad Hefta-Gaub
|
f472b515c3
|
remove wantsColor support since its always true and required for entities
|
2015-12-03 21:03:32 -08:00 |
|
Brad Hefta-Gaub
|
81fb4476bc
|
remove coverage map and occulusion culling, since it was always disabled
|
2015-12-03 20:29:23 -08:00 |
|
Brad Hefta-Gaub
|
5a75a17174
|
Revert "Cruft removal"
|
2015-12-03 17:40:41 -08:00 |
|
Brad Hefta-Gaub
|
528b8e5d3f
|
fix warnings
|
2015-12-03 16:45:01 -08:00 |
|
Brad Hefta-Gaub
|
1a5bc5d111
|
removing optional compression
|
2015-12-03 12:40:24 -08:00 |
|
Brad Hefta-Gaub
|
849a8707d2
|
remove wantsColor support since its always true and required for entities
|
2015-12-03 11:11:15 -08:00 |
|
Brad Hefta-Gaub
|
0c05ffe9ce
|
remove coverage map and occulusion culling, since it was always disabled
|
2015-12-03 10:20:04 -08:00 |
|
Brad Hefta-Gaub
|
1e51a90204
|
add edit times and entity ids to the viewer stats
|
2015-12-02 14:43:00 -08:00 |
|
Brad Hefta-Gaub
|
08ba535c38
|
add some basic send tracking
|
2015-12-02 13:43:05 -08:00 |
|
Brad Hefta-Gaub
|
75a57c3cb8
|
Merge pull request #6500 from Atlante45/octree_crash
Octree crash fix
|
2015-12-02 09:59:56 -08:00 |
|
Stephen Birarda
|
7dbf29821a
|
don't persist the octree if it never loaded
|
2015-12-01 10:00:25 -08:00 |
|
Atlante45
|
4aaa9ca02f
|
Make OctreeElementBag safer to use
|
2015-11-30 15:23:49 -08:00 |
|
Atlante45
|
5019f79947
|
Fix header name
|
2015-11-30 11:48:34 -08:00 |
|
Atlante45
|
a364e85e1d
|
Remove DeleteHooks
|
2015-11-25 17:21:56 -08:00 |
|
Atlante45
|
cd2e610e17
|
Remove OctreeElement's UpdateHooks
|
2015-11-25 15:35:15 -08:00 |
|
Ryan Huffman
|
dac491ef41
|
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
|
2015-11-24 09:59:22 -08:00 |
|
Brad Hefta-Gaub
|
8ba6dfe721
|
add deprication warning about binary SVOs
|
2015-11-20 09:29:36 -08:00 |
|
Ryan Huffman
|
07d21514c5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
|
2015-11-19 10:47:37 -08:00 |
|
Seth Alves
|
98073de0b8
|
Merge pull request #6426 from ZappoMan/entitiesFileDownload
implement support to download the persist file from entity server status page
|
2015-11-19 09:47:10 -08:00 |
|
Ryan Huffman
|
8adf456b91
|
Update range of LOD to go up to 20:2
|
2015-11-19 08:52:57 -08:00 |
|
Brad Hefta-Gaub
|
456da661ff
|
implement support to download the persist file from entity server status page
|
2015-11-18 17:30:07 -08:00 |
|
Ryan Huffman
|
2a416ebc61
|
Merge branch 'master' of https://github.com/highfidelity/hifi into received-message
|
2015-11-18 16:52:23 -08:00 |
|
Seth Alves
|
36af315e5d
|
Merge pull request #6383 from birarda/goodbye-packet
send a hopeful disconnect packet from ACs and Interface
|
2015-11-16 11:28:48 -08:00 |
|
Stephen Birarda
|
0a64242160
|
cleanup string grabbing for PacketType enum
|
2015-11-12 14:43:25 -08:00 |
|
Brad Hefta-Gaub
|
da651ac475
|
fix mac compiler error
|
2015-11-12 13:47:27 -08:00 |
|
Brad Hefta-Gaub
|
8bfb368a61
|
fix mac compiler error
|
2015-11-12 13:32:43 -08:00 |
|
Brad Hefta-Gaub
|
33110eda30
|
fix mac compiler error
|
2015-11-12 13:25:50 -08:00 |
|
Brad Hefta-Gaub
|
14a6e1fb6b
|
fix mac compiler error
|
2015-11-12 13:24:25 -08:00 |
|
Brad Hefta-Gaub
|
66a2b38f50
|
switch various status to use thread safe atomics
|
2015-11-12 13:09:51 -08:00 |
|
Brad Hefta-Gaub
|
ea917f85f4
|
added ability to set keyhole radius on EntityViewer
|
2015-10-22 12:56:45 -07:00 |
|
Brad Hefta-Gaub
|
954afe45d3
|
Merge pull request #6112 from ericrius1/rayPickAdditions
Moved whitelist and raypicking code out of octree, fixed small bug with polylines
|
2015-10-21 09:08:56 -07:00 |
|
Andrew Meadows
|
7fa069cf30
|
fix line endings grumble gruble
|
2015-10-20 09:38:25 -07:00 |
|
ericrius1
|
dcb37ccd73
|
Removed whitelist and raypicking code from octree, fixed a small bug with polylines
|
2015-10-19 13:14:19 -07:00 |
|
ericrius1
|
8c229d88a8
|
moving whitelist code out of octree
|
2015-10-19 11:59:44 -07:00 |
|
Ryan Huffman
|
9ddcfdf94d
|
Cleanup PacketReceier and ReceivedMessage
|
2015-10-16 09:21:10 -07:00 |
|
Ryan Huffman
|
7682ab00e3
|
Add ReceivedMessage and receive progress
|
2015-10-15 14:09:53 -07:00 |
|
ericrius1
|
3b59bffb79
|
Deleting only strokes from the whiteboard where the erase button was clicked on
|
2015-10-15 11:38:18 -07:00 |
|
ericrius1
|
cfca0fe8c0
|
Adding a color indicator to whiteboard
|
2015-10-14 15:58:18 -07:00 |
|
ericrius1
|
8d39f9c760
|
Syntax fixes
|
2015-10-12 15:02:03 -07:00 |
|
ericrius1
|
d01dda9c81
|
Adding in functionality to include only specified Ids in ray picking
|
2015-10-12 14:40:11 -07:00 |
|
Atlante45
|
14a1860670
|
Do not change keyhole radius
|
2015-10-07 14:55:18 -07:00 |
|
Stephen Birarda
|
9bc95a0fc1
|
fix override warnings in assignment-client
|
2015-10-05 15:17:10 -07:00 |
|
Stephen Birarda
|
82ac0b1a27
|
use a mutable mutex to keep const-ness
|
2015-09-30 14:23:18 -04:00 |
|
Stephen Birarda
|
f7e7b07441
|
fix constness of SentPacketHistory in OEPS
|
2015-09-30 14:15:22 -04:00 |
|
Brad Hefta-Gaub
|
430cbcca7e
|
first cut at adding surface normals to ray intersection
|
2015-09-27 21:57:50 -07:00 |
|
Brad Hefta-Gaub
|
020fb25ace
|
CR feedback
|
2015-09-18 14:24:01 -07:00 |
|
Stephen Birarda
|
5df7ce7424
|
fix for missing jurisdiction listener in Agent
|
2015-09-16 11:43:54 -07:00 |
|
Brad Davis
|
9b81842850
|
Merge branch 'master' into homer
Conflicts:
assignment-client/src/octree/OctreeSendThread.cpp
interface/src/Application.cpp
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityTree.cpp
libraries/entities/src/EntityTreeElement.cpp
libraries/entities/src/EntityTreeElement.h
libraries/entities/src/EntityTreeHeadlessViewer.cpp
libraries/entities/src/RecurseOctreeToMapOperator.cpp
libraries/octree/src/Octree.h
libraries/physics/src/EntityMotionState.cpp
|
2015-09-11 16:31:18 -07:00 |
|
Brad Davis
|
e458eb7ae9
|
Merge pull request #5734 from sethalves/octree-shared-pointers
octree uses shared pointers
|
2015-09-11 16:00:04 -07:00 |
|
Brad Davis
|
aa989c3687
|
Fixing some entity race condition crashes
|
2015-09-10 20:53:17 -07:00 |
|
Stephen Birarda
|
f58804a30e
|
repair to packing of query data from headless viewer
|
2015-09-10 14:35:44 -07:00 |
|
Seth Alves
|
9c4fdfd653
|
merge from upstream
|
2015-09-08 18:01:07 -07:00 |
|
Seth Alves
|
31fcd55d47
|
octree uses shared pointers
|
2015-09-08 11:59:48 -07:00 |
|
Stephen Birarda
|
80cf7b6c76
|
resolve conflicts on merge with upstream/master
|
2015-08-27 14:50:04 -07:00 |
|
Andrew Meadows
|
0835b79e33
|
Merge pull request #5646 from birarda/ds-cleanup
de-bloat the domain-server by adding a gatekeeper
|
2015-08-26 15:42:43 -07:00 |
|
Atlante45
|
179ee73e26
|
Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol
|
2015-08-26 16:50:33 +02:00 |
|
Brad Davis
|
d311e4f2ea
|
Fixing problems reported by static analysis tool
|
2015-08-25 19:18:55 -07:00 |
|
Brad Davis
|
380b0cb23c
|
Removing tabs from our javascript and C++
|
2015-08-24 15:26:46 -07:00 |
|
Stephen Birarda
|
e8772277de
|
de-bloat the domain-server by adding a DomainGatekeeper
|
2015-08-24 14:19:33 -07:00 |
|
ZappoMan
|
92ae3e758c
|
restore DEFAULT_FAR_CLIP to 16km
|
2015-08-19 12:28:07 -07:00 |
|
Stephen Birarda
|
fd43c48eac
|
resolve conflicts on merge with birarda/protocol
|
2015-08-18 11:48:36 -07:00 |
|
Stephen Birarda
|
0f77ab8611
|
resolve conflicts on merge with upstream/master
|
2015-08-18 11:45:55 -07:00 |
|
Stephen Birarda
|
abf07dc06d
|
move hasher for UUID to UUID.h
|
2015-08-17 16:39:52 -07:00 |
|
ZappoMan
|
44fcf71f07
|
change domain to be 32k and still have origin centered at 0
|
2015-08-14 15:26:49 -07:00 |
|
ZappoMan
|
4fe8f49d4c
|
move origin to center of domain
|
2015-08-11 23:47:40 -07:00 |
|
ericrius1
|
205a2d53b6
|
no longer returning early on NaN
|
2015-08-07 16:15:51 -07:00 |
|
ericrius1
|
3910cb0d69
|
Merge branch 'master' into polyLineInProgress
|
2015-08-07 10:12:02 -07:00 |
|
Atlante45
|
3dc8bd47ae
|
Fix warning and remove unused headers
|
2015-08-05 16:46:44 -07:00 |
|
Stephen Birarda
|
0fe3213d38
|
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
|
2015-08-05 11:16:34 -07:00 |
|
Stephen Birarda
|
052978898e
|
resolve conflicts on merge with upstream master
|
2015-08-05 11:16:20 -07:00 |
|
Andrew Meadows
|
5be8583b7d
|
Merge pull request #5494 from sethalves/gzip-json-entity-persist-files
gzip json entity persist files
|
2015-08-05 10:56:03 -07:00 |
|
Atlante45
|
dfaa16d15c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
|
2015-08-05 10:39:02 -07:00 |
|
Seth Alves
|
fcec6cb1f0
|
Merge pull request #5464 from nnesse/master
Remove redundant code in getOrCreateChildElementAt()
|
2015-08-04 15:54:14 -07:00 |
|
Seth Alves
|
5369f4c5eb
|
adjust comments
|
2015-08-04 08:25:33 -07:00 |
|
Seth Alves
|
adcd91e3ff
|
Added an option to domain-server settings to persist entities as gzipped json. With this setting enabled, persist files take much less space on disk than with the other two options.
|
2015-08-04 07:23:24 -07:00 |
|
ericrius1
|
47bc8f50ab
|
cleaning
|
2015-08-03 08:45:14 -07:00 |
|
Niels Nesse
|
85f06639a5
|
Remove redundant code in getOrCreateChildElementAt()
|
2015-07-30 12:50:57 -07:00 |
|
Andrew Meadows
|
0a5ada3c09
|
remove legacy shapes
|
2015-07-29 09:02:24 -07:00 |
|
Atlante45
|
8b71462dc1
|
Remove unnecessary headers
|
2015-07-28 10:36:00 -07:00 |
|
Stephen Birarda
|
dce63c84a3
|
read and write uin8_t PacketType into SVO as int
|
2015-07-24 16:33:03 -07:00 |
|
Stephen Birarda
|
2cf4a1f3e1
|
move MAX_PACKET_HEADER_SIZE to NLPacket
|
2015-07-24 16:29:44 -07:00 |
|
Stephen Birarda
|
df47f1dd0b
|
add a BasePacket class for headerless packets
|
2015-07-23 15:20:37 -07:00 |
|
Stephen Birarda
|
9e7fb9ae16
|
shuffle Packet headers, use static enum for PacketType
|
2015-07-23 13:56:47 -07:00 |
|
ericrius1
|
a44e5f949c
|
Merge branch 'master' into polyLineInProgress
|
2015-07-17 15:01:40 -07:00 |
|
Stephen Birarda
|
8a2bb55231
|
add back a removed comment from jurisdiction map
|
2015-07-17 14:00:02 -07:00 |
|
Atlante45
|
d1c66751c4
|
emove unused method
|
2015-07-16 16:08:58 -07:00 |
|
Stephen Birarda
|
1bb3e1789a
|
remove more PacketHeader methods
|
2015-07-16 16:05:27 -07:00 |
|
Stephen Birarda
|
61653bd88d
|
remove old PacketHeader methods
|
2015-07-16 16:04:12 -07:00 |
|
Atlante45
|
b4121eb464
|
Remove unnecessary move
|
2015-07-16 13:14:17 -07:00 |
|
Stephen Birarda
|
05dd49a4c5
|
seek back after track of octree packet
|
2015-07-16 13:02:20 -07:00 |
|
Stephen Birarda
|
60ae02e4e9
|
some formatting changes in entities
|
2015-07-16 12:38:39 -07:00 |
|
Stephen Birarda
|
8921f59e23
|
fix entity packet send from interface client
|
2015-07-16 12:09:35 -07:00 |
|
Stephen Birarda
|
336967e580
|
fix edit packet sending from client
|
2015-07-16 11:17:49 -07:00 |
|
Stephen Birarda
|
039ef0750c
|
set jurisdiction listener object name for thread identification
|
2015-07-15 18:52:59 -07:00 |
|
Stephen Birarda
|
05dde9d8f5
|
resolve conflicts on merge with upstream/master
|
2015-07-15 16:18:47 -07:00 |
|
Stephen Birarda
|
b115bd1a55
|
resolve conflicts on merge with huffman/receive_packets
|
2015-07-15 10:52:07 -07:00 |
|
Ryan Huffman
|
44c99ef89a
|
Replace bytesAvailable with bytesLefToRead
|
2015-07-15 10:44:51 -07:00 |
|
Stephen Birarda
|
e127c5c06d
|
rename Packet methods for clarity
|
2015-07-15 10:40:40 -07:00 |
|
Stephen Birarda
|
0327a8d477
|
fix bytesAvailable, don't double seek in Packet
|
2015-07-14 20:47:16 -07:00 |
|
ZappoMan
|
bc251de43c
|
delete dead code
|
2015-07-14 16:49:22 -07:00 |
|
Atlante45
|
fbb6a94579
|
Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol
|
2015-07-14 16:36:28 -07:00 |
|
Ryan Huffman
|
bd345cdccd
|
Merge branch 'atp' of github.com:birarda/hifi into receive_packets
Conflicts:
libraries/networking/src/PacketReceiver.cpp
|
2015-07-14 15:59:16 -07:00 |
|
Stephen Birarda
|
ca47165d72
|
compare bytesAvailable to 0
|
2015-07-14 15:42:28 -07:00 |
|
Ryan Huffman
|
47f3aad437
|
Update use of sendingNode->getUUID() to use packet->getSourceID instead
|
2015-07-14 15:23:41 -07:00 |
|
Ryan Huffman
|
56b5c9acff
|
Merge branch 'atp' of github.com:birarda/hifi into receive_packets
Conflicts:
assignment-client/src/entities/EntityServer.cpp
domain-server/src/DomainServer.cpp
|
2015-07-14 14:53:45 -07:00 |
|
Stephen Birarda
|
fbd287472d
|
make NodeData parseData take only packet
|
2015-07-14 14:09:00 -07:00 |
|
Ryan Huffman
|
0edc909818
|
Merge branch 'protocol' of github.com:birarda/hifi into receive_packets
Conflicts:
assignment-client/src/audio/AudioMixer.cpp
interface/src/Application.cpp
libraries/networking/src/Packet.cpp
|
2015-07-14 10:21:31 -07:00 |
|
Stephen Birarda
|
9d4f9aa21e
|
final fixes to get ACs building again
|
2015-07-13 15:38:45 -07:00 |
|
Atlante45
|
c80df94b06
|
Update includes for moved files
|
2015-07-13 15:28:55 -07:00 |
|
Stephen Birarda
|
f06636d45e
|
repairs for other ThreadedAssignment subclasses
|
2015-07-13 15:16:55 -07:00 |
|
Stephen Birarda
|
ede39515d8
|
update parseData for new network API
|
2015-07-13 14:26:10 -07:00 |
|
Stephen Birarda
|
d990420565
|
repairs to octree packet receiving in interface
|
2015-07-13 13:10:57 -07:00 |
|
Atlante45
|
957e6394a9
|
sendPacket function take Node& not a pointer
|
2015-07-13 11:57:20 -07:00 |
|
ericrius1
|
0ce6737b34
|
merged and normals flipping
|
2015-07-13 09:43:15 -07:00 |
|
Stephen Birarda
|
3d62162812
|
cleanup octree networking code to use new API
|
2015-07-13 09:40:26 -07:00 |
|
Atlante45
|
c77310019d
|
Some .get() cleanup
|
2015-07-09 14:03:32 -07:00 |
|
Stephen Birarda
|
c903d284bb
|
fix for arguments that are now const NLPacket&
|
2015-07-09 11:32:00 -07:00 |
|
Atlante45
|
d4e01742e5
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-08 18:40:18 -07:00 |
|
Atlante45
|
e2718d5c94
|
Merge branch 'protocol' of https://github.com/birarda/hifi into protocol
|
2015-07-08 18:26:36 -07:00 |
|
Stephen Birarda
|
f37d3c9bd6
|
fix primitive type writing in OctreeSceneStats
|
2015-07-08 16:44:45 -07:00 |
|
Stephen Birarda
|
480cb80f4f
|
fix primitive writing in OctreeEditPacketSender
|
2015-07-08 16:42:43 -07:00 |
|
Stephen Birarda
|
c162d53908
|
fix writes in JurisdictionMap
|
2015-07-08 16:38:17 -07:00 |
|
Stephen Birarda
|
9f4e4f1948
|
fix templated write/read and various write calls
|
2015-07-08 16:36:09 -07:00 |
|
Stephen Birarda
|
ecb6309932
|
fix HEADER_LENGTH in Octree
|
2015-07-08 15:02:57 -07:00 |
|
Stephen Birarda
|
07c8bb24b4
|
fix query packet send in OctreeHeadlessViewer
|
2015-07-08 15:02:02 -07:00 |
|
Stephen Birarda
|
1597491894
|
add back missing underscore
|
2015-07-08 14:58:27 -07:00 |
|
Stephen Birarda
|
3dbe7f7827
|
fix writes for templated API in OctreeSceneStats
|
2015-07-08 14:57:45 -07:00 |
|
Stephen Birarda
|
9fb43b71d4
|
use std::unordered_maps in OctreeEditPacketSender
|
2015-07-08 14:52:14 -07:00 |
|
Stephen Birarda
|
822dd46228
|
use getType instead of readType in OctreeEditPacketSender
|
2015-07-08 14:32:20 -07:00 |
|
Stephen Birarda
|
948e8f7163
|
actually return packet from initialize packet
|
2015-07-08 14:27:16 -07:00 |
|
Stephen Birarda
|
b983f662ee
|
use templated write for sequence number in OctreeEditPacketSender
|
2015-07-08 14:24:32 -07:00 |
|
Stephen Birarda
|
d8b03189e3
|
fixes for writes with new API
|
2015-07-08 14:21:26 -07:00 |
|
Stephen Birarda
|
1081e627fa
|
Merge remote-tracking branch 'clement/protocol' into atp
|
2015-07-08 14:12:50 -07:00 |
|
Stephen Birarda
|
fa71c781f4
|
cleanup edit message memory management in octree packet sending
|
2015-07-08 14:12:04 -07:00 |
|
Atlante45
|
7329ad6334
|
Templated read/write in Packet
|
2015-07-08 13:45:12 -07:00 |
|