Commit graph

17650 commits

Author SHA1 Message Date
David Rowe
b718d27ac6 Merge branch 'master' into 20073 2014-10-10 12:04:36 -07:00
David Rowe
357d49d442 Fix building without Oculus library 2014-10-10 11:36:47 -07:00
David Rowe
b0f4bc0d1c Tidy up log messages 2014-10-10 11:08:15 -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
David Rowe
0a5fdee1f2 Use NULL rather than 0 for "no overlay" 2014-10-10 11:00:41 -07:00
David Rowe
aa37ba5dfd Use const parameters 2014-10-10 10:57:17 -07:00
David Rowe
64d9a96a2b Update SVG file location 2014-10-10 10:42:13 -07:00
ZappoMan
ca66319aa2 draw selection handles for bounding box correctly when rotated 2014-10-10 10:37:32 -07:00
ZappoMan
db881c0dc8 add boundBox gettable property to EntityItemProperties 2014-10-10 10:32:18 -07:00
Clément Brisset
22cfe5b64f Merge pull request #3577 from birarda/master
fix for delete of object table row
2014-10-10 10:12:03 -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
Stephen Birarda
3aca910e17 remove some extra console logs 2014-10-10 09:27:15 -07:00
Ryan Huffman
a9eaf3b740 Update gamepad.js to work with wired 360 controller 2014-10-10 09:27:07 -07:00
Stephen Birarda
d2c7bf4334 fix for delete of object table row 2014-10-10 09:26:41 -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
Brad Hefta-Gaub
961590414c Merge pull request #3574 from PhilipRosedale/master
Oculus fixed for 3rd person and fullscreen mirror view
2014-10-09 21:30:18 -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
8105ded4eb handle reloading a new url in billboard overlays 2014-10-09 21:12:05 -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
e5572e9deb don't render if alpha is 0 2014-10-09 19:20:33 -07:00
Andrzej Kapolka
51ff4cf7bb Merge pull request #3567 from samcake/master
Improve the TextRenderer::draw(), step 1
2014-10-09 18:46:23 -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
b50e996ec8 added Vec3.orientedAngle() 2014-10-09 17:35:58 -07:00
Sam Gateau
6687660d2f Fixing Andrzej's comments bis 2014-10-09 17:29:06 -07:00
Sam Gateau
1fc78e4277 Fixing Andrzej's comments 2014-10-09 17:18:51 -07:00
Philip Rosedale
2a502ae97c Merge pull request #3569 from ey6es/metavoxels
Improved dual contour averaging.
2014-10-09 16:55:55 -07:00
Philip Rosedale
f18faf9e3e removed commented code. 2014-10-09 16:46:06 -07:00
Philip Rosedale
36044d772c Merge branch 'master' of https://github.com/worklist/hifi 2014-10-09 16:31:47 -07:00
Ryan Huffman
0fce89a627 Add gamepad.js 2014-10-09 16:22:27 -07:00
Stephen Birarda
57211927ac Merge pull request #3572 from birarda/master
fix error in describe json
2014-10-09 15:29:29 -07:00
Stephen Birarda
95bca3f33e fix an error in describe json 2014-10-09 15:29:15 -07:00
Stephen Birarda
cd531ccf0c Merge pull request #3571 from birarda/master
remove allowed users from describe until ready
2014-10-09 15:28:22 -07:00
Stephen Birarda
90a79fc6f5 remove allowed users from describe until ready for primetime 2014-10-09 15:27:51 -07:00
Clément Brisset
eb26b64ae2 Merge pull request #3570 from birarda/master
fix for array tables with multiple columns
2014-10-09 15:26:42 -07:00
Stephen Birarda
7eae64a26b constantize the delete row button classes 2014-10-09 15:24:12 -07:00
Stephen Birarda
c748ecb967 constantize the new row class 2014-10-09 15:22:20 -07:00
Stephen Birarda
e80cf6fc76 highlight new rows by making them green 2014-10-09 15:21:38 -07:00
Stephen Birarda
4d13718d87 constantize the trigger change class for input changes 2014-10-09 15:19:56 -07:00
Stephen Birarda
712a81c950 more constantization and removal of extra line 2014-10-09 15:17:45 -07:00
Stephen Birarda
ee36b6b91a jump to input for next row after enter on previous row 2014-10-09 15:12:42 -07:00
Stephen Birarda
a6c5f4308a handle the enter button in domain server forms 2014-10-09 15:10:17 -07:00
Stephen Birarda
ad48592a69 start to constantize some classes in settings.js 2014-10-09 15:02:14 -07:00
Stephen Birarda
9dc0bf52b8 constantize the advanced settings class 2014-10-09 14:44:24 -07:00