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

13695 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
66b0333dc9 more work on element append tweaks 2014-06-10 14:49:52 -07:00
ZappoMan
bc9d9d61ba fix some bugs in models 2014-06-10 13:43:43 -07:00
ZappoMan
50bc3b03df Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements 2014-06-10 10:43:59 -07:00
ZappoMan
a0783f3f4a try appendElementData() a different way 2014-06-10 10:43:50 -07:00
Brad Hefta-Gaub
f3fb39574f Merge pull request #3007 from wangyix/master 
Added Developer menu option to disable nack packets.
 2014-06-09 18:11:01 -07:00
wangyix
ffda98fe0b var name change again 2014-06-09 17:50:29 -07:00
wangyix
4665df4d1f nackdisable to disablenack 2014-06-09 17:41:20 -07:00
wangyix
de61029f05 Added dev menu option to disable nack packets 2014-06-09 17:30:09 -07:00
Andrzej Kapolka
78ad06f61c Merge pull request #3005 from AndrewMeadows/bug-fix 
Fix IK for hydra hands.
 2014-06-09 16:29:11 -07:00
Andrew Meadows
589b2e8fb7 recover some code for one less magic vec3 2014-06-09 16:12:54 -07:00
ZappoMan
5eb6ddbdb3 first cut at support for extra element data 2014-06-09 16:04:25 -07:00
Andrew Meadows
e8b6338de9 Fix IK for hydra hands. 2014-06-09 15:40:29 -07:00
wangyix
8312e1642d replaced takeFirst() with dequeue() for consistency 2014-06-09 15:15:43 -07:00
ZappoMan
7d0418420d removed some dead code that wasn't being called/used 2014-06-09 14:33:34 -07:00
Leonardo Murillo
adac661e9f Merge pull request #3003 from birarda/master 
add a crash guard for negative silent samples
 2014-06-09 15:15:18 -06:00
ZappoMan
c5647addf4 Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements 2014-06-09 14:10:47 -07:00
ZappoMan
139a64a0d2 fix comment 2014-06-09 14:10:40 -07:00
Stephen Birarda
ee71d34f02 add a crash guard around negative silent samples 2014-06-09 14:03:47 -07:00
Brad Hefta-Gaub
6cf30cf9d1 Merge pull request #3002 from wangyix/master 
added code to nack and re-send dropped octree data packets
 2014-06-09 13:52:21 -07:00
wangyix
e45f2fed4b changed writelock to readlock 
plus a coding standard fix
 2014-06-09 13:42:45 -07:00
ZappoMan
6f1ec01797 rename nodeBag to elementBag in a bunch of places 2014-06-09 13:42:44 -07:00
Brad Hefta-Gaub
2a4e6a1311 Merge pull request #3001 from Barnold1953/OculusOverlay 
Simple raypicking for scripts with oculus rift.
 2014-06-09 13:21:24 -07:00
wangyix
ff2a5342ee removed another extra space 2014-06-09 12:57:50 -07:00
wangyix
412d3e19fe removed debug prints in parseNackPacket() 2014-06-09 12:56:00 -07:00
ZappoMan
89e24c4f21 add unit tests from new ModelItem serialization 2014-06-09 12:55:55 -07:00
wangyix
0fce7e721a removed more spaces 2014-06-09 12:40:01 -07:00
wangyix
968ea3563c removed an extra space 2014-06-09 12:37:42 -07:00
wangyix
aa694d6967 removed debug code 2014-06-09 12:35:26 -07:00
wangyix
f13ae84da6 Merge branch 'packet_recovery_pull' 2014-06-09 12:04:12 -07:00
wangyix
529dd827a2 moved around code in sendNack() a bit 2014-06-09 12:00:19 -07:00
barnold1953
936f04cece Simple raypicking for scripts with oculus rift. 2014-06-09 11:55:29 -07:00
Andrzej Kapolka
28490f9bbc Merge pull request #2994 from AndrewMeadows/ragdoll 
Ragdoll Part 2: make MyAvatar's skeleton's collision shapes follow ragdoll
 2014-06-09 11:55:19 -07:00
Andrew Meadows
4f9da0cc37 fix whitespace formatting 2014-06-09 11:50:31 -07:00
Andrzej Kapolka
e936697cf0 Merge pull request #2987 from leechfarm/master 
Fix for users with some special characters in their password not being able to log in
 2014-06-09 11:31:30 -07:00
AndrewMeadows
d8f21b9f44 Merge pull request #3000 from ey6es/master 
Avoid crash on zero-length normals.
 2014-06-09 11:29:49 -07:00
ZappoMan
49a9f2046a more unit tests 2014-06-09 11:29:17 -07:00
wangyix
3bc457d4d2 added octree scene stats locking and unlocking 2014-06-09 11:14:02 -07:00
Andrzej Kapolka
a1e208ae3d Simplification. If the normal is zero, then the cross product will also be 
zero, so we can just have the one check and postpone normalization until
afterwards.
 2014-06-09 11:03:50 -07:00
Andrzej Kapolka
6eac0ee2ae Avoid crash on zero-length normals. 2014-06-09 10:58:56 -07:00
ZappoMan
493ad6ae9e added test pass/fail counting to octree unit tests 2014-06-09 10:41:43 -07:00
ZappoMan
8834da60b9 aded encoded length to property flags 2014-06-09 10:41:11 -07:00
ZappoMan
6943b3f763 remove debugging 2014-06-09 10:40:29 -07:00
ZappoMan
4e8e5bf53d first cut at new ModelItem reading, repacking of ModelItem format in case PropertyFlags shrink 2014-06-09 10:39:48 -07:00
AndrewMeadows
5ed1dfc4b0 Merge pull request #2999 from ey6es/metavoxels 
Provide a way to stream enums that aren't object properties, added tests for delta streaming, fixed Windows initialization bug.
 2014-06-09 08:48:20 -07:00
ZappoMan
12a563193f first cut at new version of ModelItem::appendModelData 2014-06-09 08:04:41 -07:00
ZappoMan
f3dd34ae54 tweak 2014-06-09 08:03:31 -07:00
ZappoMan
f6e5962593 added new versions of appendData for QString and QByteArray 2014-06-09 08:02:42 -07:00
Brad Hefta-Gaub
8f71335bec Merge pull request #2993 from Atlante45/temp_branch 
More editModels.js work
 2014-06-07 09:17:30 -07:00