Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 11:57:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
10045 commits 75 branches 59 tags 1.2 GiB
Commit graph

124 commits

Author SHA1 Message Date
ZappoMan
cbca298717 cruft cleanup 2014-02-26 00:31:05 -08:00
ZappoMan
b08a1708f5 hide some slots from JS 2014-02-26 00:18:15 -08:00
matsukaze
8aa645b6de Merge and resolve conflicts of remote-tracking branch 'upstream/master' 2014-02-18 22:45:25 -05:00
Andrew Meadows
b28a18dab0 Remove warning about null-op sprintf() in g++ 2014-02-17 09:17:34 -08:00
ZappoMan
2eac9c293f first working version of scriptable Overlays 2014-02-14 15:37:47 -08:00
ZappoMan
dbd6cb71c9 fixed crash on shutdown with multiple scripts 2014-02-13 20:55:16 -08:00
matsukaze
a89f3bb9e5 Fixes for style conformance 2014-02-13 11:23:50 -05:00
matsukaze
9e5c8b1634 Merging upstream master 2014-02-12 12:32:53 -05:00
ZappoMan
4bb7bb2b77 make pending packets thread safe 2014-02-10 12:48:45 -08:00
matsukaze
ab0b7bba00 Fixes for style conformance: tabs to spaces 2014-02-07 22:52:08 -05:00
matsukaze
52290266b0 Fixes for style conformance: replace constants with enums 2014-02-07 22:11:47 -05:00
Stephen Birarda
05f086ae74 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-02-07 13:48:28 -08:00
Stephen Birarda
3ad8e7260e fix an accidental DOS and remove getNodeActiveSocketOrPing API 2014-02-07 13:42:52 -08:00
Andrzej Kapolka
d3b005112e Changes from Philip's code review. 2014-02-07 10:03:23 -08:00
Stephen Birarda
b988308a8d leverage writeDatagram helper in NodeList, ping if no active socket 2014-02-07 09:49:54 -08:00
Stephen Birarda
c1132726bf use SharedNodePointer in place of Node where appropriate 2014-02-06 14:58:03 -08:00
Stephen Birarda
97a7369c76 remove senderWithAddress from NodeList 2014-02-06 14:43:46 -08:00
Stephen Birarda
a823722d27 add writeDatagram helper to NodeList to insert md5 hash 2014-02-06 14:28:58 -08:00
ZappoMan
1b9cc4f5a5 more fixup to octree packets 2014-02-04 23:02:56 -08:00
ZappoMan
b0c41b086d fix voxel packet corruption 2014-02-04 22:54:55 -08:00
matsukaze
259b285841 Merging upstream 2014-02-03 10:25:32 -05:00
matsukaze
bbf4f889d8 Completed worklist job #19486 
Job #19486  Don't render the duplicate triangles between adjacent
voxels.

Added checkable item to "developer" menu to activate/deactivate cull
shared faces.

Cull all shared voxel faces regardless of distribution in the octree.
Includes leaf to leaf, leaf to non-leaf, and non-leaf to non-leaf
comparison of contiguous faces.

Added new GL primitive renderer to manage the transfer of cube faces
from the voxel system to GL.

Added some useful classes for queue and lock management.

Modified statistics collection to report number of completely culled
nodes. Extra debugging info also includes the interior occlusions bit
mask of leaf voxels.
 2014-02-03 09:45:12 -05:00
ZappoMan
00e98ee42b make tryLock actually return a bool 2014-01-31 15:44:48 -08:00
ZappoMan
7a3ce7c89d Merge pull request #1805 from birarda/master 
remove unused UUID from OctreeQuery
 2014-01-31 13:48:49 -08:00
Stephen Birarda
9b549723d3 remove unused UUID from OctreeQuery 2014-01-31 13:47:59 -08:00
ZappoMan
599e57b5c2 Merge pull request #1804 from birarda/master 
remove a double push in OctreeQuery parsing
 2014-01-31 13:45:03 -08:00
Stephen Birarda
254a0c0aed remove a double push on UUID in OctreeQuery 2014-01-31 13:44:24 -08:00
ZappoMan
5caaf0dc7f check against NULL node from nodeWithUUID() 2014-01-31 13:28:56 -08:00
Stephen Birarda
59a528f096 remove another unneeded line 2014-01-31 10:06:26 -08:00
Stephen Birarda
33edcea5fb resolve conflicts on merge with upstream master 2014-01-29 12:23:06 -08:00
ZappoMan
9d87d58723 Merge branch 'master' of https://github.com/worklist/hifi into more_scripting 
Conflicts:
	libraries/particles/src/ParticlesScriptingInterface.cpp
 2014-01-28 20:36:35 -08:00
Stephen Birarda
4de270b832 cleanup Node types, closes #1726 2014-01-28 13:38:33 -08:00
Stephen Birarda
fe410ae3e9 fix packet header size constraints 2014-01-28 12:56:05 -08:00
Stephen Birarda
cda06d1cb3 replace uint64_t with quint64 for Qt friendlyness 2014-01-28 12:35:42 -08:00
ZappoMan
427abd4509 add model properties to particles 2014-01-28 11:18:37 -08:00
Stephen Birarda
4103cc1cde packet header changes and beginning of conversion to QByteArray 2014-01-28 10:36:08 -08:00
ZappoMan
568d5bc05d first cut at particle meshes 2014-01-28 09:26:47 -08:00
Andrew Meadows
2fa3fc523d Fix for AABox::touches(otherBox) 2014-01-27 17:51:05 -08:00
ZappoMan
5e4813ab11 more work on allowing for local particle trees 2014-01-27 13:50:05 -08:00
Andrew Meadows
daf11692d8 Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions 2014-01-26 15:19:52 -08:00
Andrew Meadows
52511b2baf Adding AABox::touches(box) 2014-01-24 13:59:03 -08:00
ZappoMan
f02bc95908 clear particles when switching domains 2014-01-24 11:07:27 -08:00
Stephen Birarda
d5b4e643c8 resolve conflicts on merge with upstream/master 2014-01-23 18:10:40 -08:00
Stephen Birarda
777e375761 Merge pull request #1670 from AndrewMeadows/zero-length-penetrations 
Zero length penetrations
 2014-01-23 18:09:41 -08:00
Stephen Birarda
10cfd628aa resolve conflicts on merge with upstream master 2014-01-23 17:52:30 -08:00
Philip Rosedale
2dee6426e9 Merge pull request #1672 from ZappoMan/bugfixes 
fix crash on shutdown of interface
 2014-01-23 17:27:07 -08:00
Stephen Birarda
8d2e9823de remove notion of owning node from NodeData 2014-01-23 17:06:03 -08:00
ZappoMan
5560a0fb4d fix crash on shutdown of interface 2014-01-23 17:03:11 -08:00
Andrew Meadows
70c675e9be Adding comments and minor cleanup after tracking down some NaN's that were showing up in collision sound triggers. 2014-01-23 16:03:52 -08:00
Stephen Birarda
4ebd5795fc handle merge with nodelist-patches branch 2014-01-23 16:01:52 -08:00