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

65 commits

Author SHA1 Message Date
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
9dc460bab4 make multiple instances of scripted assignment use diff UUID 2014-02-24 11:56:14 -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
Stephen Birarda
740d11027c add QDataStream >> operator to Assignment 2014-01-29 17:20:32 -08:00
Stephen Birarda
7d27830064 domain-server patches while looking for payload/pool errors 2014-01-29 14:23:39 -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
85ebad979f repair assignment flow errors from packet changes 2014-01-28 11:15:38 -08:00
Stephen Birarda
4103cc1cde packet header changes and beginning of conversion to QByteArray 2014-01-28 10:36:08 -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
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
Brad Hefta-Gaub
483ac66518 more windows build tweaks, warnings and linking 2014-01-13 11:48:16 -08:00
Andrew Meadows
d28ed70ca9 merge pull request 1446 2014-01-10 15:55:38 -08:00
ZappoMan
aec0e9f4aa added basic particle server renamed voxel packet names to fit standard 2013-12-04 21:00:00 -08:00
Stephen Birarda
c3b6a7b24c setup subclass for threaded assignments 2013-12-03 10:22:13 -08:00
Stephen Birarda
67050f5cd2 fix Assignment ctor from data to properly parse payload 2013-10-25 10:34:58 -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
Stephen Birarda
fa146e302d remove 16-bit node IDs and replace with UUIDs 2013-10-17 11:49:41 -07:00
Stephen Birarda
1ed2b3d8fe add both fulfilled and queued assignments to DS json 2013-10-15 15:38:43 -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
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
db1dacbbf4 some refactoring for DS, add create assignments to file 2013-09-26 15:56:41 -07:00
Stephen Birarda
bed4819313 inital setup for static assignment mapped file 2013-09-24 14:41:26 -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
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
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
94f04a9806 add API to attach payloads to assignments 2013-09-17 13:24:25 -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
d089991237 add handling of Agent assignments to Assignment, DS, AC 2013-09-13 11:14:00 -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
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