Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 17:36:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
55885 commits 72 branches 56 tags 1.2 GiB
Commit graph

35 commits

Author SHA1 Message Date
Philip Rosedale
6e82343b29 Merge pull request #10406 from amvmoody/21289 
21289 - Edit: Add the ability to duplicate an object with hand controller
 2017-05-13 20:43:52 -07:00
Mike Moody
89d93ee56d Updated HMD grab Clone to work with all entity types. 2017-05-11 04:16:22 -07:00
Mike Moody
dae652d3db v1 HMD duplication overlay. 2017-05-08 11:25:24 -07:00
Mike Moody
03490c81da v1 with bug, looking into. 2017-05-06 15:36:18 -07:00
Delanir
27029eb8db Fix Code Standard 
Fix indent lines 2799-2800
Fix one line that had more than 128 columns wide
 2017-04-27 18:24:49 +01:00
Delanir
956d1e9d95 Fix Code Standard 2017-04-19 16:30:49 +01:00
Delanir
fcde85e51b Fix Style 
- Replace tabs by 4 spaces;
- Add indents and spaces;
- Formated multi/line statement
- Removed out-of-scope comments.
 2017-04-10 22:16:56 +01:00
Delanir
25a89a631b hifi: #21216 - Resize entities with hand controllers while editing 
hifi: #21216 - Resize entities with hand controllers while editing
Modified StretchTool to allow for movement in 3D
- uses data from motion controller (position and rotation) to
stretch/resize the entities/primitives in 3D.
- the range of the resize depends on distance to the object.
 2017-04-10 20:25:30 +01:00
Seth Alves
902e3d41d6 merge from upstream 2017-03-24 08:20:35 -07:00
Triplelexx
a964edee91 change all references of Quat.getFront to Quat.getForward in scripts directory 2017-03-21 22:25:30 +00:00
Ryan Huffman
df644edde4 Fix hand controller not able to select light/particle icons 2017-03-20 09:45:50 -07:00
Seth Alves
3b581a8dfe merge from upstream 2017-03-02 16:35:44 -08:00
Seth Alves
10cb7aab06 Merge pull request #9684 from Menithal/parent-hotkey 
WL#20856 Added Parenting Hotkeys to Edit.js Among Visual tweaks
 2017-03-02 16:30:43 -08:00
Seth Alves
70060eb464 in 2d mode, clicks on tablet don't get used for other things 
Conflicts:
	scripts/system/libraries/entitySelectionTool.js
 2017-02-24 11:37:04 -08:00
Seth Alves
e43c4c17f5 in 2d mode, clicks on tablet don't get used for other things 2017-02-23 21:27:25 -08:00
Menithal
f5d266a562 Updated 2017-02-17 23:28:28 +02:00
Seth Alves
39e1edafd2 merge from upstream 2017-02-17 13:16:12 -08:00
Seth Alves
5ddcbae934 save tablet web-overlay ID in HMD interface. don't trigger edit affordances if the click was intented for the tablet 2017-02-17 11:51:23 -08:00
Seth Alves
b6b6ad780d allow isSpotlight to be 0 or 1 2017-02-16 17:15:52 -08:00
Menithal
d96f95a7e9 Updated edit.js and selection tool 
Last selected entity will now be yellow instead of orange
 2017-02-16 10:05:59 +02:00
Seth Alves
076b0ed3ab get particle explorer working, again 2017-02-15 15:00:25 -08:00
Seth Alves
792c7ff51f PointerEvent will now relay keyboard modifiers 2017-02-15 10:41:56 -08:00
Seth Alves
3a23ec86d5 handles etc work better 2017-02-14 13:57:48 -08:00
Seth Alves
44aa3e044b make it so near grabbing while edit is active doesn't select a new entity 2017-02-10 16:56:53 -08:00
Dante Ruiz
7a4a769015 fix more editing bugs 2017-01-31 16:53:57 +00:00
Seth Alves
c317ba8054 merge from upstream 2017-01-25 15:57:53 -08:00
Ryan Huffman
ad70431c26 Fix edit.js server script status getting reset when changing properties 2017-01-20 15:34:38 -08:00
Seth Alves
37b179b00b remove commented-out code 2016-12-09 09:55:02 -08:00
Seth Alves
369f61e172 bring over some previous tablet-ui work 2016-12-08 16:54:39 -08:00
Anthony J. Thibault
53864abaf2 edit.js: Fix for picking and manipulating objects via hand controllers. 
The ray picking was not using the proper grab sphere offset, so it became detached from the visual ray, making picking difficult.
 2016-10-20 13:37:31 -07:00
howard-stearns
03a8af76e3 don't do hand-controller edit object-selection when pointed at a HUD 
element
 2016-09-14 12:02:33 -07:00
SamGondelman
b23d3cd35a fixed messed up transparency on edit selection of shapes 2016-08-05 18:35:16 -07:00
howard-stearns
b8e6572ebf basic hand-controller editing 2016-07-05 17:00:54 -07:00
howard-stearns
acb56d0603 Larger edit handles, and more tolerance in click (vs drag). 2016-05-16 12:35:05 -07:00
James B. Pollack
06171f6063 move default to system 2016-04-26 14:47:02 -07:00
Renamed from scripts/default/libraries/entitySelectionTool.js (Browse further)