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

17626 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Stephen Birarda
1fa0d8df72 change the add and remove style for glyphs in settings 2014-10-08 16:56:41 -07:00
Stephen Birarda
01e6acda39 changes to allow an array setting via table 2014-10-08 16:52:04 -07:00
Clément Brisset
ff2e811b60 Merge pull request #3564 from birarda/master 
tweaks to domain-server error messages
 2014-10-08 16:02:31 -07:00
Stephen Birarda
e6dee30a6a handle drawing a table for array values 2014-10-08 16:01:43 -07:00
Stephen Birarda
1136c1bf13 remove custom font and large X for errors 2014-10-08 15:49:08 -07:00
Stephen Birarda
4daa379b03 use sweet alert for nice error messages in domain-settings 2014-10-08 15:32:56 -07:00
Clément Brisset
b5b7cdbc71 Merge pull request #3561 from ZappoMan/master 
don't collide with entities with unknown IDs
 2014-10-08 15:31:48 -07:00
Philip Rosedale
cdd60dead2 Merge branch 'master' of https://github.com/worklist/hifi 2014-10-08 15:28:56 -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
ZappoMan
1990419eeb first cut at correct handle hide/show behavior and rotate overlay hide/show behavior 2014-10-08 15:15:49 -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
Clément Brisset
8bf29f85d7 Merge pull request #3562 from birarda/master 
styling changes for domain-server tables
 2014-10-08 15:00:52 -07:00
Stephen Birarda
51afd52ffb vertically center the glyphicon for table button 2014-10-08 14:56:09 -07:00
Stephen Birarda
f4eddbc93b change number to numbered for domain-server settings 2014-10-08 14:54:41 -07:00
Stephen Birarda
fb8c5c3bf0 initial styling changes to domain table 2014-10-08 14:52:53 -07:00
Stephen Birarda
4fd16f5444 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-08 14:52:18 -07:00
Stephen Birarda
dc139a63da Merge pull request #3556 from Atlante45/attenuation_zones 
Table structure for DS settings
 2014-10-08 14:12:12 -07:00
Andrzej Kapolka
b5b82ed387 Provide the option to display lower detail metavoxel data as points. 2014-10-08 14:05:14 -07:00
Atlante45
19d103c343 Indentation 2014-10-08 13:54:53 -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
Stephen Birarda
960ece98d0 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-08 11:53:46 -07:00
Andrzej Kapolka
049a00b85b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-08 11:51:10 -07:00