Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 23:22:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
19429 commits 71 branches 56 tags 1.2 GiB
Commit graph

68 commits

Author SHA1 Message Date
Clément Brisset
26340353ac Merge pull request #3897 from ZappoMan/rayPickWork 
Work on improving pickable entities - Lights Optionally pickable, Spheres & Text pick properly, other bug fixes
 2014-12-04 15:43:17 -08:00
Ryan Huffman
74acf9513b Fix entity tool selection when inactive 2014-12-04 08:47:18 -08:00
ZappoMan
cd92185c5b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 
Conflicts:
	examples/newEditEntities.js
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	libraries/entities/src/EntityTree.h
 2014-12-03 15:07:47 -08:00
Ryan Huffman
c4ca7e1b18 Remove clearSelections from findClickedEntity - it shouldn't handle it 2014-12-02 16:01:40 -08:00
Ryan Huffman
77365ec282 Move entity selection to click event and add ability to deselect 2014-12-02 15:49:45 -08:00
ZappoMan
bb6e302d69 support toggle of light picking in newEditEntities.js 2014-12-02 15:23:05 -08:00
Ryan Huffman
167ab05de4 Default 'Allow Select Large/Small Models' to true 2014-12-02 15:19:51 -08:00
Ryan Huffman
6f0d5faa5b Update tools to snap to grid on creation 2014-11-20 09:20:22 -08:00
Ryan Huffman
3ff44964b5 Add entity list window 2014-11-19 13:25:38 -08:00
ZappoMan
5686ef6e94 Merge branch 'master' of https://github.com/highfidelity/hifi into textEntity 2014-11-16 11:04:36 -08:00
Stojce Slavkovski
cc487d76ca Merge branch 'master' of https://github.com/highfidelity/hifi into 20170 
Conflicts:
	examples/libraries/entityPropertyDialogBox.js
 2014-11-15 09:50:09 +01:00
ZappoMan
3f18741b15 add new text entity tool to newEditEntities.js 2014-11-14 16:40:56 -08:00
Ryan Huffman
3658d65028 Remove grid tool from menu 2014-11-13 20:02:19 -08:00
Ryan Huffman
a6f027e33a Fix entity edit grid not hiding when disabling tools 2014-11-13 18:31:32 -08:00
Ryan Huffman
6b2a497810 Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-grid-fixes 2014-11-13 17:48:17 -08:00
Ryan Huffman
49563dbff7 Add entityProperties tool window 2014-11-13 17:41:51 -08:00
AndrewMeadows
b797c7b38c Merge pull request #3782 from ctrlaltdavid/20140 
CR for Job #20140 - Add Overlays.getTextWidth
 2014-11-13 13:52:53 -08:00
David Rowe
f0f12b0479 Auto-size load URL and file menu items in editModels and newEditEntities 
And fix a couple of typos
 2014-11-11 17:32:37 -08:00
Ryan Huffman
bedd9c76f2 Merge branch 'master' of github.com:highfidelity/hifi into entity-grid-tool 
Conflicts:
	examples/newEditEntities.js
 2014-11-11 10:48:49 -08:00
Ryan Huffman
d537c5efdb Add grid tool menu option 2014-11-11 09:56:02 -08:00
Brad Hefta-Gaub
3a90e869d4 Revert "CR for Job #20140 - Add Overlays.getTextWidth" 2014-11-07 21:50:19 -08:00
David Rowe
8c3360d0a9 Auto-size load URL and file menu items in editModels and newEditEntities 
And fix a couple of typos.
 2014-11-07 08:59:37 -08:00
Ryan Huffman
feaf5678bb Add grid tools to entity edit tools 2014-11-06 15:00:39 -08:00
Stojce Slavkovski
06da1bd566 add checkbox support in scripting interface 2014-11-06 20:41:08 +01:00
AndrewMeadows
d7234d5995 Merge pull request #3731 from ctrlaltdavid/20138 
CR for Job #20138 - Repopulate example default models for "Upload URL" to better sized models
 2014-11-04 11:08:47 -08:00
Ryan Huffman
2e8e31fce9 Update inspect tool behavior to pan correctly 2014-11-04 10:06:45 -08:00
Ryan Huffman
573e6f119f Add entity camera options to settings 2014-11-04 10:06:17 -08:00
David Rowe
4fdc00948f Repopulate example models in newEditEnties.js too 2014-11-04 09:39:37 -08:00
Ryan Huffman
fc977e21e6 Remove print statements 2014-11-04 09:14:14 -08:00
Ryan Huffman
a3fa1e4ce8 Merge branch 'master' of github.com:highfidelity/hifi into inspect-tool 2014-11-04 08:32:58 -08:00
Ryan Huffman
185b9ac545 Add Inspect tool to newEditEntities 2014-11-04 08:32:21 -08:00
AndrewMeadows
80a385b23a Merge pull request #3710 from ZappoMan/lockAndMaterialProperties 
Improvements to Entities
 2014-11-03 08:41:55 -08: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
Ryan Huffman
e8f7c2c2ae Fix issue with arrow keys moving objects when edit mode off 2014-10-29 11:20:19 -07: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
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
ZappoMan
8debb33c6a default light properties 2014-10-28 12:44:57 -07:00
ZappoMan
c3cd733c2f tweaks to edits for lights 2014-10-28 12:40:17 -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
ZappoMan
5d7a0c2934 added light properties to edit tools 2014-10-27 14:34:43 -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
14555c4534 Add UndoStackScriptingInterface and support when editing entities 2014-10-22 14:54:04 -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
ZappoMan
2f9766e051 first cut at light entity 2014-10-22 08:41:31 -07:00