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

13144 commits

Author SHA1 Message Date
Sam Gateau
661f29924f Clean up the cmakelist to normally onlly do th eminimal linking and include for gl 2015-07-29 13:55:26 -07:00
Sam Gateau
76acbde595 Removing the opengl and glew links from Interface since now coming from gpu lib 2015-07-29 09:54:10 -07:00
Andrew Meadows
77a12eb50e compile on linux with GLEW 2015-07-28 17:53:01 -07:00
Brad Hefta-Gaub
43eec08514 Merge pull request #5376 from venkatn93/avatar 
New ambient occlusion effect in render pipeline
 2015-07-28 09:58:51 -07:00
David Rowe
8a7cdb1c64 Make Throttle FPS If Not Focus be enabled by default 2015-07-27 19:53:38 -07:00
Niraj Venkat
34e400ac67 Changing var name to 'DebugAmbientOcclusion' 2015-07-27 17:14:09 -07:00
Stephen Birarda
d3c6d8b3cc move call to get VoxelPositionSize inside debug that uses it 2015-07-27 10:06:34 -07:00
Stephen Birarda
615218c77d use a ref in stats unpacking 2015-07-27 09:58:58 -07:00
Stephen Birarda
9c57d1544f fix OctreeSceneStat unpacking in Application 2015-07-27 09:53:27 -07:00
Niraj Venkat
83e0856279 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 2015-07-27 09:20:19 -07:00
Brad Hefta-Gaub
a9d5723eb3 Merge pull request #5410 from kevinmthomas-carpool/20618 
CR for Job #20618 - Move Reload Content item to Developer menu.
 2015-07-26 21:54:55 -07:00
Seth Alves
24fff719c5 quiet compiler 2015-07-25 21:11:23 -07:00
Brad Davis
f66492b444 Merge pull request #5422 from ctrlaltdavid/20591 
CR for 20591 - Fix setting WebWindow's width and height
 2015-07-25 11:49:53 -04:00
Philip Rosedale
e24395a226 Merge pull request #5383 from ctrlaltdavid/20630 
Improve looking-at-me indication
 2015-07-24 16:15:13 -07:00
Kevin M. Thomas
67c9a33cc0 Update Menu.cpp 2015-07-24 15:16:02 -04:00
Kevin M. Thomas
5f7fe30b9b Merge branch 'master' of https://github.com/highfidelity/hifi into 20618 
# Conflicts:
#	interface/src/Menu.cpp
 2015-07-24 15:10:34 -04:00
Niraj Venkat
fc612ab8cd Merge conflict fix 2015-07-24 11:29:52 -07:00
Niraj Venkat
e036602726 Fixing merge conflicts 2015-07-24 11:08:40 -07:00
David Rowe
3893add148 Fix setting WebWindow's width and height 
Width and height parameters now set the WebWindow's width and height
instead of its minimum size, when not part of a tool window.
 2015-07-24 10:43:24 -07:00
samcake
f3dc159e33 Merge pull request #5401 from ZappoMan/renderLaserPointers 
remove renderLaserPointers()
 2015-07-24 10:41:32 -07:00
Brad Hefta-Gaub
939638a3a8 Merge pull request #5414 from birarda/slow-events 
allow the QEvent queue in Application to get behind
 2015-07-24 10:10:42 -07:00
Brad Davis
6eec04c798 Merge pull request #5407 from samcake/yellow 
Removing the glNaked code for capturing the billboard snaphot and rendering the rearViewMirror in a separate render target
 2015-07-24 13:09:07 -04:00
samcake
e6f2504514 FIx the problem of clear when the color mask is not WRITE_ALL 2015-07-24 09:26:32 -07:00
Brad Davis
6899279d7d Merge pull request #5399 from ZappoMan/fixJSRayPick 
Fix JS calls to computePickRay() when mini-mirror is showing
 2015-07-24 11:46:07 -04:00
Seth Alves
bd1a661d01 Merge pull request #5416 from ctrlaltdavid/webwindow-title 
Add ability to update title of WebWindow after it's created
 2015-07-24 08:27:54 -07:00
Seth Alves
6841a47c4b Merge pull request #5412 from AndrewMeadows/bohrium 
decouple FPS from rotation rate during mouse drag
 2015-07-24 07:44:22 -07:00
samcake
52ac5b3ef6 On mac cannot get ther erendering to properly display the overlay if the rear view mirror is active on resize 2015-07-24 03:38:21 -07:00
Sam Gateau
cb375e8ece FIund a nasty bug with the scissor which was the reason for many issues, tried to integrate the framebuffer setup and clear as part of the enginepipeline so calling display side is simpler 2015-07-24 02:15:50 -07:00
Sam Gateau
66cd17ec66 REmove the crappy solution for drawing transparent texture into overlay by a proper shader 2015-07-23 23:09:40 -07:00
David Rowe
c1e1caa709 Add ability to update title of WebWindow after it's created 2015-07-23 21:59:19 -07:00
samcake
8421aafe33 try to fix the scaling issues on mac 2015-07-23 18:17:10 -07:00
Stephen Birarda
cdcab299b6 bring back delayed queue of Application events 2015-07-23 18:00:35 -07:00
Philip Rosedale
a1544956e3 Merge pull request #5348 from ctrlaltdavid/20602 
DO NOT MERGE - QA for #20602 - Fix and improve eye saccades
 2015-07-23 17:42:24 -07:00
Andrew Meadows
2fc158246d decouple FPS from rotation rate during mouse drag 2015-07-23 17:30:50 -07:00
Sam Gateau
a424ff98ca Fixing issues with the review process 2015-07-23 16:55:18 -07:00
Sam Gateau
a002560003 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-23 16:32:00 -07:00
Sam Gateau
d56b5f39fb strenghening the checks in GLBackend::downloadFramebuffer before actually calling the true glReadPixels 2015-07-23 16:31:11 -07:00
Sam Gateau
be9d99264f Introducing the download Framebuffer call on the context to capture a snapshot 2015-07-23 16:15:10 -07:00
Sam Gateau
dc10f30d3d Merged 2015-07-23 15:10:42 -07:00
Sam Gateau
a561874ce3 Render the rear view mirror in a separate target and then display it during overlay pass 2015-07-23 14:56:14 -07:00
Andrew Meadows
b26f4b0c8d fix for underdamped avatar rotation momentum 2015-07-23 14:49:15 -07:00
David Rowe
ad7167c67a Merge branch 'master' into 20602 2015-07-23 11:22:05 -07:00
ZappoMan
720f6ec529 completely remove six sense lasers 2015-07-23 11:17:22 -07:00
samcake
805e7326e0 Merge pull request #5396 from ZappoMan/deadCodeRemoval 
remove non-batch versions of GeometryCache renderXYZ() methods
 2015-07-23 11:11:35 -07:00
David Rowe
7c4f6b665b Use a default eye diameter for models without eyes, e.g., the masks 2015-07-23 11:04:58 -07:00
ZappoMan
f4ec09a48b move renderLaserPointers() into a draw item 2015-07-23 10:42:22 -07:00
Niraj Venkat
9ccf316513 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 2015-07-23 10:36:46 -07:00
David Rowe
68254c1ff0 Merge branch 'master' into 20630 2015-07-23 09:46:20 -07:00
ZappoMan
3350d638dd always use the _viewFrustum for caluclating the pick ray, not the _displayViewFrustum which can be the mirror 2015-07-23 09:29:27 -07:00
Brad Hefta-Gaub
e729a87328 Merge pull request #5393 from ctrlaltdavid/20632 
WL#20632 - Remove unused postLighting variable from code
 2015-07-23 08:24:09 -07:00