Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-20 13:21:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8887 commits 72 branches 59 tags 1.2 GiB
Commit graph

8887 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ZappoMan
aa5e2b6a19 memset to 0 in VoxelNode to address potential memory corruption 2013-10-23 10:54:02 -07:00
ZappoMan
0456687e92 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-10-23 10:53:03 -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
Stephen Birarda
f765ef4385 Merge branch 'master' of github.com:worklist/hifi into ds-admin 2013-10-23 10:27:24 -07:00
ZappoMan
3b389ac827 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-10-23 10:25:23 -07:00
ZappoMan
b05d6e25e3 remove two debug outs 2013-10-23 10:23:07 -07:00
ZappoMan
5d18b68a2e added support for forceFullFrustum in hideOutOfView() this fixes inconcistancies with voxel hiding showing 2013-10-23 10:14:41 -07:00
Andrzej Kapolka
cf78e21ea4 Merge branch 'master' of https://github.com/worklist/hifi into ossome 
Conflicts:
	interface/src/Application.cpp
 2013-10-23 10:06:56 -07:00
Andrzej Kapolka
a568e71e37 Merge pull request #1099 from stojce/19433 
Code Review for Job #19433
 2013-10-23 10:03:36 -07:00
Andrzej Kapolka
251b80b514 Merge branch 'master' of https://github.com/worklist/hifi into ossome 2013-10-23 10:03:22 -07:00
Philip Rosedale
5a7561978c Merge pull request #1101 from ZappoMan/keep_local_voxels 
Make Keep Local Voxels the Default
 2013-10-23 07:13:57 -07:00
ZappoMan
6e31f74236 tweak to menu text order 2013-10-23 06:00:26 -07:00
ZappoMan
306b23d489 make Fast Voxel Pipeline the default behavior 2013-10-23 05:58:47 -07:00
ZappoMan
1430a083d1 make DontRemoveOutOfView the default behavior 2013-10-23 05:44:20 -07:00
ZappoMan
3c8e30c956 make HideOutOfView the default behavior 2013-10-23 05:38:33 -07:00
ZappoMan
1786049710 make use delta frustum in culling the default behavior 2013-10-23 05:30:15 -07:00
ZappoMan
370fe3dad9 make constant culling the default mode 2013-10-23 05:22:29 -07:00
stojce
9382268ee3 CR fixes 2013-10-23 09:30:26 +02:00