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

1418 commits

Author SHA1 Message Date
Andrew Meadows
2e65592048 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-07 10:50:36 -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
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
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
a05e07460f fix windows build errors and warnings 2014-02-05 13:54:17 -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
ZappoMan
13d9b710f1 bump packet version 2014-02-04 20:23:12 -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
Andrew Meadows
466a43c77f Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-02-03 10:47:00 -08:00
AndrewMeadows
bed63513a9 Merge pull request #1745 from ZappoMan/scripting_work 
support for global collision callbacks in JS
 2014-01-31 10:42:44 -08:00
Stephen Birarda
a07511ed2c remove an unecessary line 2014-01-31 10:05:46 -08:00
Stephen Birarda
ddbcfbd02f remove an extra debug for ping packets 2014-01-31 09:56:18 -08:00
Stephen Birarda
c989a64e90 repair ping packet parsing in creation of reply 2014-01-31 09:54:52 -08:00
Stephen Birarda
984fb1a5df fix config parsing from command line and json 2014-01-30 15:22:03 -08:00
Stephen Birarda
356222ba15 removal of persistence in DS for static assignments 2014-01-30 14:33:36 -08:00
ZappoMan
ed0a2a5a18 Merge branch 'master' of https://github.com/worklist/hifi into scripting_work 
Conflicts:
	libraries/shared/src/SharedUtil.cpp
	libraries/shared/src/SharedUtil.h
	libraries/voxels/src/VoxelEditPacketSender.cpp
 2014-01-29 19:49:36 -08:00
ZappoMan
08b06cc59c support for global collision callbacks in JS 2014-01-29 17:52:17 -08:00
Stephen Birarda
740d11027c add QDataStream >> operator to Assignment 2014-01-29 17:20:32 -08:00
Stephen Birarda
e700a39c3c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-29 14:23:49 -08:00
Stephen Birarda
7d27830064 domain-server patches while looking for payload/pool errors 2014-01-29 14:23:39 -08:00
Andrew Meadows
f093a571c5 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 
Conflicts:
	interface/src/avatar/Avatar.cpp
	libraries/particles/src/ParticleCollisionSystem.cpp
	libraries/shared/src/CollisionInfo.h
 2014-01-29 14:12:22 -08:00
Andrzej Kapolka
1e9e298a75 Missing includes. 2014-01-29 13:47:13 -08:00
Stephen Birarda
33edcea5fb resolve conflicts on merge with upstream master 2014-01-29 12:23:06 -08:00
ZappoMan
98cdc656c4 more scripting support, including adding a Quat helper class that makes JS quat math easier 2014-01-29 00:56:08 -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
4bb72b9f3f remove MAX_HOSTNAME_BYTES 2014-01-28 13:44:47 -08:00
Stephen Birarda
423e1598f0 use NodeSet in place of QSet<NodeType_t> where possible 2014-01-28 13:41:39 -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
8384ff79df remove one Qt type replacement 2014-01-28 12:36:43 -08:00
Stephen Birarda
cda06d1cb3 replace uint64_t with quint64 for Qt friendlyness 2014-01-28 12:35:42 -08:00
Stephen Birarda
7b4921e761 use quint64 in place of uint64_t for QDataStream 2014-01-28 12:34:08 -08:00
Stephen Birarda
2aaa9ce3f6 resolve conflicts on merge with upstream master 2014-01-28 12:30:43 -08:00
Stephen Birarda
b009cd8e67 repair more node communication problems after refactor 2014-01-28 12:25:44 -08:00
Stephen Birarda
ffefc529f3 ensure UUID pulled from packet header is exactly 16 bytes 2014-01-28 11:53:09 -08:00
Stephen Birarda
75e2fa491a some type fixes for marshalling/un-marshalling of data 2014-01-28 11:26:36 -08:00
ZappoMan
427abd4509 add model properties to particles 2014-01-28 11:18:37 -08:00
Stephen Birarda
85ebad979f repair assignment flow errors from packet changes 2014-01-28 11:15:38 -08:00
Stephen Birarda
3854f75abd cleanup some UUID packing 2014-01-28 10:41:40 -08:00
Stephen Birarda
4103cc1cde packet header changes and beginning of conversion to QByteArray 2014-01-28 10:36:08 -08:00
ZappoMan
1681dbb57b Merge branch 'master' of https://github.com/worklist/hifi into particle_meshes 2014-01-28 09:26:54 -08:00
ZappoMan
568d5bc05d first cut at particle meshes 2014-01-28 09:26:47 -08:00
Andrew Meadows
c4f429dcd0 Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions 2014-01-27 18:05:39 -08:00
stojce
74801da07f #19491 - Implement in-app snapshots 2014-01-27 18:07:03 +01:00
Andrew Meadows
2f02ee0b31 Moving applyHardCollision to the Particle class. Adding daming and elasticity to CollisionInfo. 2014-01-24 16:29:44 -08:00
AndrewMeadows
ea681f0d8f Merge pull request #1669 from birarda/avatar-list 
add an AvatarManager to house a separate list of Avatars from NodeList
 2014-01-24 09:54:17 -08:00
Stephen Birarda
dff59f386a cleanup spacing in debug 2014-01-24 09:23:44 -08:00
Stephen Birarda
fc55c3efac simplify debug a little 2014-01-24 09:11:03 -08:00
Stephen Birarda
9d71671a52 add extra debugging to packet mismatch 2014-01-24 09:10:27 -08:00
Leonardo Murillo
6dae086f32 changing default domain closes #1676 2014-01-24 08:49:07 -06:00
Stephen Birarda
10cfd628aa resolve conflicts on merge with upstream master 2014-01-23 17:52:30 -08:00
Stephen Birarda
8d2e9823de remove notion of owning node from NodeData 2014-01-23 17:06:03 -08:00
Andrew Meadows
c33a437393 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-01-23 16:44:41 -08:00
ZappoMan
da58486fb1 Merge pull request #1668 from birarda/nodelist-patches 
cleanup deadlocking in NodeList methods, avatar-mixer debug
 2014-01-23 16:30:29 -08:00
Andrew Meadows
afa1134282 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-01-23 16:24:43 -08:00
Stephen Birarda
4ebd5795fc handle merge with nodelist-patches branch 2014-01-23 16:01:52 -08:00
Stephen Birarda
80106979a5 replace packetSenderNotify with signal/slot combo 2014-01-23 15:55:36 -08:00
Stephen Birarda
349c790cc7 NodeData cleanup thanks to separation from rendered avatars 2014-01-23 15:41:40 -08:00
Stephen Birarda
ed9118fd67 more NodeList QSet changes, closes #1660 2014-01-23 15:28:46 -08:00
Stephen Birarda
ba7a73e347 add a missing break, don't double activate sockets 2014-01-23 15:11:09 -08:00
Stephen Birarda
761bcb9825 allow recursive locking on the NodeHashMutex 2014-01-23 15:11:02 -08:00
ZappoMan
9de99ce6a8 removed commented out debug 2014-01-23 15:07:17 -08:00
Stephen Birarda
09cd8eb0fd add a missing break, don't double activate sockets 2014-01-23 15:05:09 -08:00
Stephen Birarda
e7927ff837 allow recursive locking on the NodeHashMutex 2014-01-23 15:02:23 -08:00
ZappoMan
bdcca9cbf4 fix random crash on interface shutdown 2014-01-23 14:57:32 -08:00
Stephen Birarda
9ab1fc4c2c resolve conflicts on merge with upstream/master 2014-01-23 14:43:04 -08:00
Stephen Birarda
2e548fb39c complete migration of Avatar list to AvatarManager 2014-01-23 14:41:11 -08:00
Stephen Birarda
1f95d0c017 have avatar-mixer report avatar kills to all avatars 2014-01-23 12:47:27 -08:00
Stephen Birarda
a9f1984676 add an AvatarManager that will keep Avatars in Application thread 2014-01-23 11:59:24 -08:00
Philip Rosedale
5e77f5643d Merge pull request #1630 from birarda/nodelist-set 
change node types of interest to a QSet
 2014-01-23 11:42:37 -08:00
Stephen Birarda
b5a72ef669 more nodelist repairs for concurrency issues 2014-01-23 11:11:22 -08:00
Stephen Birarda
04286e39e6 use NodeList getNodeHash getter for methods that can be called from other threads 2014-01-23 10:49:51 -08:00
Stephen Birarda
7efc9e2e78 move datagram processing back to separate thread 2014-01-23 10:32:23 -08:00
Andrew Meadows
847503e437 Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 2014-01-22 17:00:55 -08:00
Andrew Meadows
556526316f Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/avatar/Hand.h
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-22 16:21:49 -08:00
Stephen Birarda
ec04d5450b Merge branch 'master' of https://github.com/highfidelity/hifi into nodelist-set 2014-01-22 16:16:47 -08:00
Stephen Birarda
f4f828ab72 Merge pull request #1629 from ZappoMan/juridiction_improvements 
Change JurisdictionListener and JurisdictionSender to not require virtual base class
 2014-01-22 16:16:24 -08:00
Stephen Birarda
abddb969a5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-22 14:47:44 -08:00
Stephen Birarda
e9e2557576 change node types of interest to a QSet 2014-01-22 14:47:04 -08:00
Brad Hefta-Gaub
85363f6603 Merge branch 'master' of git://github.com/worklist/hifi into juridiction_improvements 2014-01-22 14:23:00 -08:00
Brad Hefta-Gaub
39f7111b2d remove public virtual from PacketSender and RecievedPacketProcessor 2014-01-22 14:21:03 -08:00
Andrew Meadows
09b2d4aa78 Added menu options for more detailed collision preferences. 2014-01-22 13:34:13 -08:00
Stephen Birarda
d57aec9793 don't use separate NodeList owner UUID and Avatar UUID 2014-01-22 11:48:04 -08:00
Brad Hefta-Gaub
aacad00791 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	interface/src/Application.cpp
 2014-01-22 11:16:21 -08:00
Brad Hefta-Gaub
f81adb8810 update packet versions 2014-01-22 09:48:19 -08:00
Stephen Birarda
98c25aa3ee put data-server hostname back to data.highfidelity.io 2014-01-22 09:10:27 -08:00
Brad Hefta-Gaub
fe5a8d9da2 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	libraries/shared/src/PacketHeaders.cpp
 2014-01-21 20:21:22 -08:00
Andrzej Kapolka
2651c06367 Compile fix (for me, anyway). 2014-01-21 17:21:57 -08:00
Stephen Birarda
105fb42b34 rewrite mesh and skeleton requests from data-server 2014-01-21 16:46:04 -08:00
Stephen Birarda
f13aa322fc resolve conflicts in merge with upstream/master 2014-01-21 16:01:12 -08:00
Stephen Birarda
e08f4d2eba more DataServerClient API tweaks 2014-01-21 13:13:57 -08:00
Stephen Birarda
3613773b79 cleanup DSC api, add scripting interface 2014-01-21 09:55:06 -08:00
Brad Hefta-Gaub
cd0e8e742c particle edit checkpoint 2014-01-21 02:12:31 -08:00
Brad Hefta-Gaub
3bcd02f8e3 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	libraries/shared/src/PacketHeaders.cpp
 2014-01-20 20:25:52 -08:00
Stephen Birarda
340ae8ebd1 column width repair 2014-01-20 17:17:26 -08:00
Stephen Birarda
d9ae27953b move DataServerClient to shared for use in other targets 2014-01-20 17:12:52 -08:00
Stephen Birarda
8930cf889b bump data server packet version to 1 2014-01-20 14:48:14 -08:00
Andrzej Kapolka
81ab68a529 Store hand position relative to body orientation/position. 2014-01-20 12:44:09 -08:00
Brad Hefta-Gaub
bc2830d0d3 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-20 10:55:34 -08:00
Philip Rosedale
2fe666aa63 Merge pull request #1583 from birarda/nodelist-container 
NodeList container repairs
 2014-01-17 17:23:16 -08:00
Stephen Birarda
594165782a repair badly scoped usage of QMutexLocker 2014-01-17 16:20:22 -08:00
Brad Hefta-Gaub
99f9ae9d3a implement new setProperties() getProperties() for Particle to allow setting all properties at once using a JS hash 2014-01-17 16:02:58 -08:00
Stephen Birarda
fad7bde0e1 add mutex locking to NodeHash 2014-01-17 16:02:57 -08:00
Stephen Birarda
816b324236 switch to explicit lock and unlock in removeSilentNodes 2014-01-17 15:17:10 -08:00
Stephen Birarda
3355b71d6b switch back to returning iterator from killNodeAtHashIterator 2014-01-17 15:13:56 -08:00
Brad Hefta-Gaub
1e0f1adb16 added lifetime to particles 2014-01-17 14:59:40 -08:00
Andrew Meadows
562b29b293 adding back log about mismatching packet type 2014-01-17 11:35:16 -08:00
Andrew Meadows
48796231ef Merge branch 'master' of ssh://github.com/highfidelity/hifi into paddle-fixes 2014-01-17 11:26:04 -08:00
Andrew Meadows
f08e639cb2 fixes for avatar paddle-hands, plus some hackery for demo 2014-01-17 11:22:50 -08:00
Andrzej Kapolka
8c6c521b65 Merge branch 'master' of https://github.com/highfidelity/hifi into debone 2014-01-16 16:38:07 -08:00
Stephen Birarda
d85616d690 cleaup matching with node in addOrUpdateNode 2014-01-16 16:14:25 -08:00
Andrzej Kapolka
a16d38ced6 Removed joints from avatar state messages. 2014-01-16 15:07:09 -08:00
Brad Hefta-Gaub
cdfc328f79 remove no longer needed compiler warning disable 2014-01-16 14:38:14 -08:00
Stephen Birarda
323aa18c0e remove MotionDriver and pthread libraries 2014-01-16 14:16:38 -08:00
Brad Hefta-Gaub
a1257d1b98 fixed comment that erroneously said wait when it should have said quit 2014-01-16 13:39:55 -08:00
Brad Hefta-Gaub
f3074c1fcc Merge branch 'master' of git://github.com/worklist/hifi into generic_thread_fix 2014-01-16 12:55:55 -08:00
Brad Hefta-Gaub
f97ab1dafe fixes leak of GenericThread and also fixes crash in octree servers on client disconnect 2014-01-16 12:53:32 -08:00
Stephen Birarda
9095874844 fix moveToThread for AssignmentClient NodeList, fixes #1551 2014-01-16 12:30:23 -08:00
ZappoMan
7c4b341f52 Merge pull request #1544 from ZappoMan/windows_build 
Windows build
 2014-01-16 09:38:12 -08:00
Andrew Meadows
1266ffd0ca merge of windows-build 
Conflicts:
	domain-server/src/DomainServer.cpp
	interface/src/Application.cpp
	interface/src/Menu.cpp
	libraries/avatars/src/AvatarData.h
	libraries/shared/src/NodeList.h
 2014-01-16 09:00:13 -08:00
Andrew Meadows
a7600c06dd cruft removal 2014-01-15 17:12:53 -08:00
Andrew Meadows
4e51aee00b Merge latest upstream into local repo. 2014-01-15 17:04:33 -08:00
Stephen Birarda
0c22aa241f leverage invokeMethod to make sure killNodeWithUUID is called on right thread 2014-01-15 16:10:51 -08:00
Brad Hefta-Gaub
f2e3990ea7 Merge branch 'windows_build' of https://github.com/ZappoMan/hifi into windows_build 2014-01-15 15:22:02 -08:00
Brad Hefta-Gaub
d6eb6d02e2 adjust comment to reflect know issue 2014-01-15 15:21:48 -08:00
Brad Hefta-Gaub
d793bd44ee fix windows sign mismatch warning 2014-01-15 15:08:58 -08:00
Brad Hefta-Gaub
f445a391b7 added back arpa/inet.h and ifaddrs.h for mac and unix 2014-01-15 15:03:03 -08:00
Brad Hefta-Gaub
ff6e9c0416 added back unistd.h for non-windows 2014-01-15 14:59:14 -08:00
Andrew Meadows
32f3621855 merge upstream work into local repo 2014-01-15 14:13:48 -08:00
Andrew Meadows
e4730790c0 bugfix: findSphereDiskPenetration() would never return true 2014-01-15 14:00:32 -08:00
Brad Hefta-Gaub
bd6e30070d Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
 2014-01-15 13:18:25 -08:00
Stephen Birarda
0b52b8266e don't return an iterator from killNodeAtHashIterator 2014-01-15 12:44:46 -08:00
Brad Hefta-Gaub
477840904b Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-15 12:09:26 -08:00
Stephen Birarda
b4438c04c6 return result of QHash value from nodeWithUUID 2014-01-15 11:31:23 -08:00
Brad Hefta-Gaub
170dbe6e85 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	domain-server/src/DomainServer.cpp
	interface/src/Audio.cpp
	interface/src/DataServerClient.cpp
	interface/src/Oscilloscope.cpp
	interface/src/PairingHandler.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Faceshift.cpp
	interface/src/devices/SerialInterface.cpp
	interface/src/renderer/FBXReader.cpp
	libraries/avatars/src/AvatarData.h
	libraries/octree-server/src/OctreeServer.cpp
	libraries/octree-server/src/OctreeServer.h
	libraries/octree/src/ViewFrustum.cpp
	libraries/shared/src/Logging.cpp
	libraries/shared/src/Node.cpp
	libraries/shared/src/Node.h
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
	libraries/shared/src/PerfStat.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/voxels/src/VoxelTree.cpp
	voxel-edit/src/main.cpp
 2014-01-15 10:20:21 -08:00
Stephen Birarda
13dfe91358 remove newlines from Node debug 2014-01-15 09:42:11 -08:00
Andrew Meadows
af3fae7bbf Merge upsteam master into current project (experimental hand paddles) 
Conflicts:
	interface/src/avatar/Avatar.cpp
	libraries/avatars/src/AvatarData.cpp
 2014-01-14 16:39:46 -08:00
Stephen Birarda
e76a37f48b resolve conflicts on merge with upstream master 2014-01-14 16:26:02 -08:00
Andrew Meadows
9847ab3bfd Adding findSphereDiskPenetration() method for hand paddle experiment. 2014-01-14 16:23:35 -08:00
Stephen Birarda
599e3bb9e5 resolve conflicts on merge with upstream master 2014-01-14 16:15:58 -08:00
Stephen Birarda
77ee27e5d7 resolve conflicts on merge with upstream master 2014-01-14 16:12:42 -08:00
Andrew Meadows
eb207efe32 Adding simple CollisionInfo class as data wrapper and a findSphereCollision() method to AgentData API. 2014-01-14 16:11:27 -08:00
Stephen Birarda
8676ac38f9 foreach spacing and reference repairs 2014-01-14 15:54:09 -08:00
Stephen Birarda
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
Stephen Birarda
bdc31a3b48 replace the DomainChangeListener class with a signal/slot combo 2014-01-14 11:38:05 -08:00
Stephen Birarda
fa01383f3f move the NodeList to the thread used for a ThreadedAssignment 2014-01-14 11:26:26 -08:00
Stephen Birarda
e888366fd8 remove unused index variable 2014-01-14 10:57:34 -08:00
Stephen Birarda
5a43c2c66b remove extraneous node destructor debug 2014-01-14 10:53:55 -08:00
Stephen Birarda
718d04bd71 correct iterator push on NodeList clear 2014-01-14 10:53:17 -08:00
Stephen Birarda
66f50c38e3 repair iterator push on silent node removal 2014-01-14 10:48:47 -08:00
Stephen Birarda
ed0ed96029 properly emit signal on silent node removal 2014-01-14 10:28:41 -08:00
Stephen Birarda
57f977668f replace the Node mutex with a QMutex 2014-01-14 10:15:31 -08:00
Stephen Birarda
53d435006c more follow mode cleanup, fix silent node iterator 2014-01-14 10:07:26 -08:00
Stephen Birarda
3ab7a6d9d5 move network packet processing to main thread 2014-01-13 17:58:48 -08:00
Stephen Birarda
1faa2120aa use typedef in NodeList implementation 2014-01-13 17:36:27 -08:00
Stephen Birarda
0579b18426 fix deadlock in silent node removal 2014-01-13 17:33:58 -08:00
Stephen Birarda
6a0c431562 repair add of new node (so it doesn't immediately kill) 2014-01-13 17:29:45 -08:00
Stephen Birarda
677303b5c0 properly hook SharedNodePointer for signals/slots 2014-01-13 17:17:53 -08:00
Stephen Birarda
7d1a64ca8c change NodeList container to QHash with QSharedPointer 2014-01-13 17:09:21 -08:00
Brad Hefta-Gaub
483ac66518 more windows build tweaks, warnings and linking 2014-01-13 11:48:16 -08:00
Brad Hefta-Gaub
55babbf7b6 windows type mismatch warning fixes 2014-01-13 00:30:23 -08:00
Brad Hefta-Gaub
9ccaba3ca8 snprintf windows fixes 2014-01-12 23:26:13 -08:00
Brad Hefta-Gaub
08bb783777 more windows build work 2014-01-12 14:49:15 -08:00
Brad Hefta-Gaub
6bde55898d handle NOMINMAX in cmake 2014-01-10 21:58:55 -08:00
Brad Hefta-Gaub
dec16c8f0b windows build 2014-01-10 21:21:07 -08:00
Brad Hefta-Gaub
b6b2b7f58b first cut at making GenericThread use QThread instead of pthread 2014-01-10 21:16:00 -08:00
Brad Hefta-Gaub
7848d065bc added NOMINMAX before things that possibly include windows.h 2014-01-10 21:01:43 -08:00
Brad Hefta-Gaub
124250b2c2 changed fmax to std::max 2014-01-10 20:38:13 -08:00
Brad Hefta-Gaub
b0f8e21d06 more windows build hackery 2014-01-10 20:36:37 -08:00
Brad Hefta-Gaub
44893b0a8c hackery to get windows to build 2014-01-10 19:58:10 -08:00
Brad Hefta-Gaub
a5c5a35c12 removed sys/time.h for Systime.h on windows 2014-01-10 19:54:20 -08:00
Brad Hefta-Gaub
731209d8cb remove unused PerfStats class more missing header changes 2014-01-10 19:47:23 -08:00
Brad Hefta-Gaub
e55e680e66 tweaks to some variable names since windows has a problem with them 2014-01-10 18:28:18 -08:00
Brad Hefta-Gaub
5725a92cfe get rid of arpa/inet.h and netdb.h 2014-01-10 18:13:23 -08:00
Brad Hefta-Gaub
9bc4a3df41 switch from pthread mutex to QMutex 2014-01-10 18:01:36 -08:00
Brad Hefta-Gaub
2c30b8b5b4 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-10 17:36:53 -08:00
Brad Hefta-Gaub
f6d775e3e1 remove timeval and unistd.h 2014-01-10 17:27:23 -08:00
Andrew Meadows
c61f071ab7 merge of latest upstream work in preparation for pull request #1500 
Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-10 17:03:45 -08:00
Andrew Meadows
f2d0d445c2 yet another merge after competing pull requests 2014-01-10 16:03:48 -08:00
Andrzej Kapolka
de0472cfc1 Merge pull request #1498 from birarda/remove-curl 
remove curl dependency by removing starfield loading from URL
 2014-01-10 16:02:17 -08:00
Andrew Meadows
8799ad133e merge again after some competing pull requests were processed 2014-01-10 16:00:08 -08:00
Andrew Meadows
d28ed70ca9 merge pull request 1446 2014-01-10 15:55:38 -08:00
Stephen Birarda
1c3259c8cf remove the starfield URL loading code, closes #1497 2014-01-10 15:33:43 -08:00
Brad Hefta-Gaub
c181d0a849 first cut at local voxel cache 2014-01-09 12:05:09 -08:00
Andrzej Kapolka
1bd069c4e2 Removed unused variable. 2014-01-03 17:56:55 -08:00
Andrzej Kapolka
c2af9becba Ray/capsule intersection test. 2014-01-03 17:48:58 -08:00
Andrzej Kapolka
aa9fc290a5 Minimum chat circle radius from Ryan, basic avatar/voxel orbit behavior. 2014-01-03 16:46:11 -08:00
Andrew Meadows
bce39e916a Pulling latest worklist/hifi into local repo 2014-01-03 16:10:21 -08:00
Andrew Meadows
ea88f00ce5 Name changes, formatting, and comments for readability. 2014-01-03 16:01:31 -08:00
ZappoMan
ec1f08b140 Merge pull request #1443 from birarda/master 
open up more audio to JS
 2014-01-03 10:12:44 -08:00
Stephen Birarda
f24eff33fe open up ASI playSound method to ScriptEngine 2014-01-03 09:38:05 -08:00
Andrew Meadows
930d9957f3 Changed argument names in collision methods for improved readability. 2014-01-02 16:09:41 -08:00
ZappoMan
f1da6bf90b fix various compiler warnings on gcc 2014-01-02 15:58:03 -08:00
Stojce Slavkovski
31fa8ad1fb Merge branch 'master' of https://github.com/worklist/hifi into 19463 2014-01-02 21:06:28 +01:00
Stephen Birarda
591876eaf3 notify for node kill on NodeList clear 2014-01-02 10:01:47 -08:00
Stojce Slavkovski
840d1a33ef Reveal log file 
- change log location lo application data folder
- reveal file in Finder (Explorer) implementation
 2013-12-23 21:23:47 +01:00
Philip Rosedale
a6c2334f49 Merge pull request #1414 from birarda/injected-audio 
C++ API for Audio Injection of samples from URL
 2013-12-19 16:41:55 -08:00
Stephen Birarda
80a2bd0844 move _shouldLoopbackForNode to PositionalAudioRingBuffer for access in injector 2013-12-19 15:44:04 -08:00
ZappoMan
90a2fd31ef fixed spacing 2013-12-19 15:17:29 -08:00
ZappoMan
d71bc248f4 support adjusting particles based on clockSkew 2013-12-19 14:49:58 -08:00
ZappoMan
bfbaf265dd first cut at added clockSkew support to nodes and PING/PING_REPLY 2013-12-19 13:14:14 -08:00
ZappoMan
e2b7e08398 revert back to timestamps, fix a couple other bugs 2013-12-19 09:50:53 -08:00
Philip Rosedale
9980065659 Merge pull request #1406 from ZappoMan/particle_blinky_bug 
Fix Particle Blinkiness on Clock Skew, and remove all global time stamps from wire formats
 2013-12-18 20:02:38 -08:00
ZappoMan
5b36953e81 cleanup clockSkew debug options and remove some chatty logs 2013-12-18 19:33:52 -08:00
Andrzej Kapolka
f10dccb1b8 Fix for menu shortcuts; just include widget library rather than using awkward 
workaround.
 2013-12-18 17:28:21 -08:00
ZappoMan
1badc8dc5d first pass at removing timestamps from particles removed _lastUpdated/getLastUpdated() 2013-12-18 16:59:36 -08:00
ZappoMan
6b0d7c30f0 added debugging option for forced clock skew 2013-12-18 16:58:49 -08:00
ZappoMan
4bfdce3910 Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface 
Conflicts:
	libraries/avatars/src/HandData.h
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2013-12-17 15:25:12 -08:00
ZappoMan
a6e6205a57 first cut at scriptable controller 2013-12-17 15:23:09 -08:00
ZappoMan
7b3a778fb4 get Agent working with ScriptEngine 2013-12-17 14:13:16 -08:00
ZappoMan
ccd6058412 get abstract menu class to work 2013-12-17 13:55:17 -08:00
ZappoMan
5c946090db Merge branch 'master' of https://github.com/worklist/hifi into agent_script_engine_refactor 2013-12-17 13:34:13 -08:00
ZappoMan
11a5ff2eb8 added edited times to particles and don't change local tree if particle has not been edited 2013-12-17 12:39:35 -08:00
ZappoMan
95639c7ce7 first cut, not working yet 2013-12-17 10:58:36 -08:00
ZappoMan
8f1fbec057 added versioning to SVO files and Particle inHand support 2013-12-16 19:49:22 -08:00
ZappoMan
32c2aef29b temp remove debug verbosity 2013-12-16 11:36:19 -08:00
ZappoMan
f9b7c23857 correct handleing of app shutdown and scripting enging termination 2013-12-16 11:26:30 -08:00
ZappoMan
524a41468c multiple scripts running at same time, menu interface for scripts 2013-12-16 09:16:51 -08:00
ZappoMan
aaf4ff7dfc added lifetime to particles 2013-12-13 14:30:29 -08:00
ZappoMan
03c72134cb first cut at creatorTokenIDs for creating particles 2013-12-11 15:38:52 -08:00
ZappoMan
55c3e81801 added new file 2013-12-10 15:51:57 -08:00
ZappoMan
542019a491 add script to the particle wire and disk format 2013-12-10 15:28:59 -08:00
ZappoMan
7a828794be more work with particles added javascript support to particle update 2013-12-10 11:27:18 -08:00
ZappoMan
2ca628fdf1 first cut at particle renderer cleanup particle jurisdiction listener fix storage of particles 2013-12-09 11:45:32 -08:00
ZappoMan
3d2a00b732 Merge branch 'master' of https://github.com/worklist/hifi into particle_details 
Conflicts:
	animation-server/src/main.cpp
 2013-12-06 16:03:02 -08:00
ZappoMan
ba83fa462d Merge pull request #1336 from birarda/master 
some NodeList cleanup
 2013-12-06 15:59:33 -08:00
ZappoMan
91ffb5b167 added node type to jurisdiction messages and more work on particle editing 2013-12-06 15:56:51 -08:00
Stephen Birarda
04b13149b5 remove unneeded include in NodeList 2013-12-05 17:39:37 -08:00
Stephen Birarda
c2e11e8d8c more NodeList cleanup 2013-12-05 17:39:02 -08:00
Stephen Birarda
8f4e641ade remove NodeList threads that are deprecated 2013-12-05 17:11:58 -08:00
Andrzej Kapolka
d374716c7d Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 17:09:19 -08:00
Philip Rosedale
3f957bbf5d Rave out! 2013-12-05 16:46:11 -08:00
Andrzej Kapolka
9ecef89c6c Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 15:36:56 -08:00
Andrzej Kapolka
ecff3a0542 Basic sphere/capsule-cone penetration test. 2013-12-05 15:36:34 -08:00
Stephen Birarda
3f9e00d977 fix a boneheaded mistake in AvatarMixer broadcastAvatarData 2013-12-05 15:10:01 -08:00
ZappoMan
aec0e9f4aa added basic particle server renamed voxel packet names to fit standard 2013-12-04 21:00:00 -08:00
ZappoMan
2b27c91550 Merge branch 'master' of https://github.com/worklist/hifi into particle_server 
Conflicts:
	interface/src/VoxelSystem.cpp
	interface/src/VoxelSystem.h
 2013-12-04 11:40:54 -08:00
Stephen Birarda
eb316a450a Merge pull request #1298 from ZappoMan/move_hideshow_to_thread 
Move Hide/Show local voxels to a dedicated thread
 2013-12-04 11:27:14 -08:00
ZappoMan
2cb46c3447 added DEADBEEF support to debug class 2013-12-04 10:37:10 -08:00
ZappoMan
d7ae023492 make addChildAtIndex() use createNewElement() so we get our correct classes 2013-12-03 20:40:40 -08:00
ZappoMan
9faef65ccc first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00
Stephen Birarda
da580ecbaf fix inclusion of QThread in Assignment 2013-12-03 12:31:39 -08:00
Stephen Birarda
3277cb49a6 Merge remote-tracking branch 'upstream/master' into cleanup 2013-12-03 12:21:03 -08:00
Stephen Birarda
6f7e16dc22 hook VS to new QCA infrastructure 2013-12-03 11:11:08 -08:00
Stephen Birarda
606eaa579a switch node pinging to QTimer in QCoreApplication instance 2013-12-03 10:57:31 -08:00
Stephen Birarda
c3b6a7b24c setup subclass for threaded assignments 2013-12-03 10:22:13 -08:00
Stephen Birarda
330eff72ce repair usage of DS as STUN server 2013-12-02 17:18:07 -08:00
Stephen Birarda
1e279cf99c hook AudioMixer to new event-driven assignment setup 2013-12-02 16:34:38 -08:00
Stephen Birarda
49191826af add check for pending datagrams before read 2013-12-02 14:08:49 -08:00
Stephen Birarda
141394a664 replace UDPSocket with QUDPSocket 2013-12-02 13:34:29 -08:00
ZappoMan
76b3bd4e6e Move Hide/Show local voxels to a dedicated thread so that it doesn't slow performance of voxel packet processing 2013-12-02 12:08:45 -08:00
ZappoMan
a3b69c1e75 bumb version number of PACKET_TYPE_VOXEL_QUERY 2013-11-27 15:55:49 -08:00
ZappoMan
0e501f4439 Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets 
Conflicts:
	interface/src/Menu.cpp
	interface/src/Menu.h
 2013-11-27 15:44:51 -08:00
ZappoMan
491512fbce major pass on cleaning up voxel packets to have flags, sequence numbers, and flight time, add compression menu item 2013-11-26 17:26:54 -08:00
ZappoMan
70213630e1 Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets 2013-11-25 13:38:22 -08:00
Philip Rosedale
d7b1eae446 Merge branch 'master' of https://github.com/worklist/hifi 2013-11-25 09:45:27 -08:00
Philip Rosedale
62c882b788 Rounding numbers 2013-11-25 09:44:40 -08:00
ZappoMan
17f5530893 fixed wasted bitmasks bug where we would include colors and extra layers 2013-11-25 01:42:19 -08:00
ZappoMan
25511f99ec cleanup for coding standard 2013-11-24 15:22:44 -08:00
ZappoMan
e65f74e06b moved compression into VoxelPacket class. works, but too slow for larger sizes 2013-11-23 21:40:50 -08:00
ZappoMan
cd1d3765a9 cleaned up const semantics and DRYed up appendBitMask 2013-11-23 16:28:21 -08:00
ZappoMan
0f66f4c1bd Revert "cleaned up some comments and code" 
This reverts commit 99c427c97d.
 2013-11-23 16:19:57 -08:00
ZappoMan
99c427c97d cleaned up some comments and code 2013-11-23 16:18:18 -08:00
ZappoMan
11d7cb64c2 switch back to qDebug 2013-11-23 13:42:11 -08:00
Andrzej Kapolka
092515e199 Send an explicit kill request to the avatar mixer (which will pass it along to 
the other clients) when we exit.
 2013-11-22 15:19:59 -08:00
ZappoMan
e0c55be4e2 more debug 2013-11-21 15:21:29 -08:00
ZappoMan
3d20152c36 use node->trylock() in VoxelSendThread() to handle shutdown race condition 2013-11-13 15:11:43 -08:00
ZappoMan
d9ed6443db style cleanup, correct some comments 2013-11-10 14:06:44 -08:00
ZappoMan
eb73de6b67 added a couple more JS APIs and removed some debug code 2013-11-10 12:33:54 -08:00
ZappoMan
1a6efea5c0 improvements to PPS behavior of PacketSender 2013-11-10 10:39:56 -08:00
ZappoMan
a9c5c0707f added sentAt timestamps to voxel edit packets so we can measure transit time 2013-11-08 10:32:46 -08:00
ZappoMan
b0a4ffb11c fix comments line breaks 2013-11-08 02:27:34 -08:00
ZappoMan
3da6062639 fix comment 2013-11-08 02:26:23 -08:00
ZappoMan
a708486834 fix comment 2013-11-08 02:25:51 -08:00
ZappoMan
8043970df7 bug fixes to JurisdictionListener, PacketSender, addition of packetsToSendCount() to Voxels JS 2013-11-08 02:22:10 -08:00
ZappoMan
19515c80fd Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats 
Conflicts:
	interface/src/Application.cpp
 2013-11-07 16:44:34 -08:00
Stephen Birarda
5889d4122f use virtual deleteOrDeleteLater in NodeData to handle AvatarVoxelSystem 2013-11-07 15:41:10 -08:00
Stephen Birarda
9aacda7d56 fix for AC lack of QCoreApplication 2013-11-07 14:34:01 -08:00
Stephen Birarda
72b2309dc0 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-11-07 12:43:58 -08:00
Stephen Birarda
24c88512e2 only attempt to deleteLater on linkedData if it exists 2013-11-07 12:41:29 -08:00
Stephen Birarda
fe962e6be1 only call deleteLater for linkedData if we have a QCoreApplication instance 2013-11-07 12:38:28 -08:00
ZappoMan
93ad1c3f99 make temp copy of NetworkPacket to protect against vector resizing 2013-11-05 15:11:31 -08:00
ZappoMan
318b9b1671 make temp copy of NetworkPacket to protect against vector resizing 2013-11-05 14:50:49 -08:00
ZappoMan
406d42fe87 added more debugging 2013-11-05 14:27:20 -08:00
ZappoMan
1c580551bb added more debugging 2013-11-05 13:47:58 -08:00
ZappoMan
6dc7f68f0e Merge pull request #1185 from birarda/assignment 
add helper to ping if no active socket
 2013-11-05 12:55:06 -08:00
Stephen Birarda
771021995b add helper to ping with inactive socket 2013-11-05 12:34:56 -08:00
ZappoMan
e296be8c7a make numberOfThreeBitSectionsInCode() robust against overflowing buffers if length is known 2013-11-05 12:31:20 -08:00
ZappoMan
581e0adecf Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats 
Conflicts:
	interface/src/Application.cpp
 2013-11-05 10:45:30 -08:00
ZappoMan
09dab892d3 first cut at new voxel scene stats 2013-11-05 10:29:56 -08:00
ZappoMan
c18de72dd4 work on debugging stutter behavior, mostly debugging and cleanup 2013-11-03 19:06:06 -08:00
Stephen Birarda
5b505bcc95 just use default to catch unknown Qt message types 2013-10-31 14:16:30 -07:00
Stephen Birarda
bfe7c82232 add default and QtTraceMsg to switch to avoid warnings 2013-10-31 14:10:08 -07:00
ZappoMan
3a6f8ea66b Merge branch 'master' of https://github.com/worklist/hifi into lod_slider 2013-10-30 12:04:52 -07:00
ZappoMan
fbc3a4d2c1 first cut at user adjustable LOD 2013-10-29 16:16:58 -07:00
Stephen Birarda
03b23b504f reference global with colon 2013-10-29 16:05:23 -07:00
Stephen Birarda
66b27fa607 have silent node removal flag reset on join 2013-10-29 15:59:09 -07:00
Stephen Birarda
6e9ee93ed6 add debug for sleep amount to AvatarMixer 2013-10-29 15:28:10 -07:00
Stephen Birarda
08a368a9fd add debug to catch AvatarMixer ghosting 2013-10-29 15:21:55 -07:00
Stephen Birarda
3df07d344f have assignment client pay attention to jurisdictions 2013-10-25 11:39:21 -07:00
Stephen Birarda
8aad3e146f avoid a divide by zero in PacketSender 2013-10-25 10:49:35 -07:00
Stephen Birarda
67050f5cd2 fix Assignment ctor from data to properly parse payload 2013-10-25 10:34:58 -07:00
Stephen Birarda
9dbbf8c65c don't alloc memory for checkInPacket, make it stack to function 2013-10-25 09:22:23 -07:00
ZappoMan
9492c3de18 various memory leaks and compiler warning fixes 2013-10-25 00:05:52 -07:00
ZappoMan
015adeedcb first cut at splitting out PACKET_TYPE_VOXEL_QUERY from PACKET_TYPE_HEAD_DATA 2013-10-24 13:22:31 -07:00
Stephen Birarda
d85ed014ba switch to bootstrap 3, complete initial index page 2013-10-23 14:43:59 -07:00
Stephen Birarda
1eba133a6d use char array of static length for pool 2013-10-22 13:35:26 -07:00
Stephen Birarda
b4a2214d26 add notion of pool back to assignment 2013-10-22 11:43:06 -07:00
Philip Rosedale
cab9e7f658 Merge pull request #1094 from birarda/assignment 
allow multiple buffers to be hooked to an individual node
 2013-10-21 20:29:10 -07:00
ZappoMan
1b302f60f8 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-10-21 16:03:53 -07:00
ZappoMan
2f423e66eb fixed long line 2013-10-21 14:43:55 -07:00
Stephen Birarda
1b129a43b5 initial changes to allow for multiple buffers per client 2013-10-21 14:27:55 -07:00
Stephen Birarda
0dd16cfc1e debug a STUN reponse that only changes port 2013-10-18 15:27:35 -07:00
Stephen Birarda
32680bbaad continued STUN requests for keepalive, propagate socket changes 2013-10-18 15:05:16 -07:00
Stephen Birarda
d85c0bb88a add a DELETE method to civetweb to delete assignment by UUID 2013-10-18 10:25:35 -07:00
Stephen Birarda
11a05481e1 remove an infamous birarda extra g 2013-10-17 17:54:52 -07:00
Stephen Birarda
ded7735572 remove crazy debug from testing 2013-10-17 17:54:25 -07:00
Stephen Birarda
a4798acb22 bring ping interval back to 1 second 2013-10-17 17:35:24 -07:00
Stephen Birarda
b25487cda3 increase the ping interval 2013-10-17 17:33:34 -07:00
Stephen Birarda
65e0670eba Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-17 17:25:21 -07:00
Stephen Birarda
19e6f668d2 add debug to test hole punching 2013-10-17 17:25:14 -07:00
Stephen Birarda
bd806241fd don't attempt to send in UDPSocket with NULL destAddress 2013-10-17 17:01:15 -07:00
Stephen Birarda
b4ef3dbd8a add ping/reply to assignment-client servers 2013-10-17 16:56:52 -07:00
Stephen Birarda
75d8934961 fix pinging of agents in broadcast to nodes 2013-10-17 16:46:49 -07:00
Stephen Birarda
87d6c0085f add a fallback if STUN to outside server isn't possible 2013-10-17 15:11:02 -07:00
Stephen Birarda
4bbb59be72 fix use of htonl in constant outside function 2013-10-17 14:45:38 -07:00
Stephen Birarda
73d3ecccf3 resolve conflicts on merge with upstream master 2013-10-17 14:37:58 -07:00
Stephen Birarda
8f1135feb7 more repairs to Agent and AvatarData for UUID transition 2013-10-17 14:35:42 -07:00
Stephen Birarda
74e66dfd35 push various PACKET_TYPES, repairs to Agent for UUID setup 2013-10-17 13:35:53 -07:00
ZappoMan
d566026026 Merge branch 'master' of https://github.com/worklist/hifi into voxelnode_memory_savings 2013-10-17 12:31:31 -07:00
ZappoMan
fbf1a75d07 cleanup dead code 2013-10-17 12:24:53 -07:00
Stephen Birarda
fa146e302d remove 16-bit node IDs and replace with UUIDs 2013-10-17 11:49:41 -07:00
Stephen Birarda
012fccc72e send ping to AvM and VS for socket activation 2013-10-16 18:01:15 -07:00
Stephen Birarda
7de88898e1 activate appropriate socket after receiving ping reply 2013-10-16 17:51:32 -07:00
Stephen Birarda
849e5817ec remove a couple of spaces 2013-10-16 17:27:16 -07:00
Stephen Birarda
330e78920a use Qt to query interfaces for correct local address 2013-10-16 17:06:39 -07:00
Stephen Birarda
e40ab5d13f add debug of Node's local address 2013-10-16 16:52:05 -07:00
Stephen Birarda
224b0d9671 domain server accepts custom public address from node 2013-10-16 16:27:13 -07:00
Stephen Birarda
f581d4d976 handle STUN request and response in NodeList 2013-10-16 16:01:23 -07:00
ZappoMan
1e5ce8a7e5 first cut at really getting _children UNION to work 2013-10-16 12:54:37 -07:00
ZappoMan
afcf6dd3e0 type squish 2013-10-15 18:28:56 -07:00
Stephen Birarda
1ed2b3d8fe add both fulfilled and queued assignments to DS json 2013-10-15 15:38:43 -07:00
ZappoMan
6fff53a2dc next round of voxelnode size improvements 2013-10-15 14:43:51 -07:00
ZappoMan
c9b0edf345 first cut at reducing memory footprint of AABox 2013-10-15 11:29:04 -07:00
Stephen Birarda
5ca805693c reset nodeTypesOfInterest on NodeList reset 2013-10-11 17:48:54 -07:00
Stephen Birarda
0eae0f129c allow audio injection from javascript 2013-10-11 17:37:48 -07:00
Stephen Birarda
515e2d5a23 handle conflicts on merge with upstream master 2013-10-11 14:24:05 -07:00
Stephen Birarda
8be527f85d remove sleep time debug 2013-10-11 11:15:10 -07:00
Stephen Birarda
13ac5472ea fix an idiotic bug with silent node kill thread 2013-10-11 10:23:59 -07:00
Stephen Birarda
60095bcbca add debug on NodeList clear 2013-10-11 10:08:28 -07:00
Philip Rosedale
53e2486d4d Merge pull request #1045 from birarda/data-server 
fix bug with constant avatar kill/adds
 2013-10-10 18:05:23 -07:00
Stephen Birarda
7d68c79fd8 fix bug with constant avatar kill adds 2013-10-10 17:40:01 -07:00
Stephen Birarda
aa0a97b959 use deleteLater to ensure that AvatarVoxelSystem delete is on correct thread 2013-10-10 16:23:22 -07:00
Philip Rosedale
3a92856386 Merge pull request #1029 from birarda/nameserver 
initial revision of storing user data in data-server
 2013-10-09 11:36:36 -07:00
Stephen Birarda
36a57e2a98 remove more debugging in NodeList 2013-10-09 10:42:33 -07:00
Stephen Birarda
7d69c6f211 remove extraneous debugging in NodeList 2013-10-09 10:41:33 -07:00
Stephen Birarda
6fe0b0b124 don’t have AvatarMixer ask DS for agents 2013-10-09 10:40:19 -07:00
Stephen Birarda
6bd71da84e pack the UUID with the avatar data 2013-10-08 13:31:39 -07:00
Stephen Birarda
892614470e Merge branch 'master' of github.com:worklist/hifi into nameserver 2013-10-08 11:19:32 -07:00
Stephen Birarda
40dd698293 don’t have AvatarMixer ask DS for agents 2013-10-08 11:07:46 -07:00
Stephen Birarda
76cecb43cf Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-08 09:59:52 -07:00
ZappoMan
8baa863242 fixed PPS bugs in threaded version of PacketSender class 2013-10-07 17:34:41 -07:00
Stephen Birarda
5a7d21f529 add UUID helper class to get UUID string without braces 2013-10-07 10:56:23 -07:00
Stephen Birarda
13232a4c0b stubbing of mechanism to confirm packets sent to data server 2013-10-07 10:45:54 -07:00
Stephen Birarda
4cc9f29c83 initial stub of data server client code in Interface 2013-10-07 09:55:08 -07:00
ZappoMan
5f6fb3a3ae added some timing debugging 2013-10-05 00:55:34 -07:00
Stephen Birarda
f8bb2661c8 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-04 13:30:27 -07:00
Stephen Birarda
e977d28fe3 replace QVariantMap glm::vec3 setters with conversions for QScriptValue 2013-10-03 11:55:30 -07:00
ZappoMan
84862310d1 fix sendVoxelEditMessage() to honor jurisdictions, cleanup some threading/nonthreading behavior in PacketSender 2013-10-03 10:25:00 -07:00
ZappoMan
9d231a50b6 implement support for process interval hints and handling sending only some packets per call to process in non-threaded mode 2013-10-02 20:39:58 -07:00
ZappoMan
f94f535254 make sure sleep is never too long 2013-10-02 17:00:46 -07:00
ZappoMan
90c64ab25c more work on handleing pending packets in VoxelEditPacketSender 2013-10-02 16:33:06 -07:00
ZappoMan
cc0009976b first cut and handling buffering of edit packets when voxel servers are unknown 2013-10-02 15:02:23 -07:00
Stephen Birarda
fb27e37607 have AC making create request use its own UUID 2013-09-30 14:09:46 -07:00
Stephen Birarda
32314ad540 have VS send UUID with check in for static assignment behavior 2013-09-30 13:34:22 -07:00
Stephen Birarda
38873c0693 some assignment debug cleanup 2013-09-30 13:26:31 -07:00
Stephen Birarda
0e5c5886b6 touchups to DS with static assignment file 2013-09-30 13:11:46 -07:00
Stephen Birarda
a8d55644e9 Assignment as LinkedData, add back to queue on node death 2013-09-30 11:04:42 -07:00
Stephen Birarda
ef1ff01188 resolve conflicts on merge with upstream/master 2013-09-30 10:12:54 -07:00
stojce
a0f23d409e Merging changes 2013-09-28 13:16:50 +02:00
stojce
bac228bdb8 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-28 12:47:47 +02:00
Stephen Birarda
db1dacbbf4 some refactoring for DS, add create assignments to file 2013-09-26 15:56:41 -07:00
Andrzej Kapolka
91999dfe1f Pupil dilation. 2013-09-26 15:48:11 -07:00
Stephen Birarda
70c5d3e349 decouple DS from main, move to C++11 2013-09-26 15:03:43 -07:00
Stephen Birarda
bed4819313 inital setup for static assignment mapped file 2013-09-24 14:41:26 -07:00
Stephen Birarda
e774419f8d Merge branch 'master' of github.com:worklist/hifi into assignment 2013-09-20 17:39:03 -07:00
Stephen Birarda
6533d7fcde add method to packet sender to flush queue without sleep 2013-09-20 14:40:09 -07:00
Andrzej Kapolka
5c841616dc Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-19 16:37:26 -07:00
Andrzej Kapolka
a04ced633e Include the face model URL in the same packet as the avatar voxel URL. 2013-09-19 16:35:25 -07:00
Andrzej Kapolka
09fa782c61 More work on FBX reading. 2013-09-19 15:05:17 -07:00
Stephen Birarda
23e7278be5 re-use the check in packet sent to the domain-server, allow reset 2013-09-19 12:58:48 -07:00
Stephen Birarda
92c106a6bb refresh the UUID when sending out new AM assignments 2013-09-19 12:30:40 -07:00
Stephen Birarda
de276eff00 temporary removal of DS packet optimization for NodeList dynamism 2013-09-18 17:56:45 -07:00
Stephen Birarda
3b976500ce stylistic and memory management fixes 2013-09-18 17:55:13 -07:00
Stephen Birarda
7b498edcbc remove attached public and local sockets, fully allow custom port 2013-09-18 17:03:14 -07:00
Stephen Birarda
b4f9e393a4 prefer IPv4 address when looking up for domain IP 2013-09-18 15:05:23 -07:00
Stephen Birarda
a9efa169be fix ordering of QHostAdress to s_addr 2013-09-18 14:58:44 -07:00
Stephen Birarda
b0421cb9d3 Merge pull request #953 from ZappoMan/multi_VS_assigments 
Handle --voxelServerConfig properly
 2013-09-18 14:20:12 -07:00
ZappoMan
a81d5cd9a7 Merge pull request #954 from birarda/ds-port 
allow setting of custom DS port from DS and clients
 2013-09-18 14:07:11 -07:00
Stephen Birarda
9fa695b71c allow setting of custom port via domainHostname setting 2013-09-18 13:50:14 -07:00
Stephen Birarda
ab85c4109d use QHostInfo and QHostAddress for DS changes in NodeList 2013-09-18 13:29:53 -07:00
ZappoMan
b3bcda2227 Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments 2013-09-18 13:20:17 -07:00
Stephen Birarda
8c9a14cdbe CR fix to change back to setPayload with const param 2013-09-18 13:09:07 -07:00
Stephen Birarda
7220643fe9 default AC to point to DS on localhost and default port 2013-09-18 12:04:09 -07:00
Stephen Birarda
3fde2887a3 fixes to payload in Assignment 2013-09-18 10:19:45 -07:00
ZappoMan
06f739a623 pass voxelServerConfig from domain-server through Assignment _payload to VoxelServer 2013-09-18 07:23:37 -07:00
ZappoMan
4a821d0874 Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments 2013-09-17 17:35:13 -07:00
Stephen Birarda
001432ec55 have domain-server reject audio and avatar mixers with bad UUID 2013-09-17 16:40:30 -07:00
ZappoMan
49c4075277 Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments 2013-09-17 16:00:32 -07:00
Stephen Birarda
17a210813b repairs to subclasses of assignment 2013-09-17 15:20:34 -07:00
Stephen Birarda
d830351ed6 make the assignment targets subclasses of Assignment for access to UUID 2013-09-17 14:54:58 -07:00
ZappoMan
25d9281496 Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments 2013-09-17 13:41:44 -07:00
ZappoMan
386250cff8 remove hacked payloads 2013-09-17 13:41:04 -07:00
Stephen Birarda
fb7927d326 cleanup check for attached socket 2013-09-17 13:28:19 -07:00
Stephen Birarda
3f2dc7a28d add a getter for the number of bytes in the payload 2013-09-17 13:27:17 -07:00
Stephen Birarda
94f04a9806 add API to attach payloads to assignments 2013-09-17 13:24:25 -07:00
ZappoMan
4932c3266f moving to Assignment payload style implementation 2013-09-17 13:22:09 -07:00
Stephen Birarda
74a0b8a7b5 resolve conflicts on merge with upstream master 2013-09-17 11:50:30 -07:00
Stephen Birarda
76df707e31 add the ability to ask for multiple instances from JS page 2013-09-17 11:48:08 -07:00
Stephen Birarda
0e19d9a53a add handling for number of instances to domain-server 2013-09-17 11:19:13 -07:00
ZappoMan
92fb393e14 allow standalone voxel-server to specify port and domain, add VoxelServerType to assignment-client 2013-09-16 19:34:07 -07:00
atlante45
c2502d03db Merge branch 'master' of https://github.com/worklist/hifi into add_fs_data_in_head_data 2013-09-13 13:25:41 -07:00
atlante45
7ae1f649c9 changed packet format 2013-09-13 11:17:55 -07:00
Stephen Birarda
d089991237 add handling of Agent assignments to Assignment, DS, AC 2013-09-13 11:14:00 -07:00
Stephen Birarda
8d7b4ab321 add debugging for assignment send and remove a useless cast 2013-09-12 17:37:37 -07:00
Stephen Birarda
49b72370be fix UUID getter to match the private variable 2013-09-12 17:08:06 -07:00
Stephen Birarda
f878b17798 fix DS reply to node on same box to remove check in AC 2013-09-12 17:03:05 -07:00
Stephen Birarda
2578516940 talk to AC on loopback when on same node 2013-09-12 16:47:06 -07:00
Stephen Birarda
25cd800ab4 create a UUID with assignments, store JS for script 2013-09-12 16:18:53 -07:00
Stephen Birarda
dfede2b947 rename direction to command for assignment 2013-09-11 14:43:37 -07:00
Stephen Birarda
b7aa49cf97 have DS act as AS and hand assignments directly 2013-09-11 12:16:47 -07:00
stojce
a362fdc2ed name the current domain server 2013-09-10 21:51:50 +02:00
Stephen Birarda
fb8c9dbfea fix spacing in Assignment 2013-09-10 09:58:42 -07:00
Stephen Birarda
fa521a5dc9 handle case where AC is on same network as DS but not AS 2013-09-09 18:15:33 -07:00
Stephen Birarda
e53807ca82 store an attached local and public socket with assignment 2013-09-09 17:29:33 -07:00
Stephen Birarda
97803b827e pack destination socket for assignment as tightly as possible 2013-09-09 16:45:44 -07:00
Stephen Birarda
1c792cf46a some newline additions for logging in NodeList 2013-09-09 15:35:28 -07:00
Stephen Birarda
bbc051a764 add doxygen comments to refactored Logging class 2013-09-09 15:27:27 -07:00
Stephen Birarda
613334074f leverage qDebug and custom message handler for verbose logging 2013-09-09 15:11:11 -07:00
Stephen Birarda
b0c9dfeddc more leveraging of standardized logging 2013-09-09 14:47:15 -07:00
Stephen Birarda
fe8fabee38 add a static method to the Logging class to change target name 2013-09-09 14:31:27 -07:00
Stephen Birarda
8077963bb1 add standardized logging and leverage forked assignment clients 2013-09-09 14:21:33 -07:00
Stephen Birarda
4905032090 allow forking of multiple assignment-clients from the main target 2013-09-09 09:44:43 -07:00
Stephen Birarda
cbf8a2c202 use create time already being stored with assignment to decide on re-send 2013-09-06 16:03:54 -07:00
Stephen Birarda
65ef778efd allow passing of custom assignment-server to DS and AC 2013-09-06 15:31:21 -07:00
Stephen Birarda
3b78678a76 cleanup pool grabbing for DS and AC 2013-09-06 15:21:55 -07:00
Stephen Birarda
f18a40dc89 correct timing for assignment-client check in 2013-09-06 15:12:53 -07:00
Stephen Birarda
9eef894e24 add doxygen documentation for Assignment classes 2013-09-06 14:35:59 -07:00
Stephen Birarda
0262184c12 put back DS port numbers, remove magic IPv numbers 2013-09-06 11:29:04 -07:00
Stephen Birarda
d412e0611d Merge branch 'master' of github.com:worklist/hifi into assignment 2013-09-06 11:04:18 -07:00
Stephen Birarda
eb84bdbeed switch back to the proper assignment server 2013-09-06 11:02:36 -07:00
Stephen Birarda
d8611e408e clear stale assignments from queue, fix CPU usage in client 2013-09-06 10:59:20 -07:00
Stephen Birarda
f7b0158cfe use deque of pointers, make sure DS silent count is refreshed 2013-09-06 10:26:29 -07:00
Stephen Birarda
9244ec1c25 have client keep track of number of silent DS checkins 2013-09-06 09:41:27 -07:00
Stephen Birarda
67299b0eea fix some memory management stupidity for Assignments 2013-09-05 17:54:37 -07:00
Stephen Birarda
54b50e0e76 add a destructor for Assignment 2013-09-05 17:42:57 -07:00
Stephen Birarda
21562abfb1 don't add a second instance of a solo node 2013-09-05 17:29:14 -07:00
Stephen Birarda
8b601cac0a moved the AvatarMixer to a class the assignment-client can handle 2013-09-05 14:01:05 -07:00
Stephen Birarda
9dc3ddc84a a temporary hack to make sure the domain-server address is IPv4 2013-09-05 13:46:57 -07:00
Andrzej Kapolka
4961913fc4 Transmit the eye offset position along with the rest of the frustum 
parameters.
 2013-09-05 12:20:15 -07:00
Stephen Birarda
d5e807ca8e change the default domain server port for ec2 assignment client 2013-09-05 12:13:15 -07:00
Stephen Birarda
bd409abd1f switch assignment server back to ec2 2013-09-05 10:46:20 -07:00
Stephen Birarda
2846d170f7 change default NodeList port to 0 for ephemeral 2013-09-04 16:16:03 -07:00
Stephen Birarda
2c32a1a048 correct handling of IPv6, fix offsets for packet reading 2013-09-04 15:21:20 -07:00
atlante45
5da525fc3e memory wastes and code cleaning PR comments 2013-09-04 15:12:24 -07:00
Stephen Birarda
6e736ff9ed correct assignment packing when there is no pool 2013-09-04 13:14:41 -07:00
Stephen Birarda
fa7f183930 add a domain socket to assignments 2013-09-04 13:00:23 -07:00
Stephen Birarda
36c2f42b5c correct copying of assignment pool across targets 2013-09-04 11:50:39 -07:00
Stephen Birarda
ebc7de3a90 add methods for packing and unpacking of Assignments 2013-09-04 11:37:11 -07:00
Stephen Birarda
29e5eda358 add notion of pool and direction to Assignment class 2013-09-04 10:43:16 -07:00
atlante45
b03482ead5 Some more memory leaks and codes formatting 2013-09-03 17:16:06 -07:00
atlante45
688bc17954 Fixed avatar related files memory wastes 2013-09-03 13:37:25 -07:00
Stephen Birarda
232f79489d decouple AM logic from main.cpp to be assignable 2013-08-22 13:12:53 -07:00
Stephen Birarda
97bee1eb82 add a stubbed assignment client to request assignments 2013-08-22 12:30:11 -07:00
Stephen Birarda
ef7e7ae4c5 store senderSocket with assignment to be passed to requestor 2013-08-22 12:08:49 -07:00
Stephen Birarda
2804d286d5 send correctly sized packet for assignment 2013-08-22 11:52:59 -07:00
Stephen Birarda
f52c1c909b send assignment from domain server for audio mixer if it isn't present 2013-08-22 11:38:57 -07:00
Stephen Birarda
f3e4196a81 add an assignment class and begin to hookup AS 2013-08-22 11:21:55 -07:00
ZappoMan
da6bd2e3b0 cleanup, handle no JurisdictionMap case in JurisidictionSender 2013-08-20 11:22:51 -07:00
ZappoMan
436f70ab5d removed dead code 2013-08-20 11:12:22 -07:00
ZappoMan
0f7ea55e82 make animation-server work with jurisdictions 2013-08-20 11:08:20 -07:00
ZappoMan
5e7e6fc9d7 First cut at JurisdictionListener and PACKET_TYPE_VOXEL_JURISDICTION_REQUEST 2013-08-19 20:15:46 -07:00
ZappoMan
2be85d439b Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 
Conflicts:
	interface/src/Application.cpp
	interface/src/VoxelPacketProcessor.cpp
	libraries/voxels/src/VoxelEditPacketSender.cpp
 2013-08-19 11:13:38 -07:00
ZappoMan
e64664c0d1 first cut at JurisdictionSender and related changes 2013-08-19 11:05:29 -07:00
ZappoMan
209c9f93ed remove Application dependency from VoxelEditPacketSender class 2013-08-15 14:21:21 -07:00
ZappoMan
04440d30d8 Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 
Conflicts:
	libraries/voxels/src/JurisdictionMap.h
 2013-08-15 12:27:00 -07:00
Stephen Birarda
443203201e Merge remote-tracking branch 'upstream/master' into menu 2013-08-15 12:22:37 -07:00
ZappoMan
74100ad043 make threads sleep 2013-08-15 12:01:50 -07:00
ZappoMan
8b867df762 style fix 2013-08-15 10:47:59 -07:00
ZappoMan
c157aad775 starting to add PACKET_TYPE_VOXEL_JURISDICTION 2013-08-15 10:44:43 -07:00
ZappoMan
ced61e94d8 added more doxygen comments 2013-08-15 08:48:21 -07:00
ZappoMan
beec5f60d8 renamed class to be more appropriate, added doxygen comments 2013-08-15 08:36:06 -07:00
Stephen Birarda
c7b784aa1f signed UNKNOWN_NODE_ID should be 0 2013-08-14 15:31:23 -07:00
ZappoMan
266d57264b fix build buster 2013-08-14 14:57:23 -07:00
ZappoMan
1730f7f2f6 fix build buster 2013-08-14 14:48:16 -07:00
ZappoMan
18e5d49d75 move move constructors and assignments into IFDEFS for now to fix build buster 2013-08-14 14:46:40 -07:00
ZappoMan
21f521f3a5 fix build buster 2013-08-14 14:33:47 -07:00
ZappoMan
02f2de6101 properly send full jurisdiction details in scene stats 2013-08-13 13:43:46 -07:00
ZappoMan
d3ce3e4e60 some cleanup and fixing of memory issue 2013-08-13 11:37:57 -07:00
ZappoMan
60dedee739 make JurisdictionMap handle copy/move/assigment so that it will work in std::vector<> and std::map<>, switch application to have map of JurisdictionMap objects instead of just root codes 2013-08-13 11:08:43 -07:00
ZappoMan
7d2c69f530 latest work on threaded sending 2013-08-12 16:55:58 -07:00
ZappoMan
ce0c868c89 cleanup naming 2013-08-12 13:40:21 -07:00
ZappoMan
e7b3d41c33 make PacketReceiver derive from GenericThread 2013-08-12 12:04:05 -07:00
ZappoMan
70344cdaf2 move voxel receiving into class 2013-08-12 11:46:57 -07:00
ZappoMan
b5e2bc2093 implement threaded voxel processing 2013-08-10 11:35:59 -07:00
ZappoMan
7e5f03a36f Merge pull request #832 from birarda/assignee 
tweaks to assignment server and AvatarData for assignment to iOS
 2013-08-08 12:13:07 -07:00
Stephen Birarda
2a21ce7945 socket changes to send correct port to pairing server 2013-08-07 16:40:28 -07:00
ZappoMan
9e182bbdc2 removed debug 2013-08-07 11:59:48 -07:00
Stephen Birarda
955b7f0d24 Merge branch 'master' of github.com:worklist/hifi into assignee 2013-08-07 10:26:26 -07:00
ZappoMan
24ec0b0ddc fixed packet header bug in createVoxelEditMessage() 2013-08-06 19:15:05 -07:00
ZappoMan
23461c2e95 fixed crash 2013-08-06 16:26:48 -07:00
ZappoMan
6cf87fc120 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 
Conflicts:
	interface/src/Application.cpp
 2013-08-06 13:49:42 -07:00
ZappoMan
88e2e3dd3f added visulization for voxel add/kill 2013-08-06 12:05:43 -07:00
atlante45
32c155ef71 Render a string to show who is following who 2013-08-06 10:53:10 -07:00
ZappoMan
73510ec975 added notifications with jurisdiction details for when voxel servers come and go 2013-08-06 10:33:09 -07:00
Stephen Birarda
51f978196b add back node type unassigned, fix sending of script URL 2013-08-05 17:21:06 -07:00
ZappoMan
01ba5ee81a adding jurisdiction to scene stats to implement add/drop effect, added command line to voxel server to not send environments 2013-08-05 16:30:08 -07:00
ZappoMan
f1a0edb471 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-05 14:57:10 -07:00
Jeffrey Ventrella
96b443ec5d Merge pull request #781 from machinelevel/dev4 
Rave glove demo: Network rave data
 2013-08-05 14:07:57 -07:00
ZappoMan
14b7f58fef Kills local voxels if voxel server is removed from NodeList 
- added notification hooks to NodeList
- implemented hooks in VoxelSystem to kill local voxels when
  voxel server is killed
 2013-08-05 13:47:18 -07:00
Eric Johnston
a3a5c3d6d4 Rave glove demo: Network rave data 
Sending glove modes over the network, and fixed ghost-fingers-left-behind issue.
Issues addressed:
  https://basecamp.com/2151194/projects/2058851-avatar/todos/54607028-bug-phantom-leap
  https://basecamp.com/2151194/projects/2058851-avatar/todos/54633674-demo-make
 2013-08-05 13:25:05 -07:00
Stephen Birarda
45d84add05 cleanup from code review comments 2013-08-05 10:37:23 -07:00
Stephen Birarda
8f876b91ae changes for stub pull request of assignee work 2013-08-05 10:06:50 -07:00
Stephen Birarda
a4ea0f035a resolve conflicts on merge with upstream master 2013-08-05 09:56:07 -07:00
ZappoMan
558fca7936 latest jurisdiction work 2013-08-02 11:12:33 -07:00
ZappoMan
983db5f70d Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-01 20:50:24 -07:00
Stephen Birarda
2b0cfe3c67 resolve conflicts on merge with upstream master 2013-08-01 14:33:23 -07:00
Stephen Birarda
2fde29e04a use a 0 public address to designate server local to DS 2013-08-01 11:53:18 -07:00
Stephen Birarda
9e63b78a69 Merge branch 'master' of github.com:worklist/hifi into qt5 2013-07-31 11:35:24 -07:00
Andrzej Kapolka
c787781efb Send color and depth as separate streams (rather than one on top of the other) 
so that we can control their bitrates separately.
 2013-07-30 15:11:32 -07:00
ZappoMan
95e6fb16d0 cleanup 2013-07-29 16:17:57 -07:00
ZappoMan
69bae24d82 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-07-29 16:16:04 -07:00
Andrzej Kapolka
4ae4623315 These casts should fix the warnings on OS X. 2013-07-29 16:12:11 -07:00
ZappoMan
c5ab321bd9 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-07-29 15:54:52 -07:00
ZappoMan
86bf268eef first cut at multiple voxel servers 2013-07-29 14:56:33 -07:00
Andrzej Kapolka
20360ad3e9 Make particle system update/render toggleable, fix GCC compile warnings. 2013-07-29 10:41:45 -07:00
Stephen Birarda
08b94d731f merge branch qt5 with upstream/master 2013-07-25 10:23:22 -07:00
Stephen Birarda
890d2e40ec more fleshing out of Agent class to interpret javascript 2013-07-24 16:58:44 -07:00