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

51 commits

Author SHA1 Message Date
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
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
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
ZappoMan
95e6fb16d0 cleanup 2013-07-29 16:17:57 -07:00
ZappoMan
86bf268eef first cut at multiple voxel servers 2013-07-29 14:56:33 -07:00
Stephen Birarda
890d2e40ec more fleshing out of Agent class to interpret javascript 2013-07-24 16:58:44 -07:00
Stephen Birarda
f8e7e1de66 modifications to hook shared classes to iOS 2013-07-24 13:05:02 -07:00
Stephen Birarda
67912cc325 merge with birarda/qt5 and resolve conflicts 2013-07-24 12:14:31 -07:00
Stephen Birarda
9f2b2d09a9 changes to CMakeLists for Qt5 2013-07-24 11:29:12 -07:00
Stephen Birarda
8d34c707a1 Merge branch 'master' of github.com:worklist/hifi into assignee 2013-07-22 14:04:09 -07:00
Stephen Birarda
ef7dc4a39a if the hostname field is left blank reset to DEFAULT_DOMAIN_HOSTNAME 2013-07-18 17:42:25 -07:00
Stephen Birarda
01e6891fd3 save custom domain server hostname to QSettings 2013-07-18 17:23:52 -07:00
Stephen Birarda
67e5a6409e don't not kill NODE_TYPE_VOXEL_SERVER in removeSilentNodes 2013-07-18 14:07:08 -07:00
Stephen Birarda
be32ffff77 merge branch assignee with upstream/master 2013-07-16 14:41:08 -07:00
Stephen Birarda
16d603e203 clean up extra new lines and LogDisplay line break 2013-07-16 12:53:43 -07:00
Stephen Birarda
1b48d4f0fc revert removal of extraneous newlines 2013-07-16 12:46:32 -07:00
Stephen Birarda
51d1e6ae80 add a message handler to send messages over to LogDisplay 2013-07-16 11:50:40 -07:00
Stephen Birarda
89d3cfdb6f remove now extraneous newlines after switch to QDebug 2013-07-16 11:16:51 -07:00
Stephen Birarda
afe49bc756 switch calls to printLog to QDebug 2013-07-16 11:07:22 -07:00
Stephen Birarda
6844490dbe merge branch assignee with upstream/master 2013-07-16 09:17:39 -07:00
Stephen Birarda
c27cd7ae42 couple of type squishes in NodeList 2013-07-15 16:49:36 -07:00
Stephen Birarda
081a44dbff only process new domain list if it comes from current DS 2013-07-15 16:05:23 -07:00
Stephen Birarda
6b83f95f9e conditionally set a new hostname on preferences save 2013-07-15 15:46:04 -07:00
Stephen Birarda
d389dc6e3a add method to NodeList to set domain IP to local, move mutex lock to node 2013-07-15 15:17:10 -07:00
Stephen Birarda
12697c6b14 add method to clear the NodeList 2013-07-15 14:30:13 -07:00
Stephen Birarda
9834c10610 movement to use AudioInjector classes in Operative code 2013-07-11 17:47:35 -07:00
Stephen Birarda
4ebc381e40 update dummy operative code for change to packet type 2013-07-11 14:43:41 -07:00
Stephen Birarda
d6601ad333 resolve conflicts on merge with upstream master 2013-07-11 14:33:50 -07:00
Stephen Birarda
4cf0b7ea66 switch back to statics for domain server check in, fix environment packets 2013-07-11 13:40:29 -07:00
Stephen Birarda
66a998e752 correct use of member variables for DS check in 2013-07-11 13:05:15 -07:00
Stephen Birarda
a0226b2548 avoid static variable thread issue by switching to member variables 2013-07-11 13:02:25 -07:00
Stephen Birarda
a1747725d3 sensible default for checkInPacketSize 2013-07-11 12:28:29 -07:00
Stephen Birarda
544f9c2e7a type squish and magic number removal 2013-07-11 11:15:02 -07:00
Stephen Birarda
6804ab8a33 type squish in NodeList 2013-07-11 11:12:14 -07:00
Stephen Birarda
fcb8865d2e resolve conflicts on merge with upstream master 2013-07-11 10:58:45 -07:00
Stephen Birarda
ca8f25955a switch usec timestamps to uint64_t 2013-07-10 11:46:48 -07:00
Stephen Birarda
8ed518c4a2 add a clear method to the NodeList to delete all nodes 2013-07-10 10:51:21 -07:00
Stephen Birarda
ddc684be49 put back sendAssignmentRequest method removed in merge 2013-07-08 17:14:39 -07:00
Stephen Birarda
729074b502 use packet header byte methods in NodeList bulk processing 2013-07-08 13:58:20 -07:00
Stephen Birarda
6deaa5fd51 apply refactoring changes to PACKET_TYPE_PING 2013-07-08 13:55:35 -07:00
Stephen Birarda
e3d9289f1f refactor packet version handling and apply to DS 2013-07-08 13:44:01 -07:00
Stephen Birarda
8a684244cc packet versioning for HEAD_DATA packets 2013-07-08 12:53:07 -07:00
Stephen Birarda
5faad80e12 remove ping unknown thread, version for ping reply 2013-07-08 11:58:19 -07:00
Stephen Birarda
693463ae5b voxel-server packet version handling 2013-07-08 11:54:00 -07:00
Stephen Birarda
5062ae8965 rename PACKET_HEADER to PACKET_TYPE, fix DS packet versioning 2013-07-08 11:37:39 -07:00
Stephen Birarda
047d5b5cab add packet version handling for DS packets 2013-07-08 11:17:29 -07:00