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

2625 commits

Author SHA1 Message Date
Stephen Birarda
27305c7a43 change default domain to root, don't double load domains on startup 2014-02-10 10:23:06 -08:00
Andrzej Kapolka
200a2d77c2 Incorporated fixes for warnings that Brad reported on Windows. 2014-02-10 10:13:52 -08:00
Andrzej Kapolka
d48b7b8ede Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-10 09:48:24 -08:00
Andrew Meadows
be1aaee359 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-10 09:05:08 -08:00
Andrew Meadows
10296577f4 More info when colliding with meshes + stubbery for poking avatar. 2014-02-10 09:02:29 -08:00
Andrzej Kapolka
c39f9f6271 Fix (hopefully) for Windows runtime error. 2014-02-10 00:59:51 -08:00
Andrzej Kapolka
e9579feef5 Reordering testing. 2014-02-10 00:41:15 -08:00
Andrzej Kapolka
ee2984ce6d Streaming fixes. 2014-02-09 23:38:33 -08:00
Andrzej Kapolka
f81a9d9fe8 Circular buffer work. 2014-02-09 22:29:23 -08:00
Andrzej Kapolka
8c9f06ceec Fix/tests for streaming. 2014-02-09 17:43:18 -08:00
Andrzej Kapolka
524ceb4ed2 Working on tests for datagram sequencing, added autogenerated ==/!= operators 
to mtc.
 2014-02-09 16:26:53 -08:00
ZappoMan
e35df7904b cleanup bad merge 2014-02-09 12:32:12 -08:00
ZappoMan
fe1a6b8f29 improvements to rotating gesture detection 2014-02-09 12:29:57 -08:00
ZappoMan
dca0b05927 added easier support for calculating multitouch rotating behavior including deltaAngle, isRotating, rotating(direction) properties 2014-02-09 12:08:17 -08:00
ZappoMan
3bf8dd87e8 Merge branch 'master' of https://github.com/worklist/hifi into more_events 2014-02-09 10:32:14 -08:00
ZappoMan
9c21eb7949 removed comments 2014-02-09 02:56:26 -08:00
ZappoMan
70c5e674e9 add rotating detection to touch events 2014-02-09 02:54:12 -08:00
ZappoMan
d2b3e74f5d added isPinching and isPinchOpening to touch events 2014-02-09 02:02:42 -08:00
ZappoMan
120807f9ba add touch event radius 2014-02-09 01:31:48 -08:00
ZappoMan
02e6a3336d added several new JS events attributes 2014-02-09 01:05:27 -08:00
Philip Rosedale
c6bf11361e Merge branch 'master' of https://github.com/worklist/hifi 2014-02-08 16:52:28 -08:00
Philip Rosedale
03bc5adf64 Add Audio Noise Reduction 2014-02-08 16:35:37 -08:00
ZappoMan
07585dbe5b add scripts to voxels 2014-02-08 12:07:24 -08:00
ZappoMan
235673b7fe Merge branch 'master' of https://github.com/worklist/hifi into ray_cast_scripting 2014-02-07 16:27:52 -08:00
Stephen Birarda
cf05600d73 fix miss of pingType in timePingReply, closes #1934 2014-02-07 15:27:44 -08:00
Stephen Birarda
3e13608e19 switch back to proper data-server 2014-02-07 15:06:57 -08:00
ZappoMan
802f72c732 more ray picking and intersection work 2014-02-07 15:06:32 -08:00
ZappoMan
e162aa4a40 Merge branch 'master' of https://github.com/worklist/hifi into ray_cast_scripting 2014-02-07 14:47:25 -08:00
Stephen Birarda
f945aac5cd bump version on unverified packets whose header format has changed 2014-02-07 14:32:09 -08:00
Stephen Birarda
a1a4a3db8a HifiSockAddr to SharedNodePointer changes in MetavoxelServer 2014-02-07 14:27:10 -08:00
Stephen Birarda
3bf0ed719c remove a comment in HifiSockAddr 2014-02-07 14:08:42 -08:00
Stephen Birarda
dd4d944dea ping inactive nodes in conjunction with domain server check in 2014-02-07 14:06:42 -08:00
Stephen Birarda
94c449e10c Merge branch 'mesh-through-mixer' into authentication 2014-02-07 13:50:39 -08:00
Stephen Birarda
72a3e6f22c fix long column in NodeList 2014-02-07 13:49:59 -08: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
7c6d3cd01f fix broken build from NetworkPacket 2014-02-07 13:46:59 -08:00
Stephen Birarda
455442088c Merge branch 'master' of https://github.com/highfidelity/hifi into mesh-through-mixer 2014-02-07 13:45:14 -08:00
Stephen Birarda
3ad8e7260e fix an accidental DOS and remove getNodeActiveSocketOrPing API 2014-02-07 13:42:52 -08:00
Stephen Birarda
a5636d2dc0 make ThreadedAssignment subclasses handle QUdpSocket readyRead, closes #1895 2014-02-07 12:25:43 -08:00
ZappoMan
c64b934d33 first cut at ray cast scripting 2014-02-07 11:23:04 -08:00
Philip Rosedale
72de486671 Merge pull request #1920 from ZappoMan/scriptable_camera 
Scriptable camera
 2014-02-07 11:21:12 -08:00
Stephen Birarda
66d4eeb805 enforce both a version and hash match for packets 2014-02-07 11:10:38 -08:00
Andrew Meadows
2e65592048 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-07 10:50:36 -08:00
Andrew Meadows
7a8186f1da Adding ModelCollisionInfo struct to get more info about collisions against avatars. 
Had to disable some collisions.  Will go back and make them work again soon.
 2014-02-07 10:48:30 -08:00
Andrew Meadows
0a4eec448e Removing findSpherePenetration() from AvatarData class 2014-02-07 10:47:00 -08:00
Stephen Birarda
d39cccde77 add a method to find a node and upate based on packet 2014-02-07 10:32:16 -08:00
Stephen Birarda
7ceacd2751 remove blank if and fix ping reply construction 2014-02-07 10:24:01 -08:00
Stephen Birarda
fa1825fa32 repairs to ping-reply, removal of deconstructPacketHeader to simply return UUID 2014-02-07 10:20:50 -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
ZappoMan
2157349804 added Camera.computePickRay() 2014-02-07 09:40:52 -08:00
ZappoMan
41f6650b20 implement movable independent camera with hydra 2014-02-07 01:23:30 -08:00
ZappoMan
e50f6389ca add more JS Quat features 2014-02-07 00:00:30 -08:00
Andrzej Kapolka
d7df4173e5 Cleaner component creation. 2014-02-06 18:58:36 -08:00
Andrzej Kapolka
0a6288bda4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-06 15:42:37 -08:00
Andrzej Kapolka
be21eee704 More work on parameterized scripts. 2014-02-06 15:41:21 -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
Andrew Meadows
082b7cf1a9 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/Avatar.h
	interface/src/avatar/MyAvatar.cpp
 2014-02-06 14:37:19 -08:00
Stephen Birarda
a823722d27 add writeDatagram helper to NodeList to insert md5 hash 2014-02-06 14:28:58 -08:00
Andrew Meadows
b230f046a7 Minor formating fixes. 2014-02-06 14:11:11 -08:00
Andrzej Kapolka
f6320d3a81 I think this covers the basic bits necessary for the reliable streaming. Of 
course, I haven't tested it yet.
 2014-02-06 12:27:46 -08:00
Stephen Birarda
cb6316bf4d fix KeyState enum spacing 2014-02-06 11:45:52 -08:00
Stephen Birarda
f10404b31e allow setting of avatar URLs via AvatarData properties 2014-02-06 11:45:37 -08:00
Stephen Birarda
e72f6d16cc rename NodeList ownerUUID to sessionUUID 2014-02-06 11:43:23 -08:00
Stephen Birarda
3dca04aacb have the domain-server generate connection secrets, closes #1837 2014-02-06 11:30:53 -08:00
Stephen Birarda
6f638fa62c have domain-server create a UUID for unidentified nodes, closes #1840 2014-02-06 10:34:34 -08:00
Stephen Birarda
f92f9ec0c2 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-02-06 09:28:03 -08:00
Brad Hefta-Gaub
8fbce35944 fix slight glitch in last child delete from larger voxel 2014-02-06 03:44:21 -08:00
Andrzej Kapolka
6b4c8b62c6 Back down the rabbit hole I go, weee! 2014-02-05 21:28:36 -08:00
ZappoMan
3e4ce72b47 Merge pull request #1896 from birarda/library-cleanup 
library and ScriptEngine cleanup
 2014-02-05 20:34:31 -08:00
ZappoMan
7c8858c7b6 Merge pull request #1887 from ZappoMan/fixwindowsbuild 
fix windows build errors and warnings
 2014-02-05 20:32:51 -08:00
Andrzej Kapolka
98a432d3e5 Punting on the span tracking thing for now. 2014-02-05 19:24:16 -08:00
Andrzej Kapolka
e77feb8efd More work on reliable transfer. 2014-02-05 16:19:16 -08:00
Stephen Birarda
f4fe2bb754 move octree-server libs to assignment-client 2014-02-05 16:04:23 -08:00
ZappoMan
ce30e83113 fix crash in octree server related to getActiveSocket() returning NULL 2014-02-05 14:56:00 -08:00
Brad Hefta-Gaub
a05e07460f fix windows build errors and warnings 2014-02-05 13:54:17 -08:00
Andrzej Kapolka
5e9916302b Working on clearing shared object references. 2014-02-05 13:28:19 -08:00
Andrzej Kapolka
3a378dbeaf Working on extending the concept of a shared object. 2014-02-05 12:20:02 -08:00
Stephen Birarda
96fd73a766 fixed wrapped read of samples from end of buffer 2014-02-05 11:39:03 -08:00
ZappoMan
76bc4564ad push to force rebuild 2014-02-05 10:24:00 -08:00
ZappoMan
53e7cd7797 fix particle init 2014-02-05 10:16:43 -08:00
AndrewMeadows
42528be7ca Merge pull request #1846 from ZappoMan/fixdebugoutput 
fix debug to properly work with outputBufferBits()
 2014-02-05 10:03:09 -08:00
Stephen Birarda
c194ad1b2d Merge pull request #1873 from ZappoMan/bugfixes 
Fix corruption in voxel packets
 2014-02-04 23:17:45 -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
ZappoMan
13d9b710f1 bump packet version 2014-02-04 20:23:12 -08:00
ZappoMan
a35e5eeb92 move modelScale before translation and rotation since that seems to fix the corruption 2014-02-04 20:20:06 -08:00
Andrzej Kapolka
be4f081465 More work on editing parameterized URLs. 2014-02-04 19:55:11 -08:00
Andrzej Kapolka
4f4c4c68d9 Streaming cleanup, streaming script strings as repeated values. 2014-02-04 18:31:18 -08:00
Stephen Birarda
092c969e75 more repairs to face and skeleton model passing 2014-02-04 15:48:31 -08:00
Andrzej Kapolka
ca52d67041 Basic script guides now working. 2014-02-04 15:40:17 -08:00
Stephen Birarda
adaa36a51d repairs to key-framed URL sending through avatar-mixer 2014-02-04 15:28:27 -08:00
Stephen Birarda
3959209bc2 complete movement of URLs to AvatarData for re-usability 2014-02-04 14:49:56 -08:00
Stephen Birarda
2b80a5fbb8 move face/skeleton model URLs to AvatarData 2014-02-04 14:40:41 -08:00
Andrzej Kapolka
3af86cb1a4 Working on script loading. 2014-02-04 14:07:01 -08:00
Andrzej Kapolka
fd31cc02ad Working on loading scripts. 2014-02-04 14:06:17 -08:00
Stephen Birarda
8bf3b7586b initial movement of mesh/skeleton URLs out of data-server through avatar-mixer 2014-02-04 13:02:33 -08:00
ZappoMan
2cf2e693b9 fix debug to properly work with outputBufferBits() 2014-02-04 12:29:55 -08:00
Andrzej Kapolka
a043278f03 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-04 11:25:18 -08:00