David Rowe
b718d27ac6
Merge branch 'master' into 20073
2014-10-10 12:04:36 -07:00
David Rowe
357d49d442
Fix building without Oculus library
2014-10-10 11:36:47 -07:00
David Rowe
b0f4bc0d1c
Tidy up log messages
2014-10-10 11:08:15 -07:00
David Rowe
0a5fdee1f2
Use NULL rather than 0 for "no overlay"
2014-10-10 11:00:41 -07:00
David Rowe
aa37ba5dfd
Use const parameters
2014-10-10 10:57:17 -07:00
David Rowe
64d9a96a2b
Update SVG file location
2014-10-10 10:42:13 -07:00
AndrewMeadows
2a8b002725
Merge pull request #3576 from ZappoMan/editToolsImprovements
...
First cut at new rotation UI/UX
2014-10-10 08:17:22 -07:00
Brad Hefta-Gaub
961590414c
Merge pull request #3574 from PhilipRosedale/master
...
Oculus fixed for 3rd person and fullscreen mirror view
2014-10-09 21:30:18 -07:00
ZappoMan
8105ded4eb
handle reloading a new url in billboard overlays
2014-10-09 21:12:05 -07:00
ZappoMan
e5572e9deb
don't render if alpha is 0
2014-10-09 19:20:33 -07:00
Andrzej Kapolka
51ff4cf7bb
Merge pull request #3567 from samcake/master
...
Improve the TextRenderer::draw(), step 1
2014-10-09 18:46:23 -07:00
Sam Gateau
6687660d2f
Fixing Andrzej's comments bis
2014-10-09 17:29:06 -07:00
Sam Gateau
1fc78e4277
Fixing Andrzej's comments
2014-10-09 17:18:51 -07:00
Philip Rosedale
f18faf9e3e
removed commented code.
2014-10-09 16:46:06 -07:00
Philip Rosedale
2da4345b21
First person and mirror HMD view almost fixed
2014-10-09 13:32:35 -07:00
Sam Gateau
86c20b26eb
Adding proper TODO and comments
2014-10-09 12:20:46 -07:00
Sam Gateau
d080d6347b
Fixing const usage on a template function
2014-10-09 11:10:04 -07:00
Sam Gateau
b0c02311c0
Fixing include filename case
2014-10-09 10:56:41 -07:00
Sam Gateau
adc4e8c513
Fixing unix file format issues with msdev2010
2014-10-09 10:39:28 -07:00
samcake
9f0936de53
Improve the TextRenderer::draw(), first step
...
- Introduce a managed Buffer for data to be used on the GPU. THis is the first type of resource (second will be texture) that we plan to use in the graphics engine in the long term. this is an api agnostic replacement to QGLBuggerObject
It's in the new file gpu/Resource.h(.cpp)
- Add two gpu::Buffers in the TextRenderer that collect all the glyph vertices (coords + texcoords + color) during the for loop on the string characters of the TextRenderer::draw(). Right now the text glyphs are then drawn in one draw call (and not one per character) at the end of the function.
THe step 2 plan is to keep on collecting all the glyphs from all the TextRenderer::Draw() issued during one frame and to draw all of them in a single drawcall. We decided to split the task in 2 so it's easier to review.
2014-10-09 10:17:50 -07:00
ZappoMan
2004159778
implement basic support for planar overlay type intersections
2014-10-08 20:29:53 -07:00
Brad Hefta-Gaub
c9c3ab985a
Merge pull request #3565 from PhilipRosedale/master
...
Simplify camera class to have no interpolation, simpler structure
2014-10-08 17:06:21 -07:00
Brad Hefta-Gaub
80e82c95ca
Merge pull request #3560 from birarda/xbox-controller
...
allow a call to Joysticks.reset to reset SDL while interface is running
2014-10-08 17:06:12 -07:00
Brad Hefta-Gaub
a673634245
Merge pull request #3559 from stojce/20084
...
CR for Job #20084 - Microsoft Windows - Chat window font needs to be fixed (see attached)
2014-10-08 17:05:40 -07:00
Philip Rosedale
01bef6be6d
remove unused cameraPushback variable
2014-10-08 15:28:29 -07:00
Andrzej Kapolka
19ec68309b
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-08 15:22:17 -07:00
Andrzej Kapolka
37eff685bc
Remove the "render lower detail as points" option. It doesn't seem too
...
promising.
2014-10-08 15:11:55 -07:00
Andrzej Kapolka
b5b82ed387
Provide the option to display lower detail metavoxel data as points.
2014-10-08 14:05:14 -07:00
Stephen Birarda
ce505c1b0c
add a missing HAVE_SDL wrap on setter in Joystick
2014-10-08 12:09:40 -07:00
Clément Brisset
e4f5f11429
Merge pull request #3557 from birarda/master
...
fix for window modalities
2014-10-08 11:53:48 -07:00
David Rowe
05915ae134
Make calibration message update its location more often
2014-10-08 11:53:07 -07:00
Andrzej Kapolka
049a00b85b
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-08 11:51:10 -07:00
Stephen Birarda
8e2d41f37f
remove deadzone handling from Joystick class
2014-10-08 11:41:07 -07:00
AndrewMeadows
4873528068
Merge pull request #3543 from birarda/domain-tunnel
...
handle local socket changes when moving networks for auto networked domains
2014-10-08 11:36:56 -07:00
Stephen Birarda
17b9f4a37d
allow a call to Joysticks.reset to reset SDL while interface is running
2014-10-08 11:34:45 -07:00
Philip Rosedale
12349a8854
Fix rearview mirror camera
2014-10-08 10:59:46 -07:00
Philip Rosedale
00c182ad7b
Fix full screen mirror keyboard controls
2014-10-08 10:51:06 -07:00
Philip Rosedale
2636fdd3cb
Fix third person camera distance
2014-10-08 10:23:45 -07:00
Stephen Birarda
b0a99c48a7
don't force metavoxel editor to stay on top
2014-10-08 10:05:13 -07:00
Stephen Birarda
a8a8b81386
don't make long and address bar modal so they don't steal input
2014-10-08 10:00:50 -07:00
Philip Rosedale
c4c9f4820d
First pass at simplifying camera, removes interpolation to target and setbacks
2014-10-08 10:00:47 -07:00
Stephen Birarda
3794e166ad
change LoginDialog modality so it doesn't steal input
2014-10-08 09:51:16 -07:00
AndrewMeadows
c56923d316
Merge pull request #3549 from ZappoMan/editToolsImprovements
...
add tick marks to planar ellipse/circle overlays
2014-10-08 09:33:34 -07:00
Stephen Birarda
7773a94df7
resolve conflicts on merge with upstream master
2014-10-08 09:27:16 -07:00
Sam Gateau
dda7c6699e
backup current work on TextRenderer
2014-10-07 23:52:00 -07:00
Philip Rosedale
f4b9ccbceb
remove unused camera functions
2014-10-07 21:51:46 -07:00
stojce
54ad9477e7
Add style to chat entry
2014-10-08 03:12:53 +02:00
Andrzej Kapolka
04b628bede
Added option to display Hermite data
2014-10-07 16:44:55 -07:00
stojce
fa58f53bff
remove font settings for chat entry
2014-10-08 01:28:24 +02:00
Stephen Birarda
6e81bde7bd
make position path clearer for address bar
2014-10-07 15:30:44 -07:00
