ZappoMan
|
8c85c3261e
|
draw tickmarks for current roation correctly for pitch and roll as well
|
2014-10-10 22:11:27 -07:00 |
|
ZappoMan
|
a08ddecc3a
|
fix shifting tickmarks
|
2014-10-10 22:06:12 -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 |
|
Ryan Huffman
|
42479b1ae2
|
Add joystickWithName for PrioVR
|
2014-10-10 18:03:08 -07:00 |
|
Andrzej Kapolka
|
d1c6aef953
|
Fixed my swizzle!
|
2014-10-10 17:36:21 -07:00 |
|
Andrzej Kapolka
|
1d4d36444f
|
Bumped the metavoxel version number.
|
2014-10-10 17:34:16 -07:00 |
|
Ryan Huffman
|
a24b5c24a9
|
Update max axis value to reflect maximum negative value
|
2014-10-10 17:28:09 -07:00 |
|
Andrzej Kapolka
|
1f63656a14
|
Comment fix.
|
2014-10-10 17:25:25 -07:00 |
|
Andrzej Kapolka
|
dc8dc112c9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-10-10 17:19:24 -07:00 |
|
Andrzej Kapolka
|
60da0f1567
|
Allow drawing cursor on dual contour surface, wired up material paint tool.
|
2014-10-10 17:18:52 -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 |
|
ZappoMan
|
82a9429414
|
add boundingBox.dimensions to entity properties
|
2014-10-10 17:10:27 -07:00 |
|
Philip Rosedale
|
9be2b33971
|
Hair draped for masks and driven by audio loudness
|
2014-10-10 17:06:11 -07:00 |
|
Ryan Huffman
|
1c2a971638
|
Update gamepad.js to use new Joysticks interface
|
2014-10-10 17:03:25 -07:00 |
|
Ryan Huffman
|
762cc71d31
|
Update to SDL2
|
2014-10-10 17:03:10 -07:00 |
|
Brad Hefta-Gaub
|
324ddb2a2f
|
Merge pull request #3581 from birarda/remove-cara
remove cara face tracking, cleanup some warnings
|
2014-10-10 16:09:35 -07:00 |
|
Atlante45
|
d8c60a78bb
|
Fix stupid variable swap
|
2014-10-10 15:32:29 -07:00 |
|
Andrzej Kapolka
|
1911cfd0be
|
Basic ray/voxel intersection testing up and running.
|
2014-10-10 15:11:37 -07:00 |
|
Stephen Birarda
|
21114d5f56
|
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel
|
2014-10-10 14:30:43 -07:00 |
|
Stephen Birarda
|
df6f4d4c95
|
remove cara face tracking, cleanup warnings
|
2014-10-10 14:17:52 -07:00 |
|
Stephen Birarda
|
ad64ea62a1
|
Merge pull request #3579 from ctrlaltdavid/20073
CR for Job #20073 - Automatically calibrate the Oculus Rift after startup
|
2014-10-10 13:38:27 -07:00 |
|
David Rowe
|
edf8cb671d
|
Add "reset sensors" menu item corresponding to the apostrophe key
|
2014-10-10 13:24:48 -07:00 |
|
Andrzej Kapolka
|
c8c09a1e7b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-10-10 13:02:10 -07:00 |
|
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 |
|
Atlante45
|
9a928a3d55
|
Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones
|
2014-10-10 11:28:58 -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 |
|
Stephen Birarda
|
0a6618db77
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-10-10 10:47:35 -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 |
|
Atlante45
|
fb751aec7c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones
Conflicts:
domain-server/resources/web/js/settings.js
|
2014-10-10 10:24:28 -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
|
bf33b1b9eb
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-10-10 10:11:30 -07:00 |
|
Atlante45
|
7e8915fed8
|
Break out of double loop
|
2014-10-10 10:08:22 -07:00 |
|
Atlante45
|
0aafd23c7f
|
CR
|
2014-10-10 10:00:35 -07:00 |
|
Stephen Birarda
|
64b3d461fe
|
fix for delete of object table row
|
2014-10-10 10:00:35 -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
|
76d00f351d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel
|
2014-10-10 09:28:14 -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 |
|