Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-17 04:20:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
80673 commits 72 branches 59 tags 1.2 GiB
Commit graph

807 commits

Author SHA1 Message Date
David Back
33e170315c recurse on children of children 2018-07-06 15:39:18 -07:00
Thijs Wenker
eea95161ab Merge branch 'master' of github.com:highfidelity/hifi into feat/create/native-windows 2018-07-06 20:06:50 +02:00
David Back
169d40c3c1 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleMacFix 2018-07-06 10:55:04 -07:00
Thijs Wenker
42afd31325 default window width fixes 2018-07-06 19:48:35 +02:00
David Rowe
1a18d3305e Code review 2018-07-06 17:03:30 +12:00
David Back
2bcc96269e comments, fix doubles in list, fix re-parenting to 0 2018-07-05 13:10:56 -07:00
David Back
fbe670d8c0 also copy unselected children 2018-07-05 12:43:37 -07:00
David Back
1cc79f0e7c renaming 2018-07-05 12:07:13 -07:00
David Back
25d55b9cc5 tabs 2018-07-05 11:59:05 -07:00
David Back
40fec8a318 reparent after duplication 2018-07-05 11:58:45 -07:00
David Back
2e70853ffc
Merge branch 'master' into editHandleMacFix 2018-07-05 09:51:56 -07:00
David Rowe
a642324a11 Fix oscillating positions as translate when snapping to grid 2018-07-05 11:58:48 +12:00
David Rowe
9709599c1a Fix translation handle not following mouse at some view angles 2018-07-05 11:47:34 +12:00
David Rowe
94c097fc39 Fix entity y value jumping when translate with grid snapping enabled 2018-07-05 11:42:37 +12:00
David Rowe
b00d07b029 ESLint 2018-07-05 10:50:08 +12:00
Thijs Wenker
446b82abd6
Merge pull request #13410 from dback2/editHandleToggleFix 
Fix toggling edit handles between local/world space
 2018-07-04 00:23:21 +02:00
David Back
afbe64ec11 missing bracket 2018-07-03 13:32:11 -07:00
David Back
2af0f05cb4 tabs 2018-07-03 12:40:19 -07:00
David Back
ed4d0f2577 early-out if event undefined 2018-07-03 12:39:41 -07:00
Thijs Wenker
c583c07d9c Merge branch 'feat/create/interactive-window' into feat/create/native-windows 
# Conflicts:
#	scripts/system/libraries/entityList.js
#	scripts/system/particle_explorer/particleExplorerTool.js
 2018-07-03 18:47:38 +02:00
John Conklin II
94ab0c71b2
Merge pull request #13040 from 1P-Cusack/BugFix_EntityListException_20180427 
[BugFix] EntityList UncaughtException in that.sendUpdate
 2018-07-02 12:35:20 -07:00
David Back
7b9341954f Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleToggleFix 2018-06-28 12:10:42 -07:00
Thijs Wenker
7fe9365a76 create app - native windows 2018-06-28 19:12:03 +02:00
John Conklin II
a38859e4da
Merge pull request #13397 from ctrlaltdavid/21893 
Fix Create app selection updating when entities are deleted
 2018-06-26 17:06:43 -07:00
David Back
05438f3b85 bad avatar collision merge 2018-06-25 15:26:54 -07:00
David Back
f65bc9b5ed Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements 2018-06-25 15:22:07 -07:00
David Back
6fa191742c
Merge pull request #13390 from dback2/editHandleDebugWindowFix 
Prevent edit press events when pointing at tablet or desktop windows
 2018-06-25 11:11:37 -07:00
David Back
80adad7965 myAvatar constant 2018-06-22 13:52:43 -07:00
David Back
c019a4816f CR changes + eslint fixes 2018-06-21 16:45:09 -07:00
David Back
ed56f09fcf comment 2018-06-21 15:00:10 -07:00
David Back
37b35353d2 space 2018-06-21 14:48:37 -07:00
David Back
54145e0310 use previous pick ray when translate reaches end 2018-06-20 15:53:38 -07:00
David Back
7704e8c2a9 fix stretching too far, improve stretch sphere vs camera dist sizing 2018-06-20 14:47:41 -07:00
David Back
633be87473 fix stretch panel dimensions 2018-06-19 14:57:46 -07:00
David Back
61cbe84ae5 fix stretching below minimum still moving entity 2018-06-19 14:39:58 -07:00
David Rowe
064f4ca204 Remove deleted entities from list without scrolling to top 2018-06-19 16:22:59 +12:00
David Back
5b699d1cd4 tabs 2018-06-18 16:14:46 -07:00
David Back
030e697945 fix toggling to world space 2018-06-18 15:55:55 -07:00
David Back
bb0b1cc4a4 no myAvatarIndex needed 2018-06-15 17:35:18 -07:00
David Back
d16b777977 tabs 2018-06-15 17:33:49 -07:00
David Back
6ef8206f3a temp disable myAvatar collisions when stretching 2018-06-15 17:32:03 -07:00
David Back
cb9c255acd Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision 2018-06-15 14:51:53 -07:00
David Back
bc06b88afc tabs 2018-06-15 14:31:18 -07:00
David Back
9b33e6757f prevent edit press events when pointing at desktop window or tablet 2018-06-15 14:29:47 -07:00
David Back
3be477e7f2 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleDebugWindowFix 2018-06-14 13:14:24 -07:00
John Conklin II
fa1dc78469
Merge pull request #13374 from thoys/fix/dynamic-cloneDynamic 
[RC69] fix cloneDynamic
 2018-06-14 12:58:17 -07:00
Thijs Wenker
4d3087b98c fix cloneDynamic 2018-06-14 19:07:20 +02:00
Dante Ruiz
60e46481b2 emissive maps 2018-06-13 10:41:02 -07:00
David Back
cde111d601 remove pointing at system overlay and overlay at point checks 2018-06-12 17:55:04 -07:00
Dante Ruiz
f2d6b84e6c fix qa fail issues 2018-06-11 13:56:44 -07:00
Dante Ruiz
ba86c9753d Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments 2018-06-11 09:13:14 -07:00
Dante Ruiz
5843c24309 adding perfectly straight model and adjusting ovelray 2018-06-08 13:56:00 -07:00
Dante Ruiz
dfea4a0f7c fixing rotation 2018-06-08 11:50:52 -07:00
druiz17
8c83bd29a3 making requested changes 2018-06-07 14:04:39 -07:00
John Conklin II
067fa46355
Merge pull request #13265 from wayne-chen/toggleSpaceMode 
Re-adding toggleSpaceMode function
 2018-06-07 11:21:28 -07:00
John Conklin II
66e2bebcbf
Merge pull request #13279 from thoys/fix/create-camera 
Fix MS13500: create-app camera orbit to not jump around on secondary monitor
 2018-06-07 09:38:10 -07:00
Dante Ruiz
5a89a51b85 make edit mode play nicely 2018-06-06 16:04:36 -07:00
Dante Ruiz
6ddc768f57 making overlays use precisionPicking and adjust tablet screen position 2018-06-06 15:40:33 -07:00
Dante Ruiz
d57d087752 update tablet model again 2018-06-06 12:48:20 -07:00
Dante Ruiz
995cfeb3c5 cleaning code 2018-06-06 10:42:12 -07:00
Dante Ruiz
59c50b7f26 remove highlight overlay in favor of materialEntity 2018-06-06 08:38:58 -07:00
Dante Ruiz
b275bbe5a7 saving changes 2018-06-05 15:44:17 -07:00
Zach Fox
4ebfca0c57 Really fix it 2018-06-05 10:04:37 -07:00
Zach Fox
82c438a174 CR 2018-06-05 10:04:26 -07:00
Zach Fox
b9604fdb9d Fix MS14796: Fix position of tablet close button highlight 2018-06-05 10:04:13 -07:00
Wayne Chen
c18c2358d6 adding fix for tablet screen y offset 2018-06-05 10:03:59 -07:00
SamGondelman
8af1beca8d add isGroupCulled for model overlays 2018-06-04 12:07:57 -07:00
Thijs Wenker
3779a4780e Prevent the cursor from being stuck on the most outer edges of the screen 2018-06-01 02:07:02 +02:00
Thijs Wenker
a06c9eccca - fix create-app camera orbit to not jump around on secondary monitor 
- style fixes entityCameraTool.js
 2018-06-01 00:16:42 +02:00
David Back
d20d594ae5 use setCollisionEnabled for avatar collisions 2018-05-31 10:50:54 -07:00
Wayne Chen
34120da63f re-adding toggleSpaceMode 2018-05-30 16:06:34 -07:00
John Conklin II
3e665fb616
Merge pull request #13179 from dback2/cloneables 
Server-Managed Cloneables + Cloneable Properties
 2018-05-23 12:40:27 -07:00
Dante Ruiz
c4f39841f5 fix another menu name changes that broke snapshot 2018-05-22 10:46:20 -07:00
David Rowe
6c3174ccf1 Make particle / light icon translate x-z when inside bounding box 2018-05-17 17:04:12 +12:00
David Rowe
801a4b9aba Make laser click in sky deselect entity 2018-05-17 15:09:23 +12:00
David Rowe
b74f42dc23 Merge branch 'master' into 21863 2018-05-17 07:44:39 +12:00
David Back
f8fc7bedd7 Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-15 17:31:43 -07:00
David Back
f74e219029 rename properties, add clone avatar entity, remove worldEntityProps arg, fix clone ID cleanup on delete 2018-05-15 17:24:14 -07:00
Seth Alves
898dec29cb don't cache value of getControllerJointIndex at startup, because the script may run before the data is available. Instead, refresh the data every few seconds 2018-05-11 17:07:51 -07:00
David Back
1aa653c5db tabs 2018-05-09 18:20:07 -07:00
David Back
3241c18271 first pass cloneables WIP 2018-05-09 18:10:40 -07:00
David Rowe
1ccde9a1b2 Disable moving selection when camera is in inside bounding box 2018-05-06 20:53:20 +12:00
David Rowe
8fd972fce9 Don't disable lasering on particle or light entity icon when is selected 2018-05-06 20:23:49 +12:00
David Rowe
ed1391581e Merge branch 'master' into 21863 2018-05-05 16:49:51 +12:00
Liv
e4b6686e1c
Merge pull request #13075 from ctrlaltdavid/21862 
Clear entity selection handles and update list when entities are deleted
 2018-05-04 14:23:37 -07:00
David Rowe
ebd46f1861 Fix intermittent ability to select particle and light entities 2018-05-03 14:43:54 +12:00
David Rowe
5312c81a6f Match style of surrounding code 2018-05-03 08:49:18 +12:00
David Rowe
4a96dc2fdc Refactor 2018-05-03 08:48:17 +12:00
David Rowe
f27e363b68 Remove entity from list when it deletes; handle multiple deletions 2018-05-02 15:23:13 +12:00
David Rowe
1b99946c5f Fix entity not highlighted in list after creating or undoing delete 2018-05-02 12:38:29 +12:00
LaShonda Hopper
79278f5add [BugFix] EntityList UncaughtException in that.sendUpdate (details below). 
* Adds safety checks to properties.renderInfo to prevent invalid access when undefined.
    * Error trace prior to guards:
        [04/27 13:16:19] [CRITICAL] [hifi.scriptengine] [defaultScripts.js] [UncaughtException signalHandlerException] Error: Result of expression 'properties.renderInfo' [undefined] is not an object. in .../build/interface/RelWithDebInfo/scripts/system/libraries/entityList.js:93
        [04/27 13:16:19] [CRITICAL] [hifi.scriptengine] [Backtrace]
        [04/27 13:16:19] [CRITICAL] [hifi.scriptengine]     <anonymous>() at .../build/interface/RelWithDebInfo/scripts/system/libraries/entityList.js:93
        [04/27 13:16:19] [CRITICAL] [hifi.scriptengine]     <anonymous>(data = [object Object]) at .../build/interface/RelWithDebInfo/scripts/system/libraries/entityList.js:149
        [04/27 13:16:19] [CRITICAL] [hifi.scriptengine]     <global>() at -1

Changes Committed:
    modified:   scripts/system/libraries/entityList.js
 2018-04-27 17:23:27 -04:00
David Back
8950c31378 fix mouse equipping while someone else far grabbing 2018-04-19 16:29:49 -07:00
David Back
f7723a5bba Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip 2018-04-19 11:17:34 -07:00
Seth Alves
6f420ffae2
Merge pull request #12936 from druiz17/more-tablet-changes 
Change tablet model and spawn position
 2018-04-19 10:25:34 -07:00
David Back
d1bb11562b Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip 2018-04-19 09:36:19 -07:00
John Conklin II
e557e0ae52
Merge pull request #12844 from druiz17/feature-entity-highlighting 
Highlight grabbable and equippable entities.
 2018-04-18 15:35:46 -07:00
John Conklin II
51a98961a6
Merge pull request #12920 from thoys/fix/create-dontCloneOthersAvatarEntities 
edit.js - remove ability to clone non-owned avatar-entities
 2018-04-18 15:27:09 -07:00
David Back
666653dd96 tabs 2018-04-18 15:01:14 -07:00
David Back
4a37c4ba18 add entityIsEquipped utils for grab.js check 2018-04-18 15:00:10 -07:00
Dante Ruiz
86d3ba658f Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting 2018-04-18 13:30:24 -07:00
Dante Ruiz
9d6fc13a04 Merge branch 'master' of github.com:highfidelity/hifi into more-tablet-changes 2018-04-18 13:06:51 -07:00
Dante Ruiz
a65f5f7917 making tablet changes 2018-04-18 13:06:26 -07:00
Thijs Wenker
b741888d77 CR feedback (for real) 2018-04-17 20:31:30 +02:00
Thijs Wenker
91467b6059 CR feedback 2018-04-17 20:30:00 +02:00
Thijs Wenker
0aa0f53925 edit.js - remove ability to clone non-owned avatar-entities 2018-04-17 19:46:45 +02:00
Zach Fox
071bf35683 Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018 2018-04-16 10:11:44 -07:00
Dante Ruiz
08ea72d71f Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting 2018-04-13 15:39:14 -07:00
Dante Ruiz
43b92299d6 changing highlighting percentage 2018-04-12 10:35:29 -07:00
John Conklin II
2f4bc5bd04
Merge pull request #12701 from misslivirose/fix-edit-grid-color 
Fix for grid color changes not applying
 2018-04-11 12:06:09 -07:00
Zach Fox
a9b9a1cb10 Commerce: Gifts 2018-04-10 15:54:19 -07:00
Liv Erickson
20ee169054 two more spaces 2018-04-10 09:23:14 -07:00
Liv Erickson
6c15577653 style fixes for eslint 2018-04-10 09:18:54 -07:00
Dante Ruiz
893832f4c7 Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting 2018-04-05 16:01:36 -07:00
Dante Ruiz
cc341e8ad7 highlight nearby entities 2018-04-05 15:38:56 -07:00
John Conklin II
89127a06b3
Merge pull request #12714 from dback2/editUpDownArrowFix 
Fix Y arrow translation handle issues
 2018-04-04 13:46:31 -07:00
Dante Ruiz
42149e295d editing seletion style 2018-04-04 12:55:28 -07:00
Dante Ruiz
c9c3d8f332 adding entity selection for far grabbing 2018-04-04 08:07:35 -07:00
Clément Brisset
3d4490f3fd
Merge pull request #12737 from highfidelity/RC66 
RC66 mergeback
 2018-04-03 15:39:16 -07:00
Seth Alves
249a97b5d0 don't move or rotate children if a parent is being changed by the same action 2018-04-03 12:14:59 -07:00
Seth Alves
08b7326bd1 when moving a group of selections, don't move a child if a parent is being moved 2018-04-03 12:14:40 -07:00
unknown
194b00d732 fix translate arrow normals 2018-03-26 16:31:58 -07:00
Liv Erickson
c66badc53c replace accidentally deleted line 2018-03-23 11:42:39 -07:00
Liv Erickson
9dd91ea31e style fixes and fix for grid color changes not applying 2018-03-23 11:39:44 -07:00
David Rowe
05efc5a231 Revert "Remove Overlays.getOverlayObject() from JavaScript API" 
This reverts commit 8e2a3e8c99.
 2018-03-21 15:36:39 +13:00
Atlante45
69fb830480 Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-08 17:23:17 -08:00
David Back
554c37d14b removed undefined event checks in scaling 2018-03-07 19:34:08 -08:00
David Back
9681f0eb77 restore old scale math, disable avatar collisions while scaling 2018-03-07 18:20:26 -08:00
David Back
2047437893 Merge branch 'RC65' of https://github.com/highfidelity/hifi into RC65 2018-03-07 10:30:18 -08:00
Dante Ruiz
2d448d7208 tablet scale and position changes 2018-03-07 10:02:35 -08:00
David Back
47e8e26255 CR indent fixes 2018-03-06 14:05:24 -08:00
David Back
b74be92fd8 redo scale handles to fix scaling into avatar collision causing chaos 2018-03-06 12:27:51 -08:00
Elisa Lupin-Jimenez
15c1f5ba30 fixed log spam undefined error 2018-03-06 11:01:50 -08:00
Dante Ruiz
5dc336bfae remove dead code and eslint files 2018-03-02 14:23:35 -08:00
Dante Ruiz
05fb3cfd9a fixing hyper link for entities 2018-03-02 14:03:24 -08:00
Dante Ruiz
1f4aed31f1 adding hyperlink 2018-03-01 16:16:47 -08:00
Elisa Lupin-Jimenez
b8fd640ddf fixed log spam undefined error 2018-02-27 16:44:45 -08:00
Seth Alves
c534e3a6e4
Merge pull request #12356 from ctrlaltdavid/21742 
Handle tablet entities and overlays not being available
 2018-02-22 08:48:13 -08:00
Seth Alves
db195c6184
Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items 
Remove some deprecated JavaScript API items
 2018-02-21 16:31:16 -08:00
John Conklin II
6148c407a5
Merge pull request #12422 from misslivirose/fix-overlay-lines 
Show outline for zones when rotating
 2018-02-20 09:30:22 -08:00
Liv Erickson
175532c444 show outline for zones when rotating 2018-02-15 15:51:54 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals 2018-02-14 17:33:01 -08:00
Dante Ruiz
e14f46101b fix tablet rotation when switching into and out of create mode 2018-02-14 13:49:43 -08:00
SamGondelman
4500ed17e7 merge from master 2018-02-13 13:58:39 -08:00
David Rowe
b1f49be790 Merge branch 'master' into 21742 
# Conflicts:
#	scripts/system/libraries/entitySelectionTool.js
 2018-02-13 10:04:32 +13:00
David Rowe
033b85a3a8 Merge branch 'master' into remove-deprecated-items 
# Conflicts:
#	scripts/system/libraries/entitySelectionTool.js
 2018-02-13 09:42:40 +13:00
SamGondelman
5337377ef5 Merge remote-tracking branch 'upstream/master' into decals 2018-02-09 14:40:20 -08:00
John Conklin II
1d0e358246
Merge pull request #12234 from dback2/newEditGrab 
New Edit Selected Entity Manipulation Handles
 2018-02-09 12:23:34 -08:00
David Rowe
adb6f66a05 Handle tablet entities and overlays not being available 2018-02-08 09:51:48 +13:00
David Back
51b55aedcf CR changes, fix colors, add minimum overlay dimensions for HMD 2018-02-06 16:07:46 -08:00
Dante Ruiz
4f0ca6a904 fix lasers going to origin 2018-02-06 13:44:59 -08:00
David Rowe
0c0734a255 Remove unused Overlays property, borderSize, and associated code 2018-02-04 14:54:14 +13:00
David Rowe
8e2a3e8c99 Remove Overlays.getOverlayObject() from JavaScript API 2018-02-04 14:15:48 +13:00
David Back
ececd1c60f fix loop index change 2018-02-02 17:14:48 -08:00
David Back
ed4cbe2679 fix fill ring rotation 2018-02-02 17:05:25 -08:00
SamGondelman
d7f4b033e8 wip finish adding material entity 2018-02-02 16:49:33 -08:00
David Back
900669d937 fix multi-selection rotation yay! 2018-02-02 16:44:59 -08:00
David Back
55f55cd78b few more updates 2018-02-01 17:59:38 -08:00
David Back
db56246cd6 more fixes, clean up, updates 2018-02-01 17:30:56 -08:00
David Back
c01790bd3e punch list updates and various fixes 2018-01-31 18:27:15 -08:00
David Back
e679b75e99 fix degree display position 2018-01-29 19:02:36 -08:00
David Back
2f0d92c3cd ctrl 22.5 snapping 2018-01-29 18:15:01 -08:00
David Back
9ee7153641 fix scale speed, fix stretch panels, fix scale cube highlight 2018-01-29 16:53:02 -08:00
David Back
c4359de859 entity edit tools wip update 2018-01-19 18:20:36 -08:00
David Back
26bf78fb5d first pass new entity selection edit tools wip 2018-01-17 18:30:31 -08:00
Dante Ruiz
125eb9ce44 add new tablet model and adjust screen offset 2018-01-09 14:31:57 -08:00
David Rowe
4b2ed44322 Reduce incidence of tablet screen being rotated w.r.t. model 2018-01-05 16:16:42 +13:00
David Rowe
936b5f3571 Laser on tablet bezel as well as screen and "x" button 2018-01-05 16:15:59 +13:00
David Rowe
6e43497e14 Merge tag 'RELEASE-7602' into 21661 
Jenkins Git plugin tagging with RELEASE-7602
 2018-01-03 16:46:10 +13:00
Zach Fox
b81cdf49ef Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-11 09:52:32 -08:00
Zach Fox
a99072622a Fix Create mode :| 2017-12-08 15:41:47 -08:00
Zach Fox
a81a981676 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-08 09:44:52 -08:00
Seth Alves
86a1bc75c9
Merge pull request #11897 from Delanir/Gizmos 
IPD Secondary Task List: edit.js arrow orientation: Yaw, Pitch, Roll tools
 2017-12-08 07:09:09 -08:00
Zach Fox
b2bafed2bb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-07 11:21:24 -08:00
Daniela
ef49aa0b71 Refactor to comply with code standard. 2017-11-29 18:54:08 +00:00
Daniela
8985acd8b6 YAW ROLL PITCH tool now represents angles in a usefull way. Refactoring. 2017-11-29 13:00:36 +00:00
Dante Ruiz
70820e6075 laser allways on prototype 2017-11-28 15:37:36 -08:00
Daniela
68d5d600b7 YAW ROLL PITCH tool gizmos + functionality 2017-11-28 23:16:34 +00:00
Daniela
eb0d925091 YAW ROLL PITCH tool gizmos + functionality 2017-11-28 22:55:09 +00:00
Daniela
123f898f80 Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos 2017-11-28 15:38:30 +00:00
SamGondelman
d4a4c8902a fix reticle depth at different scales and x button click on mouse press 2017-11-27 17:46:19 -08:00
SamGondelman
52039e022b merge from master, get rid of resolution in RayPick 2017-11-27 13:11:35 -08:00
SamGondelman
033f658fff Merge remote-tracking branch 'upstream/master' into pointers 2017-11-17 16:10:20 -08:00
Zach Fox
7d34b3fe67 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-11-17 15:45:03 -08:00
SamGondelman
393ad0079c home button is circle instead of sphere, fixed positioning, fix lasers on tablet 2017-11-17 15:24:21 -08:00
SamGondelman
42d047c572 merge with master 2017-11-17 11:52:34 -08:00
SamGondelman
e38b0ab6b8 make web overlays match web entities more, remove resolution 2017-11-17 11:50:24 -08:00
SamGondelman
61c7ccde6e cleanup 2017-11-17 10:45:39 -08:00
SamGondelman
b252c81d84 fix home button hover overlay dimensions 2017-11-16 15:34:42 -08:00
Dante Ruiz
f6a74cc80e fixing merge conflicts 2017-11-16 10:04:36 -08:00
SamGondelman
7eb22b372f merge with master 2017-11-15 14:35:30 -08:00
Brad Davis
bb2e061d77 Fixing global declarations in JS 2017-11-15 12:00:52 -08:00
Brad Davis
26a745be6f Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-15 11:59:06 -08:00
Brad Davis
1167be4102 Reverting tablet API rename, cleaning up duplicated code 2017-11-15 11:52:55 -08:00
Brad Davis
64592d66d7 Fix relative path for tablet login dialog 2017-11-15 11:46:56 -08:00
Dante Ruiz
b779c33a1b fixed lockEndUUID offset for scripts 2017-11-13 16:42:16 -08:00
Dante Ruiz
6173c33b51 fixing merge conflict 2017-11-13 15:02:25 -08:00
SamGondelman
2fb1981c4a merge with master 2017-11-13 14:34:39 -08:00
Dante Ruiz
5852224a31 clean up code and finialize changes 2017-11-13 13:37:53 -08:00
Dante Ruiz
43c6d71236 fix stylus module 2017-11-10 17:28:55 -08:00
Brad Davis
7bf1b176d7 Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem 2017-11-10 14:21:24 -08:00
luiscuenca
7dfdc8da59 Redesign and clean of unused lineWidths 2017-11-09 17:50:38 -07:00
Dante Ruiz
ef55e3181d moveing controllerDispatchaer pointers to pointerUtils.js 2017-11-09 16:48:52 -08:00
Seth Alves
0edf056b78
Merge pull request #11755 from MidnightRift/patch-1 
Fix controllerDispatcherUtils file path
 2017-11-07 13:22:18 -08:00
Dante Ruiz
3b15897b12 fixed farGrab parent grabbing and laser LockEndUUID 2017-11-06 15:21:20 -08:00
Midnight
e2ca3c6de0
Fix lib file path 
Changed the include to what should be the correct file path. it does not exist in the controllers folder.
 2017-11-05 13:39:26 -07:00
Dante Ruiz
539cf35f30 saving work 2017-11-03 17:14:27 -07:00
Dante Ruiz
e5600e4f1e one universal controller pointer for all modules 2017-10-30 16:58:14 -07:00
Daniela
2ceba76ba2 yaw tool 2017-10-27 11:28:44 +01:00
Daniela
a1110bf28d Rotations now happen using the correct axis taking into account the avatar referential 2017-10-26 16:52:58 +01:00
Brad Davis
befe583c5e Merge remote-tracking branch 'upstream/master' into HEAD 2017-10-24 11:50:07 -07:00
Daniela
f15038c54f Re-add isFacingAvatar to true and delete rotation of the grabbermoveup tool. 2017-10-23 19:11:32 +01:00
SamGondelman
fb969964f3 generalized scripting interfaces 2017-10-20 14:37:10 -07:00
Daniela
b28a99c2af Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos 2017-10-19 18:06:23 +01:00
Daniela
a02ee5b7d5 Grabber Tool Move up, remove billboard on grabbermoveupoverlay 2017-10-19 18:05:51 +01:00
David Rowe
f31e014e8b Quat.ZERO --> Quat.IDENTITY 2017-10-18 20:34:55 +13:00
David Rowe
8d4e979dc8 Replace usages of AVATAR_SELF_ID previously missed 2017-10-17 16:38:05 +13:00
David Rowe
ed1c974f75 Use MyAvatar.SELF_ID instead of Uuid.SELF 2017-10-17 15:58:51 +13:00
David Rowe
1e3a2b3e4e Merge branch 'master' into 21568 2017-10-17 15:15:49 +13:00
David Rowe
fc4e440dc4 Update system scripts to use new properties 2017-10-14 08:32:14 +13:00
Dante Ruiz
d14e6b6e5a Merge pull request #11450 from ElderOrb/case7722 
7722 Add onHover Outline to Tablet "X" Button
 2017-10-13 11:38:38 -07:00
Brad Hefta-Gaub
1bba5ff812 Merge pull request #11554 from sethalves/import-av-entities 
Import av entities
 2017-10-12 13:30:53 -07:00
beholder
8c7462f012 fine-tuning based on discussion with Anshuman 2017-10-12 22:21:40 +03:00
beholder
9c15af9fbe raise highlight above button overlay to reduce flickering 2017-10-12 14:46:01 +03:00
Atlante45
6dd49f5c32 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2017-10-10 16:53:34 -07:00
Sam Gateau
f143c28625 Merge pull request #11542 from SamGondelman/bubbleBoy 
Move HUD and HUD overlay rendering out of display plugin
 2017-10-10 14:26:20 -07:00
Melissa Brown
662bb6c103 Merge pull request #11338 from 1P-Cusack/FogBugz/Case_6491_Part7 
[Case 6491] Remainder of entitySelectionTool clean up (details below).
 2017-10-10 10:36:14 -07:00
Seth Alves
23f41457be Revert "Revert "fix importing of avatar entities"" 
This reverts commit 28a8b18060.
 2017-10-09 11:52:43 -07:00
Seth Alves
28a8b18060 Revert "fix importing of avatar entities" 2017-10-07 16:54:05 -07:00
Brad Hefta-Gaub
62fc193bff Merge pull request #11532 from sethalves/import-av-entities 
fix importing of avatar entities
 2017-10-06 17:59:54 -07:00
LaShonda Hopper
2f082d9e86 [Case 6491] Fixes issue in normalizeDegrees from last commit (details below). 
The range of the function is targeting (-180, 180] such that
the statement:
    if (degrees < -180)
should be:
    if (degrees <= -180)
to account for degrees being -180.

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-06 10:11:26 -04:00
LaShonda Hopper
707569b230 [Case 6491] More efficient version of normalizeDegrees function (details below). 
Refactoring the original normalizeDegrees function to be
more efficient as suggested via:
    https://github.com/highfidelity/hifi/pull/11338#pullrequestreview-67520585

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-06 09:50:24 -04:00
Seth Alves
53a49272dc fix importing of avatar-entities 2017-10-05 11:43:19 -07:00
druiz17
347645329e fixing laser staying on in edit mode 2017-10-05 09:11:02 -07:00
David Rowe
b526ec0d93 Code review 2017-10-05 18:21:04 +13:00
LaShonda Hopper
18d884f6c4 [Case 6491] eslint pass: Fixes no-multiple-empty-lines issues. 
* eslint pass using .eslintrc.js

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-04 20:51:06 -04:00
LaShonda Hopper
e9ae2099f3 [Case 6491] eslint pass: Fixes indent issues. 
* eslint pass using .eslintrc.js

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-04 20:37:57 -04:00
LaShonda Hopper
ac81b22cc9 [Case 6491] eslint pass: Fixes references to SelectionManager (details below). 
SelectionManager was being referred to as selectionManager.

* eslint pass used .eslintrc.js

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-04 20:24:20 -04:00
LaShonda Hopper
a5b913a8b9 [Case 6491] Fixes minor spacing issue, on while loop missed previous eslint pass. 
Changes Committed:
    modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-04 17:36:28 -04:00
David Rowe
46ce68a893 Fix lasers 2017-10-03 13:33:11 +13:00
LaShonda Hopper
cb264b5552 [Case 6491] eslint pass: Addresses curly bracket, keyword spacing issues. 
* eslint pass using .eslintrc.js

Changes Committed:
  modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-02 13:28:43 -04:00
LaShonda Hopper
97ecf84f3d [Case 6491] eslint pass: Cleaning up comma-dangle noise. 
* eslint pass using .eslintrc.js

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-02 13:21:10 -04:00
LaShonda Hopper
c131686f1b [Case 6491] eslint pass: Addressing some comment issues. 
* This should reduces the noise for the eslint passes on this script.
* eslint pass using .eslintrc.js

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-02 12:55:51 -04:00
LaShonda Hopper
a610946af1 [Case 6491] eslint pass: fixes undefined center var in that.updateHandles. 
* eslint pass using .eslintrc.js

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-02 12:31:10 -04:00
LaShonda Hopper
dbf8d19095 [Case 6491] eslint pass: fixes issues with equality checks. 
* Also adds some paren grouping to help with readability of some statements.
* eslint pass on script using .eslintrc.js

Changes to be committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-10-02 12:26:00 -04:00
LaShonda Hopper
6571aef997 [Case 6491] makeStretchTool: Fix z undefined issue (details below). 
z:z appears to have been a typo, as there's no var z.  Should likely be z:1.

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-29 18:52:39 -04:00
SamGondelman
b59ec07171 move hud rendering to render thread, still need to separate out hud overlays 2017-09-29 09:49:08 -07:00
LaShonda Hopper
ff051db79a [Case 6491] Minor: Fixes some paren spacing. 
Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:06:09 -04:00
LaShonda Hopper
0deabf54ef [Case 6491] Minor: fixes some coding standard spacing with wantDebug statements. 2017-09-28 15:04:28 -04:00
LaShonda Hopper
2bb76a357a [Case 6491] Some adjustments to isActiveTool (details below). 
* isActiveTool now respects null and undefined args.
    * If null or undefined toolHandle is passed, activeTool
      is directly tested against those values.  Rather than
      explicitly returning false.
* Added some clarification to unknown tool warning message.

Reviewed-by: Leander Hasty <leander@1stplayable.com>

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:28 -04:00
LaShonda Hopper
bed50dda2f [Case 6491] Fixes consistency issue with lights (details below). 
Fixes issue with light selection actions having inconsistent ui
in comparison to other selections from an earlier commit change.

As of this commit:
* When translating point lights, the edge grabbers are no longer be visible.
* When rotating or translating spot lights, the edge grabbers are no longer visible.

Note:
* For both point & spot lights, when translating and/or rotating, their circle
  and/or radial guides should remain visible.  This commit shouldn't have any
  influence on that behavior.

Tested:
* Rotating and translating spot lights.
* Translating point lights.  Didn't test rotation as only spot
  lights support rotation.

Changes Committed:
	modified:   scripts/system/libraries/entitySelectionTool.js
 2017-09-28 15:04:28 -04:00