Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 08:13:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
6951 commits 71 branches 56 tags 1.2 GiB
Commit graph

6951 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
660edddf66 only send PACKET_TYPE_VOXEL_QUERY to voxel servers in view 2013-10-24 18:38:33 -07:00
ZappoMan
37584244e6 only send PACKET_TYPE_VOXEL_QUERY to voxel servers in view 2013-10-24 18:37:31 -07:00
ZappoMan
76fb3c18a2 add basic rate control, evenly divide packets per second between all connected voxel servers 2013-10-24 17:35:30 -07:00
Philip Rosedale
f8369ea29a Merge pull request #1113 from ZappoMan/rate_control 
first cut at splitting out PACKET_TYPE_VOXEL_QUERY from PACKET_TYPE_HEAD_DATA
 2013-10-24 14:48:16 -07:00
ZappoMan
75638f35b1 Merge pull request #1112 from ey6es/attach 
Support for skeleton attachments (FBX meshes or SVO voxel trees).
 2013-10-24 14:35:11 -07:00
ZappoMan
0368e8c75e cleanup bit field positions 2013-10-24 14:27:47 -07:00
Andrzej Kapolka
6554868fd8 Merge branch 'master' of https://github.com/worklist/hifi into attach 2013-10-24 14:23:48 -07:00
ZappoMan
f2229ae708 moved debug into if 2013-10-24 14:21:05 -07:00
Andrzej Kapolka
bae4a17605 Voxel attachments. 2013-10-24 13:59:04 -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
Philip Rosedale
ba5db325aa Merge pull request #1111 from ZappoMan/rate_control 
added suppression of duplicate voxel packets to save on bit/packet rate
 2013-10-24 10:57:44 -07:00
ZappoMan
9cd04af1ae removed debug 2013-10-24 10:48:17 -07:00
ZappoMan
80701b93d5 Merge branch 'master' of https://github.com/worklist/hifi into rate_control 2013-10-24 10:44:27 -07:00
Philip Rosedale
41735ae601 Merge pull request #1110 from ZappoMan/view_is_similar 
improvements to subtle moves for view frustum and voxel serving
 2013-10-24 10:37:11 -07:00
ZappoMan
14cf5b04b5 added suppression of duplicate voxel packets to save on bit/packet rate 2013-10-24 10:33:19 -07:00
ZappoMan
8ac5f5070c Merge branch 'master' of https://github.com/worklist/hifi into view_is_similar 2013-10-23 17:59:00 -07:00
ZappoMan
d486fc8c0e Merge pull request #1107 from birarda/ds-admin 
intial rev of new domain-server index page
 2013-10-23 17:50:49 -07:00
ZappoMan
b4c88a85f8 improvements to subtle moves for view frustum and voxel serving 2013-10-23 17:49:58 -07:00
Stephen Birarda
37c618927e make the colon and port gray for sockets 2013-10-23 16:56:40 -07:00
Stephen Birarda
0d6f363ed5 fix to correct colors based on @problem provided values 2013-10-23 16:52:13 -07:00
Stephen Birarda
7c40a47155 remove the non-minified bootstrap files 2013-10-23 16:43:48 -07:00
Philip Rosedale
f319061111 Merge pull request #1109 from birarda/data-server 
update DS in data-server on profile change
 2013-10-23 16:25:44 -07:00
Stephen Birarda
faa1c38820 update DS in data-server on profile change 2013-10-23 16:16:24 -07:00
Andrzej Kapolka
240f65b7c5 Scale fixes. 2013-10-23 16:15:03 -07:00
Andrzej Kapolka
a9df8a6b29 Partial fix for textures in exports from 3D Studio Max. 2013-10-23 15:56:09 -07:00
Stephen Birarda
0188d55ad3 Merge pull request #1108 from birarda/master 
switch base SDK to 10.8
 2013-10-23 15:49:23 -07:00
Stephen Birarda
f65a726745 switch base SDK to 10.8 2013-10-23 15:48:52 -07:00
Andrzej Kapolka
41f73b5e9d Support for attaching models to joints. 2013-10-23 15:16:29 -07:00
Stephen Birarda
6608e4bc5b rename top table now that it is displaying nodes 2013-10-23 14:44:56 -07:00
Stephen Birarda
d85ed014ba switch to bootstrap 3, complete initial index page 2013-10-23 14:43:59 -07:00
Philip Rosedale
0abeab9ce9 Merge pull request #1106 from ZappoMan/fix_mirror_mode 
wrap more displaySide() items for not rendering when in mini rear view m...
 2013-10-23 14:37:40 -07:00
ZappoMan
3efc277aae wrap more displaySide() items for not rendering when in mini rear view mode 2013-10-23 14:19:25 -07:00
Stephen Birarda
aab710d785 Merge branch 'master' of github.com:worklist/hifi into ds-admin 2013-10-23 13:21:50 -07:00
Andrzej Kapolka
3f96343761 Merge pull request #1105 from ZappoMan/fix_mirror_mode 
Fix mirror mode
 2013-10-23 12:11:51 -07:00
ZappoMan
8cd47762e3 Merge branch 'master' of https://github.com/worklist/hifi into fix_mirror_mode 2013-10-23 12:06:33 -07:00
ZappoMan
d31c3854ad fix merge issue 2013-10-23 12:06:11 -07:00
Andrzej Kapolka
4bcda8c033 Merge pull request #1104 from ey6es/master 
Merge fix.
 2013-10-23 12:04:53 -07:00
Andrzej Kapolka
31004ef9bc Merge fix. 2013-10-23 12:04:25 -07:00
ZappoMan
ea844634a6 Merge branch 'master' of https://github.com/worklist/hifi into fix_mirror_mode 2013-10-23 11:59:47 -07:00
ZappoMan
55294e1de7 Merge pull request #1103 from ey6es/master 
As a temporary measure, restore the full screen mirror as a menu option.
 2013-10-23 11:59:39 -07:00
ZappoMan
46eadb5fb7 Merge branch 'master' of https://github.com/worklist/hifi into fix_mirror_mode 2013-10-23 11:58:47 -07:00
ZappoMan
c87ddd2010 Merge pull request #1100 from ey6es/ossome 
Basic support for custom skeletons defined by FBX/FST files.  Also adds support for FBX text format.
 2013-10-23 11:58:35 -07:00
ZappoMan
161367c899 fix rear view mirror mode to only render self 2013-10-23 11:58:01 -07:00
Andrzej Kapolka
183a866e9e Remove code that will be added back in fullscreen mirror request. 2013-10-23 11:44:28 -07:00
Andrzej Kapolka
e8885332f2 Code review fixes. 2013-10-23 11:39:30 -07:00
Andrzej Kapolka
665551d690 Merge branch 'master' of https://github.com/worklist/hifi into ossome 2013-10-23 11:26:23 -07:00
Andrzej Kapolka
5334d9021e Merge branch 'master' of https://github.com/worklist/hifi 2013-10-23 11:22:04 -07:00
Andrzej Kapolka
71b4b8fe46 Use lowercase h to toggle full screen mirror, capital H for inset. 2013-10-23 10:54:39 -07:00
Philip Rosedale
b1364f589a Merge pull request #1102 from ZappoMan/keep_local_voxels 
added support for forceFullFrustum in hideOutOfView() this fixes inconci...
 2013-10-23 10:33:54 -07:00
Andrzej Kapolka
adc79be81c Add back the full screen mode as a menu option, temporarily. 2013-10-23 10:30:42 -07:00