Commit graph

991 commits

Author SHA1 Message Date
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
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
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
ZappoMan
060a690f85 moved the selection display class into own file 2014-10-01 09:46:34 -07:00
Philip Rosedale
8f40780af0 Merge pull request #3517 from ctrlaltdavid/20048
CR for Job #20048 - Leap - Make leapHands.js work with Leap-on-Rift
2014-09-30 21:06:45 -07:00
ZappoMan
c3b0700601 introduce Planar3DOverlay for common features of rectangle and circle, introduced rectanglular 3D plane 2014-09-30 14:52:44 -07:00
Thijs Wenker
9ba2a9736c style 2014-09-30 22:23:40 +02:00
Thijs Wenker
eed6e2e8f6 - Edit -> Model List menu option
- Combo items can be JS objects now, write a toString() function for each JS object to describe them
2014-09-30 22:11:21 +02:00
ZappoMan
7fc6eecca7 added support for dashed lines for 3D Circle overlays 2014-09-30 11:27:16 -07:00
David Rowe
26cd76e07b Position and orient hands when using Leap on HMD 2014-09-30 10:08:50 -07:00
ZappoMan
16cdc2614f added circle overlays 2014-09-30 10:06:39 -07:00
Philip Rosedale
a07a0f4f72 Disable room limits set for demo comedy club 2014-09-30 09:57:05 -07:00
Adrianl3d
2ab38ace1b Improved contrast to textOverlay and resize
Increased background alpha, increased text color, and resize to allow
for new properties.
2014-09-30 16:34:47 +10:00
ZappoMan
25b072cb22 first cut at new glowing pulsing select ui in editModels.js 2014-09-29 16:46:17 -07:00
David Rowe
c02cd66dcb Don't calibrate avatar for Leap Motion if mounted on HMD 2014-09-28 17:19:47 -07:00
ZappoMan
cbc502553b add rescale support to entity properties UI 2014-09-26 16:25:24 -07:00
ZappoMan
21b0e31ee1 Merge branch 'master' of https://github.com/highfidelity/hifi into moreWorkOnCollidingEntitites 2014-09-26 12:21:51 -07:00
ZappoMan
2d81d7c554 add support for ignore collisions and collisions will/wont move entities 2014-09-26 11:43:56 -07:00
Philip Rosedale
7c1333dcb0 Merge pull request #3486 from ZappoMan/moreWorkOnCollidingEntitites
Improvements to entity collisions (using shape collider)
2014-09-26 11:25:51 -07:00
Atlante45
a4a5d71caa Merge branch 'fix_attachment_bug_with_recording' of github.com:Atlante45/hifi into radio_js
Conflicts:
	libraries/audio/src/AudioInjector.cpp
2014-09-26 10:45:34 -07:00
Atlante45
cf925120ca Merge branch 'master' of https://github.com/highfidelity/hifi into fix_attachment_bug_with_recording 2014-09-25 19:23:46 -07:00
Atlante45
3baa992bc3 Fixed radio model 2014-09-25 18:56:37 -07:00
Atlante45
11a5358a6e Adapted radio.js to new funciton calls 2014-09-25 18:12:30 -07:00
ZappoMan
fa8c5b85ff allow you to edit mass 2014-09-25 17:00:35 -07:00
Brad Hefta-Gaub
0775e9dde4 Merge pull request #3479 from PhilipRosedale/master
Improved eye contact, audio driven mouth and brows, linear audio scope
2014-09-25 09:32:37 -07:00
Brad Hefta-Gaub
712f88baa3 Merge pull request #3476 from birarda/xbox-controller
add script support for general SDL controllers
2014-09-25 09:25:08 -07:00
Atlante45
2766b6a4d7 Make radio show up in front of you 2014-09-24 17:12:49 -07:00
Atlante45
75dc26c9ff Slider can moved when recording paused or stoped 2014-09-24 16:19:47 -07:00
Stephen Birarda
13d3eb02e3 report the 360 axis values in xbox.js 2014-09-23 17:19:57 -07:00
Stephen Birarda
00b0806c4d move JoystickManager to JoystickScriptingInterface, add Joystick class for SDL Joystick 2014-09-23 17:09:46 -07:00
Stephen Birarda
900daf48eb initial working connection of an xbox gamepad 2014-09-23 14:48:44 -07:00
Atlante45
af341247af Recorder.js UI + pause and slider bar implementation 2014-09-23 14:29:00 -07:00
Philip Rosedale
21a15cff2a Avatar can look at corrected position when looking at me 2014-09-23 12:50:47 -07:00
Atlante45
fb982870c6 Added passive play bar to Recorder.js 2014-09-23 11:51:19 -07:00
Atlante45
33236b6c40 Removed extra space 2014-09-23 11:02:25 -07:00
Andrew Meadows
57dd9fba28 adding move.js, removing swissArmyJetpack.js 2014-09-19 16:55:04 -07:00
AndrewMeadows
76f78e77d1 Merge pull request #3461 from PhilipRosedale/master
final tweaks to movement script
2014-09-19 09:23:14 -07:00
Philip Rosedale
6c808f2979 final tweaks to movement script 2014-09-19 09:22:27 -07:00