Commit graph

69 commits

Author SHA1 Message Date
ZappoMan
9e64528989 removed more dead debug code 2014-01-02 16:10:05 -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
91ffb5b167 added node type to jurisdiction messages and more work on particle editing 2013-12-06 15:56:51 -08:00
Stephen Birarda
992a418b81 fix casing of include in AnimationServer 2013-12-05 17:42:32 -08:00
Stephen Birarda
e99b126134 remove quickExit option from AS, fix cleanup in DS 2013-12-05 17:35:26 -08:00
Stephen Birarda
8f4e641ade remove NodeList threads that are deprecated 2013-12-05 17:11:58 -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
ZappoMan
9faef65ccc first cut at splitting out octree base classes 2013-12-03 17:32:02 -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
00fa5480c1 get rid of magic number 2013-11-10 13:52:40 -08:00
ZappoMan
1a6efea5c0 improvements to PPS behavior of PacketSender 2013-11-10 10:39:56 -08:00
ZappoMan
c25b03dd58 first cut at keeping local voxels 2013-10-09 14:02:31 -07:00
ZappoMan
c6981d1912 have animation server set an appropriate PPS based on it's voxel edit messages 2013-10-07 17:32:55 -07:00
ZappoMan
f937170b67 fixed PR feedback 2013-10-02 21:18:35 -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
cc0009976b first cut and handling buffering of edit packets when voxel servers are unknown 2013-10-02 15:02:23 -07:00
Stephen Birarda
ab85c4109d use QHostInfo and QHostAddress for DS changes in NodeList 2013-09-18 13:29:53 -07:00
ZappoMan
4fd23a0cd9 CR feedback 2013-08-21 13:09:51 -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
e64664c0d1 first cut at JurisdictionSender and related changes 2013-08-19 11:05:29 -07:00
ZappoMan
11212ca8d0 change path of flying bug 2013-08-08 17:48:45 -07:00
ZappoMan
61560af28f cleanup 2013-08-06 19:21:46 -07:00
ZappoMan
ac693c703a added --domain option and --BuildStreet option 2013-08-06 19:19:04 -07:00
Stephen Birarda
afe49bc756 switch calls to printLog to QDebug 2013-07-16 11:07:22 -07:00
ZappoMan
01b7f3868b Merge pull request #672 from birarda/domain-switch
add an option in preferences to dynamically switch domain servers
2013-07-15 17:10:18 -07:00
Stephen Birarda
7f6009bb4a make randIntInRange inclusive on the max side 2013-07-15 16:25:09 -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
fcb8865d2e resolve conflicts on merge with upstream master 2013-07-11 10:58:45 -07:00
Stephen Birarda
beb89e3d2b change some timing types from int to uint64_t to avoid costly assumptions 2013-07-11 10:09:00 -07:00
Stephen Birarda
ca0f6a4d10 header re-arranging and changing 2013-07-11 09:30:45 -07:00
Stephen Birarda
ca8f25955a switch usec timestamps to uint64_t 2013-07-10 11:46:48 -07:00
Stephen Birarda
b482f479b6 more packet version changes to various server targets 2013-07-08 15:09:14 -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
36c6912de8 your agents are now nodes 2013-07-03 10:35:09 -07:00
Andrzej Kapolka
78072fbde0 Merge pull request #523 from PhilipRosedale/master
Better physics, first person to third person transition
2013-06-13 12:07:06 -07:00
Andrzej Kapolka
db729a04aa Converted double timestamps to long long (64 bit integers), fixed bug with
updating agent timestamps.
2013-06-13 11:11:59 -07:00
Philip Rosedale
a5a0df09cb removed grab voxel rendering 2013-06-12 16:36:55 -07:00
Stephen Birarda
4715dbf412 ask only for agents of type AGENT_TYPE_VOXEL_SERVER 2013-06-07 15:29:26 -07:00
Stephen Birarda
8c30c3ff7f use new non-threaded method to checkin with domain server 2013-06-07 15:20:43 -07:00
Stephen Birarda
95971b8303 rename AGENT_TYPE_VOXEL and PACKET_HEADER_DOMAIN_RFD 2013-06-07 14:12:42 -07:00
ZappoMan
b4c39c321c fix bug with animation server not sending entire billboard 2013-06-07 10:00:15 -07:00
ZappoMan
49f4df3a5e coding standard cleanup 2013-05-29 17:07:12 -07:00
ZappoMan
871cddfcc1 coding standard cleanup 2013-05-29 17:05:22 -07:00
ZappoMan
ffffa71d1a new floor 2013-05-29 16:58:17 -07:00
ZappoMan
1fcf787991 dance floor 2013-05-29 15:42:29 -07:00
ZappoMan
b1232d0a87 coding standard cleanup 2013-05-24 11:18:14 -07:00
ZappoMan
34a598dcd7 make dragonfly move in circle instead of line 2013-05-24 09:35:27 -07:00