Commit graph

1150 commits

Author SHA1 Message Date
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
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
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