Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 15:12:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
14531 commits 25 branches 0 tags 1.1 GiB
Commit graph

328 commits

Author SHA1 Message Date
ZappoMan
ec0c350f60 Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 
Conflicts:
	interface/src/Application.cpp
	interface/src/DatagramProcessor.cpp
	libraries/script-engine/src/ScriptEngine.cpp
 2014-07-03 14:20:40 -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
wangyix
fd051310da prune missing set before constructing nack packets; 
make MAX_REASONALBE_SEQUENCE_GAP global and sentPacketHistory to use
that value as the default history size
 2014-07-01 12:01:51 -07:00
wangyix
f2dfa6b978 fixed warnings 2014-06-30 16:10:58 -07:00
wangyix
0ae58bd7f9 added senderUUID arg to seq stats 2014-06-27 15:39:11 -07:00
wangyix
2ec04fb756 replaced old seqnum tracking code with SequenceNumberStats 2014-06-25 17:20:57 -07:00
ZappoMan
a019b70e58 Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel 
Conflicts:
	tests/octree/CMakeLists.txt
	tests/octree/src/ModelTests.cpp
	tests/octree/src/main.cpp
 2014-06-24 15:59:17 -07:00
Brad Hefta-Gaub
6d77d438ab Merge pull request #3057 from AndrewMeadows/ragdoll 
Ragdoll Part3: avatar shapes self collide (but don't yet affect the joint positions of MyAvatar)
 2014-06-24 15:47:18 -07:00
ZappoMan
2d1d4de174 hacking more on the modelID to element map 2014-06-19 16:47:33 -07:00
ZappoMan
fb34d13305 more work on optimized storeModel() 2014-06-19 14:30:44 -07:00
Andrew Meadows
c98631f820 merge upstream/master into andrew/ragdoll 2014-06-18 17:23:24 -07:00
wangyix
761a154a93 Merge remote-tracking branch 'upstream/master' 2014-06-18 15:59:45 -07:00
ZappoMan
28c7c24399 Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel 
Conflicts:
	libraries/octree/src/AABox.h
 2014-06-18 15:27:36 -07:00
Brad Hefta-Gaub
c7b1b504b4 Merge pull request #3047 from birarda/master 
allow a payload to define a zone of unattenuated audio
 2014-06-18 15:25:41 -07:00
wangyix
827b28ceda Merge remote-tracking branch 'origin/master' 
Conflicts:
	assignment-client/src/octree/OctreeInboundPacketProcessor.cpp
 2014-06-18 15:21:19 -07:00
ZappoMan
c54bdb3e8d Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel 2014-06-18 15:20:08 -07:00
Brad Hefta-Gaub
f2b2784fa9 Merge pull request #3045 from wangyix/edit_nack_pull 
Changed octree data NACK handling to repeatedly NACK missing seq numbers, like edit NACKs
 2014-06-18 15:02:40 -07:00
wangyix
f76b4dc1ab made getMissingSequenceNumbers() inline 2014-06-18 13:39:49 -07:00
wangyix
29723d0ef3 changed octree data nacks to repeatedly nack missing seq nums 2014-06-18 13:36:54 -07:00
Stephen Birarda
5878b4af59 setup listener unattenuated zones for source ring buffers 2014-06-18 12:50:16 -07:00
Clément Brisset
7597191081 Merge pull request #3042 from ZappoMan/editModelFeatures 
add support for changing the model URL of a model
 2014-06-18 11:52:01 -07:00
Brad Hefta-Gaub
c49ff59725 Merge pull request #3037 from wangyix/edit_nack_pull 
Edit nack pull
 2014-06-18 11:43:25 -07:00
ZappoMan
26075d9d26 add support for changing the model URL of a model 2014-06-18 11:29:56 -07:00
wangyix
7cef5eeeec replaced UINT16_MAX at 2 other places 2014-06-18 10:27:02 -07:00
wangyix
b63c88f42c removed more spaces 2014-06-18 09:38:39 -07:00
wangyix
8c4e365958 added forgotten i++ in sendNackPackets() 
plus minor style fixes
 2014-06-18 09:28:42 -07:00
Andrew Meadows
9e839f0980 Shape::getCenter() -> Shape::getTranslation() 2014-06-18 08:55:48 -07:00
ZappoMan
5a246fab26 Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel 
Conflicts:
	tests/octree/src/main.cpp
 2014-06-17 17:45:06 -07:00
Andrew Meadows
b9d4545aef merge upstream/master into andrew/ragdoll 
Conflicts:
	libraries/shared/src/Shape.h
	libraries/shared/src/ShapeCollider.h
 2014-06-17 17:03:16 -07:00
wangyix
7f4cf3719e added rollover handling to OctreeSceneStats 2014-06-17 16:40:08 -07:00
wangyix
bdbb12f4dc switched edit nacks to non-verified 2014-06-17 14:35:40 -07:00
ZappoMan
4413049302 fixed a bug in inside out ray casting returning the wrong face 2014-06-17 13:05:35 -07:00
ZappoMan
9a3f8508cf add support for inside out ray intersection on AACube and AABox 2014-06-17 12:12:53 -07:00
wangyix
011e7c2de2 removed debug code 2014-06-17 11:53:09 -07:00
wangyix
8187912384 added qDebug() check in SentPacketHistory for seq numbers 
used (unsigned short int)1 instead of 1 when calculating
expectedSequence
 2014-06-17 11:34:35 -07:00
wangyix
6e71523346 added OctreeEditPacketSender::nodeKilled(), no locks yet 
also added nodeKilled() calls to the 3 editsenders in
Application::nodeKilled()
 2014-06-17 10:58:44 -07:00
wangyix
dc71f87ea4 edit nacks seem to be working; 
added mutex for releaseQueuedPacket() to prevent duplicate packets being
queued up due to the steps of queueing the packet and clearing it not
being atomic.
 2014-06-17 10:42:56 -07:00
ZappoMan
66cfb63750 added some helpers to Octree and OctreeElements DRY-up some code 2014-06-17 08:55:19 -07:00
ZappoMan
cefbd765da some convenience features added to AABox and AACube 2014-06-17 08:36:45 -07:00
wangyix
06f8464ec9 edit nacks ready for test; seq numbers sometimes repeat?? 2014-06-16 17:17:48 -07:00
wangyix
e3db60d1ef forgot to add "break;"s 2014-06-16 16:42:04 -07:00
wangyix
18a9d74b88 changed OctreeEditPacketSender to queue packets for resend as nack is parsed 2014-06-16 16:35:30 -07:00
wangyix
5e37704772 SentPacketHistory now handles rollover 
updated SentPacketHistory path in comments
 2014-06-16 15:59:38 -07:00
wangyix
ddfe98ad43 added code to parse nack packets in OctreeEditPacketSender 2014-06-16 15:32:39 -07:00
wangyix
0f7ce694c0 minor changes before moving SentPacketHistory 2014-06-16 13:52:01 -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
Andrew Meadows
92159a7ed5 Shape::get/setCenter() instead of get/setPosition() 2014-06-16 08:43:27 -07:00
ZappoMan
12d30e9d62 handle some models don't fit better 2014-06-11 13:25:16 -07:00
ZappoMan
6389fea320 first cut at really using partial appendElementData to make models span packets. still needs work 2014-06-10 16:51:49 -07:00
ZappoMan
a0783f3f4a try appendElementData() a different way 2014-06-10 10:43:50 -07:00