Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 17:32:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
5907 commits 75 branches 59 tags 1.2 GiB
Commit graph

1234 commits

Author SHA1 Message Date
ZappoMan
38f54a3130 Merge branch 'master' of https://github.com/worklist/hifi into threaded_voxel_server 2013-08-21 17:03:34 -07:00
atlante45
12459079e9 Fixed magic number 2013-08-21 16:41:24 -07:00
atlante45
447d9a65ce Fixed only square png import + reduced amount of code 2013-08-21 16:36:50 -07:00
ZappoMan
25e21f862c flush delete queue after encode is complete 2013-08-21 16:23:55 -07:00
ZappoMan
e524ed889e Merge branch 'master' of https://github.com/worklist/hifi into threaded_voxel_server 
Conflicts:
	libraries/voxels/src/VoxelTree.cpp
	libraries/voxels/src/VoxelTree.h
 2013-08-21 13:48:23 -07:00
ZappoMan
4fd23a0cd9 CR feedback 2013-08-21 13:09:51 -07:00
ZappoMan
4bdaf7589f Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 2013-08-21 12:16:09 -07:00
ZappoMan
2c362e6288 adding support for better multithreading in VoxelTree 2013-08-21 12:09:00 -07:00
atlante45
867303e673 Code cleanup 2013-08-21 11:33:10 -07:00
atlante45
3eb5ace715 merge + few efficiency ameliorations to importDialog 2013-08-20 18:04:25 -07:00
ZappoMan
db6e327741 fixed build buster 2013-08-20 12:00:07 -07:00
ZappoMan
50532bc67d added NodeListHook to JurisdictionListener to properly remove nodes that are killed 2013-08-20 11:42:30 -07:00
ZappoMan
b0664163a7 removed debug 2013-08-20 11:27:31 -07:00
ZappoMan
da6bd2e3b0 cleanup, handle no JurisdictionMap case in JurisidictionSender 2013-08-20 11:22:51 -07:00
ZappoMan
436f70ab5d removed dead code 2013-08-20 11:12:22 -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
atlante45
24531fdd10 Dialogbox for import fully functionnal 2013-08-19 15:54:51 -07:00
ZappoMan
2be85d439b Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 
Conflicts:
	interface/src/Application.cpp
	interface/src/VoxelPacketProcessor.cpp
	libraries/voxels/src/VoxelEditPacketSender.cpp
 2013-08-19 11:13:38 -07:00
ZappoMan
e64664c0d1 first cut at JurisdictionSender and related changes 2013-08-19 11:05:29 -07:00
ZappoMan
5a96f51602 first cut at JurisdictionSender and related changes 2013-08-19 10:30:22 -07:00
atlante45
6b58e1bfec merge 2013-08-16 20:24:18 -07:00
ZappoMan
68845da901 added doxygen comments and cleanup for VoxelSceneStats class 2013-08-16 10:10:17 -07:00
atlante45
68a1c56ad6 More work on import interface 2013-08-15 17:21:23 -07:00
Stephen Birarda
50e062edf2 some spacing cleanup in AvatarData 2013-08-15 16:06:48 -07:00
Stephen Birarda
154c6b4f32 fix disabling of occlusion culling from menu 2013-08-15 15:32:44 -07:00
Stephen Birarda
b288cc43a2 fix disabling of delta sending and low res while moving 2013-08-15 15:29:05 -07:00
Stephen Birarda
c930d058b1 fix monochrome option menu hook 2013-08-15 15:23:26 -07:00
ZappoMan
7045dff7d3 moved VoxelEditPacketSender to libraries 2013-08-15 14:26:31 -07:00
ZappoMan
209c9f93ed remove Application dependency from VoxelEditPacketSender class 2013-08-15 14:21:21 -07:00
ZappoMan
04440d30d8 Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 
Conflicts:
	libraries/voxels/src/JurisdictionMap.h
 2013-08-15 12:27:00 -07:00
Stephen Birarda
443203201e Merge remote-tracking branch 'upstream/master' into menu 2013-08-15 12:22:37 -07:00
ZappoMan
74100ad043 make threads sleep 2013-08-15 12:01:50 -07:00
ZappoMan
4f16157e51 CR feedback 2013-08-15 11:39:00 -07:00
ZappoMan
8b867df762 style fix 2013-08-15 10:47:59 -07:00
ZappoMan
90fcfca561 style fix 2013-08-15 10:45:53 -07:00
ZappoMan
c157aad775 starting to add PACKET_TYPE_VOXEL_JURISDICTION 2013-08-15 10:44:43 -07:00
ZappoMan
ced61e94d8 added more doxygen comments 2013-08-15 08:48:21 -07:00
ZappoMan
beec5f60d8 renamed class to be more appropriate, added doxygen comments 2013-08-15 08:36:06 -07:00
Stephen Birarda
c7b784aa1f signed UNKNOWN_NODE_ID should be 0 2013-08-14 15:31:23 -07:00
ZappoMan
266d57264b fix build buster 2013-08-14 14:57:23 -07:00
ZappoMan
1730f7f2f6 fix build buster 2013-08-14 14:48:16 -07:00
ZappoMan
18e5d49d75 move move constructors and assignments into IFDEFS for now to fix build buster 2013-08-14 14:46:40 -07:00
ZappoMan
21f521f3a5 fix build buster 2013-08-14 14:33:47 -07:00
ZappoMan
4305ad552d fix issue with JurisdictionMap being passed across wire 2013-08-14 14:19:06 -07:00
ZappoMan
02f2de6101 properly send full jurisdiction details in scene stats 2013-08-13 13:43:46 -07:00
ZappoMan
27d001a84d copy the jurisdication end nodes into voxel scene stats 2013-08-13 13:29:55 -07:00
ZappoMan
d3ce3e4e60 some cleanup and fixing of memory issue 2013-08-13 11:37:57 -07:00
ZappoMan
60dedee739 make JurisdictionMap handle copy/move/assigment so that it will work in std::vector<> and std::map<>, switch application to have map of JurisdictionMap objects instead of just root codes 2013-08-13 11:08:43 -07:00
ZappoMan
7d2c69f530 latest work on threaded sending 2013-08-12 16:55:58 -07:00
ZappoMan
ce0c868c89 cleanup naming 2013-08-12 13:40:21 -07:00
ZappoMan
e7b3d41c33 make PacketReceiver derive from GenericThread 2013-08-12 12:04:05 -07:00
ZappoMan
70344cdaf2 move voxel receiving into class 2013-08-12 11:46:57 -07:00
ZappoMan
8e2fcffd5c enabled Low Res sending while moving by default 2013-08-10 11:58:25 -07:00
ZappoMan
b5e2bc2093 implement threaded voxel processing 2013-08-10 11:35:59 -07:00
ZappoMan
bac2362706 Merge branch 'master' of https://github.com/worklist/hifi into split_tool 2013-08-08 14:51:42 -07:00
ZappoMan
1bb7d75794 added tool for splitting SVOs on jurisdiction boundaries 2013-08-08 14:36:42 -07:00
ZappoMan
7e5f03a36f Merge pull request #832 from birarda/assignee 
tweaks to assignment server and AvatarData for assignment to iOS
 2013-08-08 12:13:07 -07:00
Stephen Birarda
94d270b3d5 remove equals at beginning of AvatarData 2013-08-08 11:21:39 -07:00
Eric Johnston
a20668951a Merge branch 'master' of git://github.com/worklist/hifi into dev4 2013-08-07 17:06:43 -07:00
Stephen Birarda
2a21ce7945 socket changes to send correct port to pairing server 2013-08-07 16:40:28 -07:00
Eric Johnston
52b33cb466 Rave tweaks: Improvements to finger trails and hand rendering 2013-08-07 16:19:54 -07:00
ZappoMan
9e182bbdc2 removed debug 2013-08-07 11:59:48 -07:00
Stephen Birarda
72b53ea089 add Q_PROPERTY for handPosition 2013-08-07 10:41:32 -07:00
Stephen Birarda
c0793146bd Avatar instance in JS should be referenced as Avatar 2013-08-07 10:41:17 -07:00
Stephen Birarda
955b7f0d24 Merge branch 'master' of github.com:worklist/hifi into assignee 2013-08-07 10:26:26 -07:00
ZappoMan
24ec0b0ddc fixed packet header bug in createVoxelEditMessage() 2013-08-06 19:15:05 -07:00
ZappoMan
ecaaa60c75 Merge pull request #801 from ZappoMan/fun_fade 
fixed crash
 2013-08-06 16:27:21 -07:00
ZappoMan
23461c2e95 fixed crash 2013-08-06 16:26:48 -07:00
ZappoMan
634b69b545 Merge pull request #797 from machinelevel/dev4 
Rave demo changes per Ryan's request: Darken the world when you're in ra...
 2013-08-06 15:00:26 -07:00
Eric Johnston
2e5dade413 Rave demo changes per Ryan's request: Darken the world when you're in rave mode, but leave the avatars and effects un-darkened. 
Also fixed a warning in AvatarData.cpp initialization
 2013-08-06 14:29:30 -07:00
ZappoMan
6cf87fc120 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 
Conflicts:
	interface/src/Application.cpp
 2013-08-06 13:49:42 -07:00
ZappoMan
c93ed450a2 Merge pull request #791 from Atlante45/stalking_indicator 
Stalking indicator
 2013-08-06 12:33:26 -07:00
ZappoMan
88e2e3dd3f added visulization for voxel add/kill 2013-08-06 12:05:43 -07:00
Eric Johnston
ab31c3f82d Rave glove: Fix initialization issues and activate mode switch. 
Note that this change will have no effect until the Avatar Mixer gets it, because the mixer will continue to send "glove mode 0" until it receives this update.
 2013-08-06 11:59:58 -07:00
Stephen Birarda
d0330b0a28 include QVariantMap in AvatarData, map values to floats for glm::vec3 2013-08-06 11:56:54 -07:00
Stephen Birarda
b0783e4cce add Q_PROPERTY macro for position QVariantMap 2013-08-06 11:25:29 -07:00
atlante45
eb9f32b7cb Merge branch 'master' of https://github.com/worklist/hifi into stalking_indicator 2013-08-06 11:07:58 -07:00
atlante45
97239968a5 Corrected wrong argument in sizeof 2013-08-06 11:05:00 -07:00
Stephen Birarda
f3d6f1edd8 add Q_PROPERTY hooks for yaw, pitch, roll, chatMessage 2013-08-06 11:04:13 -07:00
atlante45
32c155ef71 Render a string to show who is following who 2013-08-06 10:53:10 -07:00
ZappoMan
73510ec975 added notifications with jurisdiction details for when voxel servers come and go 2013-08-06 10:33:09 -07:00
Eric Johnston
fc23eaa825 Fixed per github feedback. 
Also, to prevent a repeat of yesterday's crash trouble, disabled the mode switch, so that those working on the rave mode can enable it locally for testing.
 2013-08-06 10:28:31 -07:00
Eric Johnston
16aae5993a Rave glove fixes: removed double-stored glove mode members 
Uncommented glove mode switch, which now calls a non-crashing method.
Fixed overlapping method names for very different methods (setRaveGloveMode becomes activateNewRaveGloveMode).
 2013-08-06 07:33:18 -07:00
Stephen Birarda
d3b2ba1070 fix QtCore includes in voxels library 2013-08-05 17:40:01 -07:00
Stephen Birarda
d1aad8c387 fix sleep interval in Agent.cpp so it isn't 0 2013-08-05 17:39:23 -07:00
Stephen Birarda
7f8411b40d Merge branch 'master' of github.com:worklist/hifi into assignee 2013-08-05 17:22:00 -07:00
Stephen Birarda
51f978196b add back node type unassigned, fix sending of script URL 2013-08-05 17:21:06 -07:00
ZappoMan
b016c08578 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 
Conflicts:
	libraries/avatars/src/HandData.h
 2013-08-05 16:53:41 -07:00
ZappoMan
acd3acb81e correctly handle freeing of memory for _jurisdictionRoot in VoxelSceneStats 2013-08-05 16:51:01 -07:00
ZappoMan
01ba5ee81a adding jurisdiction to scene stats to implement add/drop effect, added command line to voxel server to not send environments 2013-08-05 16:30:08 -07:00
ZappoMan
cc8c92c4e0 Merge pull request #785 from machinelevel/dev4 
Disable hand receive logic to keep team from crashing while a bug is bei...
 2013-08-05 16:05:06 -07:00
Eric Johnston
39f9729acb Warning fix: virtual method needs virtual destructor 2013-08-05 16:03:17 -07:00
Eric Johnston
14e470133c More cleanup after crash tracing 2013-08-05 16:02:09 -07:00
Eric Johnston
858738a10a Root cause of crash isolated to setRaveGloveMode(), so some disabled code has been re-enabled 2013-08-05 15:56:49 -07:00
Eric Johnston
002a62d31e Disable hand receive logic to keep team from crashing while a bug is being tracked. 2013-08-05 15:46:12 -07:00
ZappoMan
1c8c41463a fix compiler warning 2013-08-05 15:02:03 -07:00
ZappoMan
f1a0edb471 Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers 2013-08-05 14:57:10 -07:00
Jeffrey Ventrella
96b443ec5d Merge pull request #781 from machinelevel/dev4 
Rave glove demo: Network rave data
 2013-08-05 14:07:57 -07:00
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