Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 14:01:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
17689 commits 76 branches 59 tags 1.2 GiB
Commit graph

1059 commits

Author SHA1 Message Date
Ryan Huffman
f178de3b2e Merge branch 'master' of github.com:highfidelity/hifi into entity-tools 2014-10-13 21:25:47 -07:00
Clément Brisset
200c0e080e Merge pull request #3589 from ZappoMan/editToolsImprovements 
highlight grabber handles on hover
 2014-10-13 16:19:57 -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
ZappoMan
45a5768750 highlight grabber handles on hover 2014-10-13 12:19:38 -07:00
ZappoMan
2b6cd6d29a add debugging for ryan's rotate problems 2014-10-13 11:33:06 -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
8c85c3261e draw tickmarks for current roation correctly for pitch and roll as well 2014-10-10 22:11:27 -07:00
ZappoMan
e6d7add5dc display tickmarks on the current rotation overlay 2014-10-10 21:57:10 -07:00
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
Ryan Huffman
1c2a971638 Update gamepad.js to use new Joysticks interface 2014-10-10 17:03:25 -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
Ryan Huffman
77890e4075 Add automatic resizing to natural dimensions in newEditEntities.js 2014-10-09 11:33:31 -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