AndrewMeadows
61d12ba0a9
Merge pull request #3709 from huffman/entity-tool-updates
...
Entity tool cleanup and fixes
2014-11-03 08:37:01 -08:00
AndrewMeadows
aa726bdb56
Merge pull request #3708 from DaveDubUK/19996
...
CR for Job #19996 - Applying the principles of animation to a procedural animation script
2014-11-03 08:25:43 -08:00
ZappoMan
2ffe15c833
add example entity script for change color on hover
2014-11-01 11:43:40 -07:00
Thijs Wenker
af74fc09b9
Adds AudioDevice mute functionality to ScriptEngine
2014-11-01 02:42:22 +01:00
ZappoMan
a5088eece6
first cut at running scripts from entities
2014-10-31 14:03:30 -07:00
David Rowe
f84030ce3f
Fix pan and orbit camera controls in inspect.js after API change
2014-10-30 19:16:29 -07:00
ZappoMan
fecea5fe3c
fixes to the Model List feature in editModels.js and added it to new edit
2014-10-30 15:27:05 -07:00
Ryan Huffman
7ccacbd8ac
Remove old entity selection code and fix rotation bug
2014-10-30 14:57:23 -07:00
ZappoMan
81cc15495f
rename Models to Entities, and add menu option to disable Light entities
2014-10-30 14:43:43 -07:00
Ryan Huffman
55fdbfec1f
Disable edit camera tools
2014-10-30 14:43:35 -07:00
Brad Hefta-Gaub
12fbc9a039
Merge pull request #3705 from birarda/lobby
...
lobby easter egg for status
2014-10-30 11:40:24 -07:00
Stephen Birarda
bc24fa7de0
lobby easter egg for status
2014-10-30 11:39:37 -07:00
AndrewMeadows
4cf77d1c6c
Merge pull request #3702 from ZappoMan/lockAndMaterialProperties
...
Lock and textures properties
2014-10-30 11:35:38 -07:00
Brad Hefta-Gaub
cdca6588e2
Merge pull request #3704 from huffman/orbit-camera
...
Update edit camera controls to hide cursor when orbiting
2014-10-30 11:28:27 -07:00
Ryan Huffman
87a17f869f
Update edit camera controls to hide cursor
2014-10-30 11:25:39 -07:00
Stephen Birarda
409a01c498
show the reticle sphere in lobby interface
2014-10-30 11:16:52 -07:00
ZappoMan
95c5b417c9
texture support in model entities
2014-10-30 11:04:19 -07:00
Stephen Birarda
35dc72521b
only show sphere if user is wearing the oculus
2014-10-30 10:44:55 -07:00
Stephen Birarda
ec126f16d5
make the oculus reticle a sphere overlay
2014-10-30 10:43:10 -07:00
Stephen Birarda
ae4233c680
add a missing semicolon for @zappoman
2014-10-30 10:22:30 -07:00
Stephen Birarda
2aebfc968a
don't render Avatars when in lobby
2014-10-30 10:21:52 -07:00
Stephen Birarda
183d080b1e
use new lobby panel wall to avoid shimmer on frame edge
2014-10-30 10:11:05 -07:00
ZappoMan
c650cabb5d
support for locked property, some plumbing for textures property
2014-10-30 10:05:20 -07:00
Brad Hefta-Gaub
12c79b2be8
Merge pull request #3696 from birarda/lobby
...
tweaks to lobby to add the orb shell
2014-10-30 09:20:21 -07:00
Stephen Birarda
136aba450b
add semicolons back to all of lobby, fix long line
2014-10-30 09:18:46 -07:00
ZappoMan
83706cfc4e
Revert "remove sample code"
...
This reverts commit bde221c0c3
.
2014-10-29 21:22:06 -07:00
ZappoMan
bde221c0c3
remove sample code
2014-10-29 21:09:31 -07:00
Brad Hefta-Gaub
6b4b0bc8a4
Merge pull request #3693 from Adrianl3d/20016
...
CR for Job #20016 - Input box overlay in Javascript
2014-10-29 20:45:57 -07:00
Adrianl3d
2532a54a2d
code tidy up
...
Fixed indentation, fixed text overflow.
2014-10-30 13:28:50 +10:00
Stephen Birarda
4a32b5acf3
add a reticle so oculus selection is more obvious
2014-10-29 16:19:44 -07:00
Stephen Birarda
64c5405a36
use an ORB_SHIFT variable to easily shift the orb position
2014-10-29 16:01:33 -07:00
Stephen Birarda
88475f6154
fix positioning of lobby panel wall inside orb sphere
2014-10-29 15:47:23 -07:00
Stephen Birarda
26f71de65f
Merge branch 'master' of https://github.com/highfidelity/hifi into lobby
2014-10-29 14:50:47 -07:00
Stephen Birarda
a333325a92
when user drops into lobby hide everything else
2014-10-29 14:29:28 -07:00
Brad Hefta-Gaub
d49b617a4a
Merge pull request #3695 from RyanDowne/master
...
Philip's head move script changes
2014-10-29 13:59:26 -07:00
Brad Hefta-Gaub
daf867f3ee
Merge pull request #3694 from birarda/lobby
...
initial version of the lobby panel wall to jump to locations
2014-10-29 13:59:02 -07:00
Ryan
d8ce5d530f
Philip's head move script changes
2014-10-29 13:50:49 -07:00
Stephen Birarda
ed098be2bc
don't remove testModelOverlaySubMeshes
2014-10-29 13:49:12 -07:00
Stephen Birarda
cb4ae5f1bb
initial version of the lobby script to jump to locations
2014-10-29 13:43:59 -07:00
Brad Hefta-Gaub
51531e1fb5
Merge pull request #3689 from huffman/fix-edit-entities-arrow
...
Fix issue with arrow keys moving objects when edit mode off
2014-10-29 12:11:06 -07:00
ZappoMan
c3d1d13fa9
Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes
2014-10-29 11:56:27 -07:00
ZappoMan
0696bd39f5
added example script for lobby model overlays
2014-10-29 11:39:23 -07:00
Ryan Huffman
e8f7c2c2ae
Fix issue with arrow keys moving objects when edit mode off
2014-10-29 11:20:19 -07:00
Adrianl3d
1d335c1218
Added textInputOverlayExample.js
...
Displays a text overlay and captures keystrokes which appear on the
overlay. Demonstrates keystroke events, mouse click events, clickable
text overlay and image overlay buttons
2014-10-29 23:39:44 +10:00
Brad Hefta-Gaub
caecf473ff
Merge pull request #3678 from huffman/entity-tool-fixes
...
Entity tool updates and fixes
2014-10-28 15:24:21 -07:00
Ryan Huffman
bdfdeecc46
Fix bug with entity selection shadow
2014-10-28 13:45:31 -07:00
Ryan Huffman
af103b22ff
Remove extra print statements and whitespace
2014-10-28 13:42:40 -07:00
Ryan Huffman
76c3e9f483
Add support for undoing duplication and deletion commands
2014-10-28 13:42:02 -07:00
Ryan Huffman
68f51d2484
Add entity tool support for unkown entity ids
2014-10-28 13:39:41 -07:00
ZappoMan
8debb33c6a
default light properties
2014-10-28 12:44:57 -07:00
Ryan Huffman
8f53e1731b
Add selectionManager.setSelections and hasSelection
2014-10-28 12:40:44 -07:00
ZappoMan
c3cd733c2f
tweaks to edits for lights
2014-10-28 12:40:17 -07:00
ZappoMan
8570088f9d
added light exampple
2014-10-28 12:26:45 -07:00
Ryan Huffman
e21bf78d04
Remove cancel tool functionality
2014-10-28 11:21:26 -07:00
ZappoMan
7d2ef7923b
Merge branch 'master' of https://github.com/highfidelity/hifi into moreLightPropertiesAttempt2
2014-10-28 10:50:02 -07:00
Ryan Huffman
21b6a93fef
Add entity tool for movement using arrow keys
2014-10-28 10:12:17 -07:00
Ryan Huffman
48eaa7ce12
Cleanup entity tools
2014-10-28 10:11:18 -07:00
Ryan Huffman
97ede6c75a
Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-fixes
2014-10-28 10:00:49 -07:00
Ryan Huffman
e7d67ee3ba
Move rotation handle update to a separate function
2014-10-28 10:00:34 -07:00
DaveDubUK
d1404aa7d3
Minor code edits
2014-10-28 16:57:53 +00:00
ZappoMan
5d7a0c2934
added light properties to edit tools
2014-10-27 14:34:43 -07:00
AndrewMeadows
fecf7ba5ed
Merge pull request #3667 from PhilipRosedale/master
...
HeadMove: Double click on spacebar turns around
2014-10-27 11:00:34 -07:00
AndrewMeadows
9d93ec5a5a
Merge pull request #3656 from huffman/separate-camera-tool
...
Add camera move tool for editing
2014-10-27 10:54:02 -07:00
Philip Rosedale
4b7eb682b3
Easier to get out of body and move from there with target
2014-10-27 08:44:45 -07:00
Philip Rosedale
fde85bb4d2
don't spam
2014-10-26 21:18:54 -07:00
Philip Rosedale
8158733a27
double click to turn around
2014-10-24 20:21:57 -07:00
Stephen Birarda
57e7fa233f
Merge pull request #3664 from PhilipRosedale/master
...
Tour Guide script to let you follow people, better hair
2014-10-24 17:10:57 -07:00
Philip Rosedale
54197b2c23
fix for spacing
2014-10-24 17:10:46 -07:00
Philip Rosedale
1e832e7bbb
Tour guide script
2014-10-24 16:38:24 -07:00
Stephen Birarda
8ae1f980f5
don't make headMove changes if key is auto repeating
2014-10-24 16:13:01 -07:00
Ryan Huffman
e556886c72
Add entity copying and axis constraining to entity tools
2014-10-23 15:28:16 -07:00
Ryan Huffman
fde7b30501
Add Camera::modeUpdated()
2014-10-23 14:47:41 -07:00
Ryan Huffman
28095e9972
Remove print statements in edit entities
2014-10-23 14:47:07 -07:00
Ryan Huffman
5b5a1745fd
Add camera move tool
2014-10-23 14:46:39 -07:00
Leonardo Murillo
a4965e7f60
No need for https when downloading assets
2014-10-23 13:59:08 -06:00
Philip Rosedale
3ba3354e11
Merge pull request #3636 from Atlante45/reverb
...
Reverb
2014-10-22 21:51:57 -07:00
Clément Brisset
bf9d467328
Merge pull request #3638 from huffman/entity-tools-updates
...
Entity tool fixes
2014-10-22 17:40:21 -07:00
Philip Rosedale
d3fa3fbbac
Merge pull request #3640 from PhilipRosedale/master
...
can warp at any yaw angle
2014-10-22 15:43:12 -07:00
Philip Rosedale
70f72f9404
can warp at any yaw angle
2014-10-22 15:09:43 -07:00
Ryan Huffman
14555c4534
Add UndoStackScriptingInterface and support when editing entities
2014-10-22 14:54:04 -07:00
Atlante45
86c965a922
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb
2014-10-22 14:20:22 -07:00
Ryan Huffman
0bda7699a6
Disable properties menu with multi-selection
2014-10-22 10:38:24 -07:00
Ryan Huffman
5b9806dc0d
Fix deletion with multi-selection
2014-10-22 10:37:17 -07:00
Ryan Huffman
078d14ae58
Fix rotation overlay size with multi-selection
2014-10-22 10:36:58 -07:00
Ryan Huffman
52dacaab02
Update entity editing to force SPACE_LOCAL for single-selection
2014-10-22 10:36:44 -07:00
ZappoMan
2f9766e051
first cut at light entity
2014-10-22 08:41:31 -07:00
Ryan Huffman
d9029beaa4
Merge remote-tracking branch 'upstream/master' into entity-tools-multi-selection
2014-10-21 15:17:07 -07:00
Ryan Huffman
d5c7c60553
Update entity edit tools
...
Move editing functions into "tool" objects which contain onBegin,
onMove, and onEnd functions.
Add multi-selection
Add local and world editing modes
Fix XZ tool
2014-10-21 15:15:26 -07:00
Philip Rosedale
2a5b2d8686
Improved version of headMove with timed target reveal
2014-10-21 11:40:16 -07:00
Philip Rosedale
4e605f5f67
First headMove "no-barf" version with lean/nod to walk, turn
2014-10-21 00:20:08 -07:00
Atlante45
5a11104bdf
Updated script
2014-10-20 13:45:16 -07:00
Atlante45
86b87770c2
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb
2014-10-17 16:50:19 -07:00
Ryan Huffman
2a4092f287
Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tools-new
2014-10-17 12:44:11 -07:00
ZappoMan
6fdd489715
more Particles to Entities migration
2014-10-17 10:25:52 -07:00
ZappoMan
a1ecad683a
more Particles to Entities migration
2014-10-17 10:17:18 -07:00
ZappoMan
0ff6c491d4
more Particles to Entities migration
2014-10-17 10:11:47 -07:00
ZappoMan
25270efa42
more Particles to Entities migration
2014-10-17 10:01:08 -07:00
ZappoMan
aaa76f6071
more Particles to Entities migration
2014-10-17 09:59:03 -07:00
ZappoMan
597bfa33b9
more Particles to Entities migration
2014-10-17 09:53:53 -07:00
ZappoMan
e5b665cc30
more Particles to Entities migration
2014-10-17 09:50:15 -07:00
ZappoMan
c5c44e7cec
more Particles to Entities migration
2014-10-16 21:13:34 -07:00
ZappoMan
7ca4c95d4a
more Particles to Entities migration
2014-10-16 21:03:40 -07:00
ZappoMan
ce638dd14d
more Particles to Entities migration
2014-10-16 20:52:38 -07:00
ZappoMan
fc507850be
Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles
2014-10-16 20:36:28 -07:00
Atlante45
5d146a00e7
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb
...
Conflicts:
interface/CMakeLists.txt
2014-10-16 15:21:34 -07:00
Ryan Huffman
5139914ba9
Fix entity tools focus not always using latest entity position
2014-10-16 10:50:42 -07:00
Ryan Huffman
0326ec2aa9
Fix right/left stretch entity tool
2014-10-16 10:44:26 -07:00
Ryan Huffman
fdc231424b
Update entitySelectionTools to use camera position/orientation instead of avatar
2014-10-16 09:50:06 -07:00
Brad Hefta-Gaub
ec647ca488
Merge pull request #3603 from huffman/entity-tools
...
Camera easing for entity edit tools
2014-10-16 09:23:15 -07:00
Ryan Huffman
643f28eb3f
Add rotation and upDown handle resizing to entity edit tools
2014-10-15 09:29:30 -07:00
Ryan Huffman
17209ae0d1
Add easing to edit camera
2014-10-15 09:28:42 -07:00
Brad Hefta-Gaub
102d02d396
Merge pull request #3596 from huffman/entity-tools
...
Camera functionality for entity edit tools
2014-10-14 16:28:17 -07:00
Atlante45
4a3f72ab0b
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb
2014-10-14 15:13:50 -07:00
Ryan Huffman
a05e2ea168
Add entityCameraTools.js
2014-10-14 13:15:28 -07:00
Ryan Huffman
c332d94ae3
Add handle size based on distance in edit tools
2014-10-14 13:04:15 -07:00
Ryan Huffman
f178de3b2e
Merge branch 'master' of github.com:highfidelity/hifi into entity-tools
2014-10-13 21:25:47 -07:00
NextPrior
a0a5530641
Initial reverb implementation
...
Conflicts:
interface/CMakeLists.txt
interface/src/Audio.cpp
interface/src/Audio.h
libraries/script-engine/src/ScriptEngine.cpp
2014-10-13 18:13:51 -07:00
Andrzej Kapolka
00490af837
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-13 17:59:35 -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
Andrzej Kapolka
84022fd19d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-13 15:35:07 -07:00
Andrzej Kapolka
13efaba22c
Basic metavoxels example.
2014-10-13 15:34:38 -07:00
ZappoMan
d886f4c81a
removing particles
2014-10-13 14:47:48 -07:00
ZappoMan
02aa4bb4b6
removing particles
2014-10-13 14:45:50 -07:00
ZappoMan
2a281298f0
fix grenades
2014-10-13 14:36:17 -07:00
ZappoMan
bb0479b466
removing particles from scripts
2014-10-13 14:19:57 -07:00
ZappoMan
fe759859e7
removing particles
2014-10-13 14:11:20 -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
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
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
Clément Brisset
a5f524c4e5
Merge pull request #3528 from ctrlaltdavid/20049
...
CR for Job #20049 - Leap - Some fixes to Leap
2014-10-02 18:31:55 -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
Ryan Huffman
d7f383f74a
Fix failure case when resizing a new model
2014-10-02 12:10:20 -07:00
Ryan Huffman
b2229a9a9f
Update editModels.js to automatically resize new models to their naturalDimensions
2014-10-02 12:05:20 -07:00
ZappoMan
d0026cd529
latest selection UI features: grabbers, and rotate handles in correct locations
2014-10-02 10:19:51 -07:00