Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-10 11:26:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8257 commits 25 branches 0 tags 1.1 GiB
Commit graph

744 commits

Author SHA1 Message Date
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