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
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
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
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
David Rowe
c6bf09f509
Fix model uploading for the case that haven't uploaded model before
2014-10-13 08:35:52 -07:00
ZappoMan
a08ddecc3a
fix shifting tickmarks
2014-10-10 22:06:12 -07:00
Ryan Huffman
42479b1ae2
Add joystickWithName for PrioVR
2014-10-10 18:03:08 -07:00
Andrzej Kapolka
d1c6aef953
Fixed my swizzle!
2014-10-10 17:36:21 -07:00
Ryan Huffman
a24b5c24a9
Update max axis value to reflect maximum negative value
2014-10-10 17:28:09 -07:00
Andrzej Kapolka
1f63656a14
Comment fix.
2014-10-10 17:25:25 -07:00
Andrzej Kapolka
dc8dc112c9
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-10 17:19:24 -07:00
Andrzej Kapolka
60da0f1567
Allow drawing cursor on dual contour surface, wired up material paint tool.
2014-10-10 17:18:52 -07:00
Ryan Huffman
762cc71d31
Update to SDL2
2014-10-10 17:03:10 -07:00
Andrzej Kapolka
1911cfd0be
Basic ray/voxel intersection testing up and running.
2014-10-10 15:11:37 -07:00
Stephen Birarda
df6f4d4c95
remove cara face tracking, cleanup warnings
2014-10-10 14:17:52 -07:00
David Rowe
edf8cb671d
Add "reset sensors" menu item corresponding to the apostrophe key
2014-10-10 13:24:48 -07:00
Andrzej Kapolka
c8c09a1e7b
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-10 13:02:10 -07:00
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
Andrzej Kapolka
7b0d002355
Working on ray/voxel intersection testing.
2014-10-09 19:51:02 -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
