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

4036 commits

Author SHA1 Message Date
wangyix
aa3602f0fb added InterframeTimeGapHistory and frameReceived() calls 2014-06-19 14:35:02 -07:00
wangyix
761a154a93 Merge remote-tracking branch 'upstream/master' 2014-06-18 15:59:45 -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
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
Andrzej Kapolka
6ec562931f Some additional comments for DatagramSequencer. 2014-06-18 14:44:11 -07:00
Stephen Birarda
db1031144b fix passing of unattenuated zones to buffers 2014-06-18 13:46:03 -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
Andrzej Kapolka
e0689b1484 Fixed compile error on Xcode. 2014-06-18 12:04:41 -07:00
Andrzej Kapolka
49ab3d6b43 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-18 11:59:04 -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
Andrzej Kapolka
b74e69e359 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-18 11:33:41 -07:00
Brad Hefta-Gaub
f04e5c0a73 Merge pull request #3041 from kitely/vs2013 
Allow the project to compile in Visual Studio 2013
 2014-06-18 11:33:06 -07:00
Andrzej Kapolka
52de729d60 Add virtual destructor to get rid of Xcode warning. 2014-06-18 11:31:58 -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
54f32d331e replaced UINT16_MAX with std::numeric_limits<uint16_t>::max 2014-06-18 10:20:19 -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
Oren Hurvitz
98b4d6f697 Allow the project to compile using Visual Studio 2013 2014-06-18 10:27:57 +03:00
Andrzej Kapolka
c65af33a6c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-17 19:15:47 -07:00
Andrzej Kapolka
b8e6660e19 More commentation. 2014-06-17 19:15:29 -07:00
Andrzej Kapolka
5e0cab59ea Some comments. 2014-06-17 18:12:06 -07:00
Brad Hefta-Gaub
cee6f1be6a Merge pull request #3031 from stojce/19755 
Code Review for Job #19755
 2014-06-17 17:28:55 -07:00
Andrzej Kapolka
9ded9b0696 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-17 17:07:38 -07:00
Andrzej Kapolka
758beff3d9 Make sure to use same enum streamer for the ones registered by type and the 
ones registered by scope/name.
 2014-06-17 17:06:28 -07:00
wangyix
7f4cf3719e added rollover handling to OctreeSceneStats 2014-06-17 16:40:08 -07:00
Brad Hefta-Gaub
df27de3c73 Merge pull request #3036 from huffman/19788 
Code Review for Job #19788
 2014-06-17 16:28:03 -07:00
Brad Hefta-Gaub
ba72410add Merge pull request #3029 from thoys/interface-balance-display-fix 
interface balance display fix
 2014-06-17 16:25:07 -07:00
Brad Hefta-Gaub
41b3e3e4ea Merge pull request #3023 from ey6es/metavoxels 
Refactored type/object streaming, added support for reading into/writing from "generic" containers that don't require the original classes/types.
 2014-06-17 16:24:22 -07:00
Andrzej Kapolka
c3090dd223 Tweak to the way streamers are written to JSON. 2014-06-17 16:12:06 -07:00
Brad Hefta-Gaub
6fc05d66c8 Merge pull request #3030 from AndrewMeadows/inertia 
raycasts against Shapes
 2014-06-17 16:10:36 -07:00
wangyix
bdbb12f4dc switched edit nacks to non-verified 2014-06-17 14:35:40 -07:00
Stojce Slavkovski
8b5e3486a3 Merge branch 'master' of https://github.com/highfidelity/hifi into 19755 2014-06-17 23:22:03 +02:00
Ryan Huffman
89fbeb0b6d Fix invalid remote scripts being loaded 2014-06-17 13:09:48 -07:00
ZappoMan
4413049302 fixed a bug in inside out ray casting returning the wrong face 2014-06-17 13:05:35 -07:00
Andrew Meadows
b6cecf3cfd Add SphereShape.cpp to project 2014-06-17 12:50:49 -07:00
AndrewMeadows
c5bd3df046 Merge pull request #3033 from ZappoMan/raypickbug 
add support for inside out ray intersection on AACube and AABox
 2014-06-17 12:48:44 -07:00
Andrew Meadows
f18864bd72 Moved findRayIntersection() to the Shape classes 2014-06-17 12:36:36 -07:00
Andrzej Kapolka
7931173671 Working on tools to convert bitstreams to/from json. 2014-06-17 12:33:31 -07:00
wangyix
5f62b43ba6 added edit nack types to non-verified list 2014-06-17 12:14:44 -07:00
ZappoMan
9a3f8508cf add support for inside out ray intersection on AACube and AABox 2014-06-17 12:12:53 -07:00
Andrew Meadows
3f36325642 remove warnings about signed/unsigned comparison 2014-06-17 11:59:37 -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
Andrew Meadows
018ba52b1c merge upstream/master with andrew/inertia 2014-06-17 10:50:49 -07:00