Commit graph

17814 commits

Author SHA1 Message Date
Stephen Birarda
9dc0bf52b8 constantize the advanced settings class 2014-10-09 14:44:24 -07:00
Stephen Birarda
2472dc0c11 handle transition from input to row for array of objects 2014-10-09 14:42:21 -07:00
Atlante45
06bd9ba16e Split settings parsing according to new structure 2014-10-09 14:39:31 -07:00
Stephen Birarda
323eaa0ac9 remove an extra space 2014-10-09 14:36:33 -07:00
Stephen Birarda
6cef4dbce4 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-09 14:36:05 -07:00
Stephen Birarda
98925e4adb handle removal of last row and removal of hidden input for empty array 2014-10-09 14:34:05 -07:00
Andrzej Kapolka
66b83d0ff9 Increment packet version to avoid crashes. 2014-10-09 14:31:41 -07:00
Stephen Birarda
e1b64275c9 fix population of multi-column array from values in settings 2014-10-09 14:26:39 -07:00
Andrzej Kapolka
f69184d8cb Adjustment of threshold multiplier for metavoxels. 2014-10-09 14:22:22 -07:00
Andrzej Kapolka
df49bf8dda Substantial betterification of Hermite data averaging. 2014-10-09 14:04:51 -07:00
Philip Rosedale
2da4345b21 First person and mirror HMD view almost fixed 2014-10-09 13:32:35 -07:00
Atlante45
06007863d2 Fixed placeholder 2014-10-09 12:39:00 -07:00
Atlante45
72e4785db2 Reorganized settings 2014-10-09 12:38:46 -07:00
Atlante45
e7ecf1cd6f Optional labels 2014-10-09 12:38:07 -07:00
Atlante45
4c3f32782a Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-09 12:22:57 -07:00
Clément Brisset
e451942a85 Merge pull request #3568 from birarda/master
add array type to domain-server setting tables
2014-10-09 12:22:30 -07:00
Sam Gateau
86c20b26eb Adding proper TODO and comments 2014-10-09 12:20:46 -07:00
Stephen Birarda
6d01724568 rename in changedInput in badge sidebar in settings.js 2014-10-09 11:57:11 -07:00
Stephen Birarda
84fa1c7f5f remove an extra space 2014-10-09 11:54:53 -07:00
Stephen Birarda
806e73d321 don't set data-changed when a row is added and deleted in same session 2014-10-09 11:54:37 -07:00
Atlante45
981666cb38 Moved audioMixer setting parsing to its own function 2014-10-09 11:49:55 -07:00
Atlante45
195186f726 Removed redundant TREE_SCALE declaration 2014-10-09 11:48:41 -07:00
Ryan Huffman
77890e4075 Add automatic resizing to natural dimensions in newEditEntities.js 2014-10-09 11:33:31 -07:00
Stephen Birarda
5bb0c4e8fb remove an extra debug of posted settings in DSSM 2014-10-09 11:32:09 -07:00
Stephen Birarda
bfaf96dbf5 remove the allowed_users setting that isn't ready for primetime 2014-10-09 11:31:30 -07:00
Stephen Birarda
68dffabd5e handle data-changed setting for all array values 2014-10-09 11:31:00 -07:00
Sam Gateau
d080d6347b Fixing const usage on a template function 2014-10-09 11:10:04 -07:00
Stephen Birarda
51d908008c handle array posting in domain server settings manager 2014-10-09 11:00:58 -07:00
Stephen Birarda
a175c22724 handle addition and removal on same page session 2014-10-09 10:56:54 -07:00
Sam Gateau
b0c02311c0 Fixing include filename case 2014-10-09 10:56:41 -07:00
Stephen Birarda
f39120519d fix removal icons, handle row removal for hash 2014-10-09 10:50:05 -07:00
Sam Gateau
adc4e8c513 Fixing unix file format issues with msdev2010 2014-10-09 10:39:28 -07:00
Stephen Birarda
a416f67751 handle add and delete for badged sidebar 2014-10-09 10:33:20 -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
Stephen Birarda
90c73dc9e1 post an empty array to remove an array from settings 2014-10-09 09:47:53 -07:00
Stephen Birarda
188320a7b7 badge sidebar for table removal 2014-10-09 09:37:24 -07:00
AndrewMeadows
acaff7ea13 Merge pull request #3566 from ctrlaltdavid/leap-finger-fixes
Leap finger fixes
2014-10-09 08:11:30 -07:00
David Rowe
8954e1d6e1 Document non-usage of Leap controller's first finger joints 2014-10-08 22:11:36 -07:00
David Rowe
cf3d2c7b4a Fix Leap finger joints 2014-10-08 21:31:46 -07:00
ZappoMan
458475ee64 work on intersection with rotation overlays 2014-10-08 20:31:46 -07:00
ZappoMan
2004159778 implement basic support for planar overlay type intersections 2014-10-08 20:29:53 -07:00
ZappoMan
4558caf431 display current pitch/yaw/roll in rotation overlays 2014-10-08 19:30:43 -07:00
ZappoMan
18f3a208f7 fix property edit dialog box 2014-10-08 19:29:07 -07:00
ZappoMan
e544c06b92 correctly reselect entity after property edits to make sure handles move if dimensions or position changes 2014-10-08 19:28:40 -07:00
Philip Rosedale
388a8bd046 Merge branch 'master' of https://github.com/worklist/hifi 2014-10-08 17:08:33 -07:00
Stephen Birarda
ed6b62cea4 clear a row value after it is added to the table 2014-10-08 17:07:31 -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
27a5042943 Merge pull request #3563 from ey6es/metavoxels
Basic averaging for dual contour data, added option to display Hermite data.
2014-10-08 17:04:24 -07:00