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

17745 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
3d13792a9d Merge pull request #3599 from ZappoMan/frustumCullModelParts 
Frustum cull model parts
 2014-10-15 11:56:00 -07:00
ZappoMan
46cb780aa5 view cull mesh parts 2014-10-15 10:08:21 -07:00
ZappoMan
eab96587fe add stats for entity rendering details 2014-10-15 09:24:58 -07:00
ZappoMan
da4c179a9f correctly track rendered entities 2014-10-15 09:23:59 -07:00
ZappoMan
8c37181635 add menu item for enable/disable culling of model parts 2014-10-15 09:23:27 -07:00
ZappoMan
770bc919bb added some rendering stats to OctreeRenderer 2014-10-15 09:22:31 -07:00
AndrewMeadows
42734fef22 Merge pull request #3597 from ZappoMan/fixcrash 
fix possible buffer overrun asserts
 2014-10-15 08:55:49 -07:00
ZappoMan
64fecba011 removed some unneeded scaling to AABox and AACube debug 2014-10-14 17:17:30 -07:00
ZappoMan
e235af1331 add debeg streaming to Extents 2014-10-14 17:16:49 -07:00
ZappoMan
f04c2b6e6f fix possible buffer overrun asserts 2014-10-14 17:14:12 -07:00
Brad Hefta-Gaub
102d02d396 Merge pull request #3596 from huffman/entity-tools 
Camera functionality for entity edit tools
 2014-10-14 16:28:17 -07:00
Ryan Huffman
a05e2ea168 Add entityCameraTools.js 2014-10-14 13:15:28 -07:00
Ryan Huffman
c332d94ae3 Add handle size based on distance in edit tools 2014-10-14 13:04:15 -07:00
Andrzej Kapolka
ff368f9848 Merge pull request #3592 from samcake/temp0 
Rendering resolution can be different than the native window resolution
 2014-10-14 11:56:50 -07:00
Stephen Birarda
e10475f2e2 Merge pull request #3594 from birarda/master 
fix the security link in domain-server page
 2014-10-14 11:54:20 -07:00
Stephen Birarda
7e116346cb fix the security link in domain-server page 2014-10-14 11:53:07 -07:00
Stephen Birarda
5c465198c5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-14 11:52:06 -07:00
AndrewMeadows
2a35c4af4d Merge pull request #3593 from huffman/20024 
CR for Job #20024 - UI edits to Running Scripts dialog
 2014-10-14 09:52:13 -07:00
AndrewMeadows
240280b9ac Merge pull request #3591 from ey6es/metavoxels 
Basic metavoxel scripting commands.
 2014-10-14 09:47:24 -07:00
AndrewMeadows
3483497fab Merge pull request #3575 from Atlante45/attenuation_zones 
Audio zones and attenuation coefficients
 2014-10-14 09:39:06 -07:00
Sam Gateau
153d3b532b merged with upstream, all clear 2014-10-14 00:19:19 -07:00
samcake
e7af0cbe7f Using the correct scaling factor for the avatar display name call. CHanged the scale coming from the widget.devicePixelRatio to the actual RenderResolutionScale we assign in the Application 2014-10-14 00:08:29 -07:00
Sam Gateau
113fb1908a fix the first issues 2014-10-13 23:28:43 -07:00
Ryan Huffman
f178de3b2e Merge branch 'master' of github.com:highfidelity/hifi into entity-tools 2014-10-13 21:25:47 -07:00
samcake
700ec5cf79 Rendering resolution can be different than the native window resolution 
- Get rid of the different GlowModes since we found the correct one (DIFFUSE and ADD)
  Get rid of the ui to change the mode

- INtroduce a "RenderResolutionScale" in the application that controls the ratio ofthe resolution between the framebuffers and the native window provided by Qt

- In the paintGL, in the default rendering path:
  the rendering Framebuffers are resized to the window.size * renderResolutionScale.
  The viewport is assigned to the framebuffer size from GlowEffect.prepare() to GlowEffect.render() (and not the original GLCanvas size)
  at the end of GLowEffect render, the final step is to blit the colorbuffer from the rendering into the window's default framebuffer at the original resolution, and that requires one more glViewport

- add the ui in developer/render/ menu "scale resolution" where you can select the scaling level. THis should show in the rendering with ugly aliasing when selecting a scale under 1/2.
 2014-10-13 18:00:50 -07:00
Andrzej Kapolka
00490af837 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-13 17:59:35 -07:00
Clément Brisset
87d067c8f0 Merge pull request #3590 from ctrlaltdavid/extra-logging 
Minor logging improvements
 2014-10-13 16:20:43 -07:00
Clément Brisset
200c0e080e Merge pull request #3589 from ZappoMan/editToolsImprovements 
highlight grabber handles on hover
 2014-10-13 16:19:57 -07:00
Clément Brisset
f6f187e7f0 Merge pull request #3587 from ctrlaltdavid/20101 
CR for Job #20101 - Upload model file function is broken
 2014-10-13 16:16:49 -07:00
Clément Brisset
9d050782cc Merge pull request #3586 from ctrlaltdavid/20093 
CR for Job #20093 - Add a menu item corresponding to the apostrophe key (reset sensors)
 2014-10-13 16:14:04 -07:00
Andrzej Kapolka
fcbdf04c19 Apply alpha restrictions when we apply the edit. 2014-10-13 16:01:38 -07:00
Andrzej Kapolka
84022fd19d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-13 15:35:07 -07:00
Andrzej Kapolka
13efaba22c Basic metavoxels example. 2014-10-13 15:34:38 -07:00
Andrzej Kapolka
60576bdcbd Basic metavoxel scripting bits. 2014-10-13 15:05:16 -07:00
Stephen Birarda
05e8726491 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-13 14:41:50 -07:00
David Rowe
958acfcfe0 Fix version logging include to include build number and write in log 2014-10-13 13:23:31 -07:00
David Rowe
bd9451d4c6 Log Oculus SDK version used in build 2014-10-13 13:20:24 -07:00
ZappoMan
45a5768750 highlight grabber handles on hover 2014-10-13 12:19:38 -07:00
AndrewMeadows
01ec12549e Merge pull request #3588 from ZappoMan/editToolsImprovements 
add debugging for ryan's rotate problems
 2014-10-13 11:39:14 -07:00
ZappoMan
2b6cd6d29a add debugging for ryan's rotate problems 2014-10-13 11:33:06 -07:00
Atlante45
6bde4b8324 Move break 2014-10-13 10:24:01 -07:00
AndrewMeadows
d90d30ad9f Merge pull request #3585 from ZappoMan/editToolsImprovements 
various edit tool fixes
 2014-10-13 10:12:47 -07:00
AndrewMeadows
3d888b6c27 Merge pull request #3584 from huffman/sdl-update 
Update to SDL2
 2014-10-13 09:37:16 -07:00
AndrewMeadows
1f09d07ac9 Merge pull request #3583 from ey6es/metavoxels 
Added ray/dual contour intersection testing, cursors on dual contour surfaces, "material brush" for dual contour surfaces.
 2014-10-13 09:25:46 -07:00
David Rowe
c6bf09f509 Fix model uploading for the case that haven't uploaded model before 2014-10-13 08:35:52 -07:00
ZappoMan
8c85c3261e draw tickmarks for current roation correctly for pitch and roll as well 2014-10-10 22:11:27 -07:00
ZappoMan
a08ddecc3a fix shifting tickmarks 2014-10-10 22:06:12 -07:00
ZappoMan
e6d7add5dc display tickmarks on the current rotation overlay 2014-10-10 21:57:10 -07:00
ZappoMan
caac5881bf correctly handle unselect and dont show highlight when other tool is active 2014-10-10 21:39:05 -07:00
ZappoMan
f21ff76a38 dont allow stretching below a minimum dimension 2014-10-10 21:23:56 -07:00