ZappoMan
caac5881bf
correctly handle unselect and dont show highlight when other tool is active
2014-10-10 21:39:05 -07:00
ZappoMan
f21ff76a38
dont allow stretching below a minimum dimension
2014-10-10 21:23:56 -07:00
ZappoMan
dfff16d9e8
make sure to not select other entities when clicking on a grab handle of a selected entity
2014-10-10 21:12:28 -07:00
ZappoMan
cdafba603d
use axis aligned bounding box for highlight and selection box instead of non-axis aligned box
2014-10-10 17:11:27 -07:00
Philip Rosedale
49c02267d3
Merge pull request #3580 from ZappoMan/editToolsImprovements
...
better handling of rotated entities
2014-10-10 11:03:04 -07:00
ZappoMan
ca66319aa2
draw selection handles for bounding box correctly when rotated
2014-10-10 10:37:32 -07:00
Stephen Birarda
f5ee55bef4
remove xbox.js now that we have gamepad.js
2014-10-10 09:44:38 -07:00
Stephen Birarda
d6f33cea51
Merge pull request #3578 from huffman/xbox-controller
...
Xbox controller script
2014-10-10 09:42:17 -07:00
Ryan Huffman
c69ad78d3b
Add wired 360 controller on Windows support
2014-10-10 09:30:51 -07:00
Ryan Huffman
a9eaf3b740
Update gamepad.js to work with wired 360 controller
2014-10-10 09:27:07 -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
ZappoMan
eae1e45ada
cleanup comments and dead code
2014-10-09 21:29:02 -07:00
ZappoMan
ec5ba59f0e
cleanup comment
2014-10-09 21:24:34 -07:00
ZappoMan
df16bd2b3c
cleanup comment
2014-10-09 21:24:09 -07:00
ZappoMan
3b01b652f3
clean up of rotation from all directions
2014-10-09 21:12:23 -07:00
ZappoMan
b1da04f0f0
support for snap to rotation
2014-10-09 19:41:51 -07:00
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
Ryan Huffman
0fce89a627
Add gamepad.js
2014-10-09 16:22:27 -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
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