Stephen Birarda
|
d5d52f804f
|
add a networking library and link from appropriate targets
|
2014-04-10 09:32:17 -07:00 |
|
Stephen Birarda
|
684c6b5372
|
run regex header replacement on all cpp files
|
2014-04-09 09:35:42 -07:00 |
|
Stephen Birarda
|
5adcf68752
|
sort nodes on DS page by their uptime
|
2014-04-07 09:08:51 -07:00 |
|
Stephen Birarda
|
f80b415497
|
handle activation and setting of symmetric socket
|
2014-03-28 09:07:30 -07:00 |
|
Stephen Birarda
|
18a293c020
|
add a symmetric socket to the Node class
|
2014-03-28 08:58:49 -07:00 |
|
Stephen Birarda
|
f5aaad1f33
|
remove if checks in cases where delete handles null
|
2014-03-04 10:05:43 -08:00 |
|
Stephen Birarda
|
60eb588e96
|
remove some unecessary null pointer checks
|
2014-03-03 11:36:01 -08:00 |
|
Stephen Birarda
|
3dca04aacb
|
have the domain-server generate connection secrets, closes #1837
|
2014-02-06 11:30:53 -08:00 |
|
Andrzej Kapolka
|
1e9e298a75
|
Missing includes.
|
2014-01-29 13:47:13 -08:00 |
|
Stephen Birarda
|
4de270b832
|
cleanup Node types, closes #1726
|
2014-01-28 13:38:33 -08:00 |
|
Stephen Birarda
|
b009cd8e67
|
repair more node communication problems after refactor
|
2014-01-28 12:25:44 -08:00 |
|
Stephen Birarda
|
4103cc1cde
|
packet header changes and beginning of conversion to QByteArray
|
2014-01-28 10:36:08 -08:00 |
|
Stephen Birarda
|
349c790cc7
|
NodeData cleanup thanks to separation from rendered avatars
|
2014-01-23 15:41:40 -08:00 |
|
Stephen Birarda
|
e9e2557576
|
change node types of interest to a QSet
|
2014-01-22 14:47:04 -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
|
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
|
599e3bb9e5
|
resolve conflicts on merge with upstream master
|
2014-01-14 16:15:58 -08:00 |
|
Stephen Birarda
|
987c639e36
|
initial newline removal from all QDebug calls
|
2014-01-14 13:09:22 -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
|
5a43c2c66b
|
remove extraneous node destructor debug
|
2014-01-14 10:53:55 -08:00 |
|
Stephen Birarda
|
57f977668f
|
replace the Node mutex with a QMutex
|
2014-01-14 10:15:31 -08:00 |
|
Stephen Birarda
|
6a0c431562
|
repair add of new node (so it doesn't immediately kill)
|
2014-01-13 17:29:45 -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 |
|
Andrew Meadows
|
d28ed70ca9
|
merge pull request 1446
|
2014-01-10 15:55:38 -08:00 |
|
ZappoMan
|
d71bc248f4
|
support adjusting particles based on clockSkew
|
2013-12-19 14:49:58 -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 |
|
Stephen Birarda
|
330eff72ce
|
repair usage of DS as STUN server
|
2013-12-02 17:18:07 -08:00 |
|
Stephen Birarda
|
141394a664
|
replace UDPSocket with QUDPSocket
|
2013-12-02 13:34:29 -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
|
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 |
|
Stephen Birarda
|
d85ed014ba
|
switch to bootstrap 3, complete initial index page
|
2013-10-23 14:43:59 -07:00 |
|
Stephen Birarda
|
1b129a43b5
|
initial changes to allow for multiple buffers per client
|
2013-10-21 14:27:55 -07:00 |
|
Stephen Birarda
|
32680bbaad
|
continued STUN requests for keepalive, propagate socket changes
|
2013-10-18 15:05:16 -07:00 |
|
Stephen Birarda
|
fa146e302d
|
remove 16-bit node IDs and replace with UUIDs
|
2013-10-17 11:49:41 -07:00 |
|
Stephen Birarda
|
7de88898e1
|
activate appropriate socket after receiving ping reply
|
2013-10-16 17:51:32 -07:00 |
|
Stephen Birarda
|
e40ab5d13f
|
add debug of Node's local address
|
2013-10-16 16:52:05 -07:00 |
|
Stephen Birarda
|
aa0a97b959
|
use deleteLater to ensure that AvatarVoxelSystem delete is on correct thread
|
2013-10-10 16:23:22 -07:00 |
|
Stephen Birarda
|
51f978196b
|
add back node type unassigned, fix sending of script URL
|
2013-08-05 17:21:06 -07:00 |
|
Stephen Birarda
|
45d84add05
|
cleanup from code review comments
|
2013-08-05 10:37:23 -07:00 |
|
Stephen Birarda
|
f8e7e1de66
|
modifications to hook shared classes to iOS
|
2013-07-24 13:05:02 -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
|
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
|
94b6bfccf6
|
update the private mutex node variable to standard
|
2013-07-15 15:17:53 -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
|
26a2b4672b
|
change NODE_TYPE_ASSIGNEE to NODE_TYPE_UNASSIGNED
|
2013-07-08 17:21:39 -07:00 |
|