Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 04:37:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
15500 commits 76 branches 59 tags 1.2 GiB
Commit graph

334 commits

Author SHA1 Message Date
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
ZappoMan
23aa5a124e fix up lastEdited behavior 2014-07-31 11:41:18 -07:00
Stephen Birarda
ef58453fda turn off verbose octree packet debug 2014-07-30 18:10:11 -07:00
Stephen Birarda
db25cd9d2c call PaymentManager when an OctreeEditPacketSender needs to pay 2014-07-30 18:07:08 -07:00
Stephen Birarda
eba92eb517 have the OctreeEditPacketSender emit a signal when payment is required 2014-07-30 17:21:04 -07:00
Stephen Birarda
ab1be38fd5 reset the cost of the packet back to 0 so it doesn't keep accumulating 2014-07-30 14:02:46 -07:00
Stephen Birarda
7a128e5f77 add satoshi cost to voxel packet debug 2014-07-30 10:14:51 -07:00
Stephen Birarda
66592466ad pipe satoshi cost down to queuePacketToNodes 2014-07-30 10:05:21 -07:00
Stephen Birarda
6a534a6ff1 send along satoshi costs for voxel additions from VoxelEditPacketSender 2014-07-29 17:31:12 -07:00
ZappoMan
3667eadff0 some various fixes 2014-07-29 13:34:08 -07:00
ZappoMan
230c2f2684 cleanup storage of entity ids on the server, added improved checks for server vs client 2014-07-29 12:52:46 -07:00
Stephen Birarda
39e6d7d31b octree packet methods can take a cost 2014-07-29 11:40:07 -07:00
ZappoMan
805a88b73b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	examples/editModels.js
	interface/src/entities/EntityTreeRenderer.h
	libraries/models/src/ModelsScriptingInterface.cpp
	libraries/script-engine/src/ScriptEngine.cpp
 2014-07-28 13:39:35 -07:00
Atlante45
72a31ec8fc Removed magic number to use DEFAULT_NEAR/FAR_CLIP 2014-07-25 10:56:44 -07:00
Atlante45
c5ad856e65 Changed DEFAULT_FAR_CLIP to TREE_SCALE 2014-07-25 10:55:42 -07:00
ZappoMan
30aee70346 latest work 2014-07-21 09:18:21 -07:00
ZappoMan
61d998d2ad tweaks 2014-07-15 10:29:29 -07:00
ZappoMan
2baac96665 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	examples/sit.js
	interface/src/Application.cpp
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
 2014-07-15 10:04:40 -07:00
wangyix
ce0101aa2a fixed octreeEditPacketSender seq numbers errors; untested 2014-07-10 14:53:29 -07:00
ZappoMan
780532bfd8 more model to entity renaming, adding AABox:clamp() and AACube::clamp() fix AddEntity to support adding an entity that extends over bounds of universe 2014-07-10 13:42:49 -07:00
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