ZappoMan
89f423255e
use large target for rotate overlays so we are guarenteed to hit the plane
2014-10-09 19:21:15 -07:00
ZappoMan
f1bc6d729c
make rotate handles work as expected
2014-10-09 18:01:48 -07:00
ZappoMan
f6c07a5ada
first cut at making the rotate handles actually rotate
2014-10-09 17:37:56 -07:00
ZappoMan
458475ee64
work on intersection with rotation overlays
2014-10-08 20:31:46 -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
ZappoMan
1990419eeb
first cut at correct handle hide/show behavior and rotate overlay hide/show behavior
2014-10-08 15:15:49 -07:00
Philip Rosedale
905b52eab4
Merge pull request #3558 from ctrlaltdavid/leap-hand-fixes
...
Leap hand fixes
2014-10-08 11:35:56 -07:00
David Rowe
a3cce3ae22
Fix Leap hand roll
2014-10-08 10:11:18 -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
Philip Rosedale
244256bb91
Merge pull request #3482 from DaveDubUK/19970
...
Code Review for Job #19970
2014-10-07 15:37:15 -07:00
David Rowe
373d2f0532
Work-around for right hand roll on Windows is no longer needed
2014-10-07 14:50:29 -07:00
Clément Brisset
3283c861b1
Merge pull request #3529 from huffman/19903
...
CR for Job #19903 - When you bring in an FBX apply the default scale to the model
2014-10-06 18:21:28 -07:00
ZappoMan
12deec928c
add tick marks to planar ellipse/circle overlays
2014-10-06 14:15:22 -07:00
David Rowe
08147380c7
Fix property names used for text overlay colors
2014-10-06 14:09:23 -07:00
Leonardo Murillo
1de473a013
Fixing globals var scopt
2014-10-06 14:27:25 -06:00
Andrzej Kapolka
0d5f81c062
Merge pull request #3540 from samcake/temp0
...
replacing glutSolidSPhere by a cached Geometry
2014-10-06 12:23:44 -07:00
Clément Brisset
b8c7a9263c
Merge pull request #3544 from murillodigital/master
...
Changing bucket name
2014-10-06 11:39:52 -07:00
Leonardo Murillo
f0852ba283
Using new variable in all references to S3 bucket
2014-10-06 11:21:35 -06:00
Ryan Huffman
e70c57cb95
Replace magic numbers wiht const values
2014-10-06 08:37:07 -07:00
Thijs Wenker
b7165cb353
store the last selected audio device
2014-10-05 21:11:42 +02:00
Sam Gateau
bd5c6517a5
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
...
Conflicts:
interface/src/ui/MetavoxelEditor.cpp
interface/src/ui/overlays/Sphere3DOverlay.cpp
2014-10-03 17:31:05 -07:00
Sam Gateau
738369e21f
Replacing glutSolidSphere by a cached Geometry
...
Instead of calling glutSolidSphere, just call Application::getInstance()->getGeometryCache()->renderSphere(...)
- replaced all the instances of "glutSolidSphere"
- Changed the atmosphere shaders so instead of drawing a sphere of the size of the atmosphere, we draw a unit sphere, the vertices get scaled at the right radius in th vertex shader using fOuterRadius
2014-10-03 16:55:58 -07:00
ZappoMan
23f584d9da
added file headers
2014-10-03 09:26:09 -07:00
ZappoMan
4ad10cb6cc
fix comment
2014-10-03 04:27:41 -07:00
ZappoMan
023916e7e5
Merge branch 'master' of https://github.com/highfidelity/hifi into editToolsImprovements
2014-10-03 04:25:24 -07:00
ZappoMan
f7a8689436
hide rotate handles till implemented
2014-10-03 04:25:13 -07:00
ZappoMan
98c959d94c
implement more corner stretching
2014-10-03 04:21:44 -07:00
ZappoMan
f6fc1173e6
fix RBN stretching, tweak some names, add some additional edge grabbers to some sides
2014-10-03 03:52:57 -07:00
ZappoMan
ea0d74b957
implement TOP, BOTTOM, LEFT, RIGHT side stretching
2014-10-03 03:33:32 -07:00
ZappoMan
6207e951b6
implement FAR side stretching
2014-10-03 03:17:45 -07:00
ZappoMan
88c983cd3b
dry up some code
2014-10-03 03:12:09 -07:00
ZappoMan
4af3968e01
move XZ translation into the selection tool so that it plays nice with stretchers
2014-10-03 03:03:48 -07:00
ZappoMan
05f2263c9c
implement NEAR face stretch
2014-10-03 02:31:45 -07:00
ZappoMan
370d01b1f5
implement up/down translation
2014-10-03 01:16:26 -07:00
ZappoMan
175e5d5f79
add ray picking to 3D overlays
2014-10-02 20:44:49 -07:00
Clément Brisset
a5f524c4e5
Merge pull request #3528 from ctrlaltdavid/20049
...
CR for Job #20049 - Leap - Some fixes to Leap
2014-10-02 18:31:55 -07:00
ZappoMan
ab58a4e5b8
tweaks to translation, reduce redraws of selection handles
2014-10-02 17:58:18 -07:00
ZappoMan
d666f9ce98
Merge branch 'master' of https://github.com/highfidelity/hifi into editToolsImprovements
...
Conflicts:
examples/editModels.js
2014-10-02 15:17:59 -07:00
ZappoMan
4ed047cf98
first pass at newEditEntities.js
2014-10-02 15:15:52 -07:00
ZappoMan
bfde23349f
moving libraries style JS files to libraries
2014-10-02 15:15:09 -07:00
Ryan Huffman
d7f383f74a
Fix failure case when resizing a new model
2014-10-02 12:10:20 -07:00
Ryan Huffman
b2229a9a9f
Update editModels.js to automatically resize new models to their naturalDimensions
2014-10-02 12:05:20 -07:00
ZappoMan
d0026cd529
latest selection UI features: grabbers, and rotate handles in correct locations
2014-10-02 10:19:51 -07:00
Brad Hefta-Gaub
4e752f9bb8
Merge pull request #3520 from Adrianl3d/20082
...
CR for Job #20082 - Entity properties bad readable, background is wrong sized
2014-10-02 08:35:50 -07:00
David Rowe
51f229af57
Make recalibrate Leap-on-desk if avatar head or skeleton changes
2014-10-01 18:34:56 -07:00
David Rowe
38b6d5dd5d
Make leapHands.js handle Leap-on-HMD setting changes
2014-10-01 16:05:19 -07:00
David Rowe
84a3f6e8f4
Make recalibrate Leap-on-desk if avatar scale changes
2014-10-01 15:00:19 -07:00
ZappoMan
060a690f85
moved the selection display class into own file
2014-10-01 09:46:34 -07:00
