Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-07 15:48:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
72821 commits 25 branches 0 tags 1.1 GiB
Commit graph

721 commits

Author SHA1 Message Date
unknown
151f948b26 prints 2018-07-12 19:26:20 -07:00
unknown
acae4df3c3 fix align to selection to grid 2018-07-12 19:23:06 -07:00
unknown
306a77c039 fix delete event 2018-07-12 12:46:18 -07:00
Dante Ruiz
1cc95fbf76 better fix 2018-07-10 11:05:41 -07:00
Dante Ruiz
df4d81277f clean up tablet material entities and don't show them in edit 2018-07-09 16:59:32 -07:00
David Back
7a7b9730ee only clamp handles in hmd outside bounding box 2018-07-09 15:36:22 -07:00
John Conklin II
25406fa464
Merge pull request #13495 from thoys/feat/create/native-windows 
Create App: Native windows
 2018-07-09 14:25:13 -07:00
David Back
8f1ad8e367
Merge pull request #13538 from dback2/editHandleMacFix 
Edit handle undefined event fix
 2018-07-09 12:08:18 -07:00
John Conklin II
79b2858220
Merge pull request #13543 from ctrlaltdavid/M16392 
Create snap-to-grid and translation fixes
 2018-07-09 11:39:26 -07:00
Thijs Wenker
b1884b0841 CR fixes 2018-07-09 16:38:53 +02:00
David Back
3bcc727d47 check controller triggered in checkControllerMove 2018-07-06 18:57:32 -07:00
David Back
f33fae30ed Merge branch 'editHandleMacFix' of github.com:dback2/hifi into editHandleMacFix 2018-07-06 18:56:09 -07:00
David Back
a546d8b279 tabs 2018-07-06 15:48:53 -07:00
Dante Ruiz
ae03dcb57a fix parent grab dropping and cullig flickering 2018-07-06 15:42:21 -07:00
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