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

6491 commits

Author SHA1 Message Date
Jeff Clinton
d349c1e672
Merge pull request #14336 from huffman/fix/horizontal-vertical-angle-particles 
Fix horizontal and vertical props in entity properties being swapped
 2018-11-08 12:42:48 -08:00
Jeff Clinton
ea8dc8ae68
Merge pull request #14334 from danteruiz/interstitial-bug-fixes 
Interstitial bug fixes
 2018-11-08 11:43:38 -08:00
Wayne Chen
e266532888
Merge branch 'master' into loginInitiative2 2018-11-08 11:17:24 -08:00
Jeff Clinton
62e3e87ba6
Merge pull request #14325 from huffman/fix/new-model-dynamic 
Fix new models not obeying dynamic checkbox
 2018-11-08 10:22:12 -08:00
Jeff Clinton
30ff3f676a
Merge pull request #14310 from thoys/fix/create/tooltips-refinement 
Create APP tooltip / Adressed CR comments / Regression
 2018-11-08 10:03:17 -08:00
Dante Ruiz
501746b156 3D Keyboard 2018-11-08 09:58:53 -08:00
Zach Fox
1ab1cb95d8 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-08 09:57:10 -08:00
Jeff Clinton
49bf01294a
Merge pull request #14320 from huffman/fix/default-collision-values 
Update the default edit.js collidesWith to include myAvatar
 2018-11-08 09:17:40 -08:00
David Rowe
371919b923 Fix mini tablet always displaying if start up in HMD mode 2018-11-08 17:47:02 +13:00
David Back
0597d15771 tabs 2018-11-07 16:06:18 -08:00
David Back
f0c2ec1fa4 entity list data-driven resizable addable/removable columns 2018-11-07 16:02:15 -08:00
Wayne Chen
bd11825f3d removing debug print statement 2018-11-07 09:40:01 -08:00
Wayne Chen
fc32ba9ce3 fixing create app window on desktop 2018-11-07 09:26:34 -08:00
David Rowe
28097933ed Add setting to enable/disable the mini tablet 2018-11-07 14:39:06 +13:00
Zach Fox
e80468e423 Remove URL logging from JS and QML 2018-11-06 15:09:24 -08:00
Andrew Meadows
b38c263e60 use correct capsule dimensions in teleport.js 2018-11-06 12:44:14 -08:00
David Rowe
629559e78c Add extra ()s 2018-11-07 09:20:54 +13:00
David Rowe
f47f77b181 Fix mini tablet JavaScript crash 2018-11-07 09:11:43 +13:00
Howard Stearns
5e01314d85
Merge pull request #14319 from howard-stearns/tabless 
Remove tabs from oculus store inventory, and rename to match
 2018-11-05 18:05:02 -08:00
Howard Stearns
89656ea3f6 activity notifications also change ASSETS to INVENTORY 2018-11-05 16:43:06 -08:00
Howard Stearns
03ac18ab74
Merge pull request #14299 from davidkelly/dk/19591 
Don't attempt purchase of sold out items
 2018-11-05 16:20:02 -08:00
Zach Fox
f10b9ae30c Squashed commit of the following: 
commit 515ff016a4
Author: Zach Fox <fox@highfidelity.io>
Date:   Mon Nov 5 13:03:34 2018 -0800

    Fix seven bugs

commit a4d36b3845
Merge: 8906b909eb d0181283dd
Author: Zach Fox <fox@highfidelity.io>
Date:   Mon Nov 5 10:25:58 2018 -0800

    Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce

commit d0181283dd
Merge: be17ed0910 643026abd6
Author: Brad Hefta-Gaub <brad@highfidelity.io>
Date:   Fri Nov 2 16:44:31 2018 -0700

    Merge pull request #14308 from sabrina-shanman/fbx2hfm

    (case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes

commit 643026abd6
Author: sabrina-shanman <sabrina@highfidelity.io>
Date:   Wed Oct 31 14:15:30 2018 -0700

    Change local variable in TestFbx for clarity

commit 0b7ddca5f6
Author: sabrina-shanman <sabrina@highfidelity.io>
Date:   Wed Oct 31 14:03:20 2018 -0700

    Change naming for straggler names in model loading debug dumps

commit becee7f010
Author: sabrina-shanman <sabrina@highfidelity.io>
Date:   Tue Oct 30 17:28:42 2018 -0700

    Re-name FBXGeometry to HFMGeometry and do the same for related classes
 2018-11-05 13:12:43 -08:00
Zach Fox
515ff016a4 Fix seven bugs 2018-11-05 13:03:34 -08:00
howard-stearns
7115f0e688 update notification refs inventory, not assets 2018-11-04 12:17:41 -08:00
howard-stearns
4f713b038e Merge branch 'oculus-store-commerce' into tabless 2018-11-04 12:17:21 -08:00
howard-stearns
8906b909eb close wallet app during login so that it doesn't tell to login after 
login
 2018-11-04 12:08:29 -08:00
howard-stearns
100a17a2b9 remove wallet reference in update notification 2018-11-04 11:25:40 -08:00
howard-stearns
8ad8398ef3 remove 'purchase' from login notice. 2018-11-04 11:17:56 -08:00
Seth Alves
a94fd2a1c9 only equip an entity to a hand-controller joint if the hand-controllers are in use, else use avatar hand 2018-11-03 13:14:08 -07:00
Zach Fox
a87142b8b7 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-11-02 16:49:20 -07:00
Ryan Huffman
c22df4dd94 Fix horizontal and vertical props in entity properties being swapped 2018-11-02 16:22:10 -07:00
Zach Fox
402c23e359 Use useragent instead of queryparam to determine limitedCommerce 2018-11-02 16:07:29 -07:00
Dante Ruiz
b33934ec46 fixing Image3DOverlay scaling 2018-11-02 14:24:14 -07:00
Zach Fox
2b50c40224 Minor changes found by Chang 2018-11-02 09:33:06 -07:00
David Rowe
55d0822b1a Delay showing mini tablet 2018-11-02 18:18:41 +13:00
David Rowe
8924f0832a Use half angles relative to palm normal for mini tablet visibility 2018-11-02 18:06:00 +13:00
Ryan Huffman
4593b33435 Fix new models not obeying dynamic checkbox 2018-11-01 14:38:55 -07:00
David Rowe
1e3549d263 Increase delay in shrinking the mini tablet after start of trigger 2018-11-02 08:33:14 +13:00
Ryan Huffman
01b29185ca Update the default edit.js collidesWith to include myAvatar 2018-11-01 12:04:20 -07:00
Howard Stearns
8f2f27f468 Merge branch 'oculus-store-commerce' into tabless 2018-11-01 11:22:28 -07:00
Zach Fox
4a56f769e5 Re-add some code I shouldn't have removed 2018-11-01 11:04:59 -07:00
Zach Fox
d481f081bb Fix four bugs; truncate some logs 2018-11-01 10:29:38 -07:00
Alexander Ivash
dcf20d2a15 FB17381 - Reticle.setVisible isn't working 2018-11-01 22:39:02 +05:30
Zach Fox
41a0d09389 First pass 2018-10-31 15:31:51 -07:00
Howard Stearns
ce0ad48a28 tabless wallet 2018-10-31 13:58:26 -07:00
Zach Fox
34fb849536 Cleanup FIXME 2018-10-31 13:53:18 -07:00
Zach Fox
a1276ba899 Don't poll for history notifs if limitedCommerce is true 2018-10-31 13:31:29 -07:00
Zach Fox
448be8847f Notifications are working! 2018-10-31 13:23:58 -07:00
Dante Ruiz
b3539b101b faster loading bar interpolation once physics is enabled 2018-10-31 11:33:53 -07:00
Thijs Wenker
92888e9d3e tooltip CR changes 2018-10-31 18:26:23 +01:00
Andrew Meadows
225e8e0556 always zero velocity on far-grab release of non-dynamic 2018-10-31 10:20:21 -07:00
Dante Ruiz
0279eef3a4 improving interstitial loading bar 2018-10-31 10:13:32 -07:00
Andrew Meadows
90e944f130 always zero velocity on near-grab release of non-dynamic 2018-10-30 16:20:33 -07:00
Zach Fox
b6344acc1d Big checkpoint. be aware - things may be broken 2018-10-30 15:08:13 -07:00
David Kelly
015b5fa681 Don't attempt purchase of sold out items 2018-10-30 08:01:22 -07:00
David Rowe
791ee04aea Merge branch 'master' into M12661 2018-10-30 13:33:53 +13:00
Zach Fox
d47fd44a47 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-10-29 14:57:23 -07:00
Ryan Huffman
c6403a44cb
Merge pull request #14281 from dback2/collidesPropertyFix 
Fix Collides With subproperties
 2018-10-26 13:46:52 -07:00
John Conklin II
fa2fb3a87a
Merge pull request #14246 from sethalves/sync-grab-props 
keep userData and new grab properties in sync
 2018-10-26 11:52:47 -07:00
David Rowe
2fdb114e4b Fix interstitial page not displaying at Interface start-up 2018-10-26 19:21:37 +13:00
David Back
13acfb325a fix collides with properties, fix ordering for start/finish/spread properties 2018-10-25 15:06:15 -07:00
John Conklin II
2dfd63f4e7
Merge pull request #14229 from thoys/feat/create/tooltips 
MS19052 [CreateApp]: Tooltips
 2018-10-25 14:52:16 -07:00
John Conklin II
7227547b6a
Merge pull request #14279 from dback2/removeParticleExplorer 
Remove particle explorer
 2018-10-25 13:37:22 -07:00
Howard Stearns
8b79795247 nix the word "purchase" where possible 2018-10-25 12:31:01 -07:00
David Back
eb347c5596 remove particle explorer 2018-10-25 11:30:18 -07:00
Howard Stearns
6284c902be use the switch 2018-10-25 11:29:10 -07:00
SamGondelman
faff5f11e8 Merge remote-tracking branch 'upstream/master' into particleLoad 2018-10-25 10:56:11 -07:00
Seth Alves
b8f1c96685 rats 2018-10-25 07:47:16 -07:00
Seth Alves
b93807b1a7 remove conversion code from equipEntity.js 2018-10-25 07:47:16 -07:00
David Rowe
1460e43f6e Make tablet highlight not display if editing an entity with hand 2018-10-25 15:04:59 +13:00
David Rowe
0eead13fb9 Make Create not grab tablet if editing an entity with hand 2018-10-25 15:03:47 +13:00
Thijs Wenker
13cad17793 better style js attributes 2018-10-25 02:46:16 +02:00
Thijs Wenker
bb7d1f8afb fix broken and missing tooltips 2018-10-25 02:46:16 +02:00
Thijs Wenker
83051940a8 Fix QA feedback 2018-10-25 02:46:15 +02:00
Thijs Wenker
358b0b76d1 tooltip delay of 500ms 2018-10-25 02:46:15 +02:00
Thijs Wenker
a3b874f9aa property tooltips 2018-10-25 02:46:14 +02:00
David Back
a88678fb70 fix bad css merge, add particle property debounce 2018-10-24 15:07:47 -07:00
Howard Stearns
1ff50bc05e updates notification applies to assets, and there is no wallet activity 
notification
 2018-10-24 12:45:17 -07:00
David Back
5c1972e3f4 fix fallback properties 2018-10-24 12:40:44 -07:00
Howard Stearns
e1e9b78427 filter priced items from marketplace 2018-10-24 12:22:03 -07:00
David Back
b3e0d51260 Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-24 11:48:56 -07:00
Howard Stearns
8ee6a0ceff disable priced items 2018-10-24 11:37:02 -07:00
Howard Stearns
ce20b82408 fix view this item in my purchases 2018-10-24 10:41:14 -07:00
David Back
073040d1fc
Merge branch 'master' into entityListTypeFilter 2018-10-24 10:39:30 -07:00
Ryan Huffman
6221b9ee59
Merge pull request #14149 from thoys/feat/create/entityList-autoScroll 
MS19054: [CreateApp/EntityList] auto scroll
 2018-10-24 10:36:21 -07:00
Brad Hefta-Gaub
f8e38e98e1
Merge pull request #14214 from huffman/feat/edit-defaults 
Update default entity properties in Create
 2018-10-24 10:00:46 -07:00
Brad Hefta-Gaub
5e27a5930e
Merge pull request #14186 from thoys/feat/create/entityList-contextMenu 
MS19056: [CreateApp/Entity List] Context Menu
 2018-10-24 09:58:32 -07:00
Howard Stearns
c1cb41875a Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-10-24 09:56:37 -07:00
Thijs Wenker
5f35a32480 remove duplicate calls to refresh footer 2018-10-24 17:58:07 +02:00
Thijs Wenker
8e1cfb5a06 fix double click selection 2018-10-24 17:58:07 +02:00
Thijs Wenker
776b8b8fc7 CR and style fixes 2018-10-24 17:58:06 +02:00
Thijs Wenker
27e0c85b01 entity list auto scroll 2018-10-24 17:58:06 +02:00
unknown
c7ba386be1 darn prints somehow slipping past me 2018-10-23 20:56:53 -07:00
unknown
06aff231a3 Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-23 20:19:06 -07:00
David Back
2b9dcd0875 fix particle properties and keylight direction, remove columns, fix orderings, fix sliders 2018-10-23 18:38:05 -07:00
Kerry Ivan Kurian
3cf000a71b
Merge pull request #14232 from kkurian/log-resource-requests-2 
Display resource-access events in marketplace item tester
 2018-10-23 15:18:30 -07:00
Brad Hefta-Gaub
04d251c321
Merge pull request #14249 from wayne-chen/mergedInterstitialBugFixes 
Merged interstitial bug fixes
 2018-10-23 14:30:55 -07:00
Kerry Ivan Kurian
e7d1c2873a Merge branch 'master' into log-resource-requests-2 2018-10-23 13:46:59 -07:00
Thijs Wenker
4e9f9b3edf comply with copy/paste update 2018-10-23 22:42:56 +02:00
Thijs Wenker
3fa4ee0e1d enable duplicate copy cut paste functionality of context menu 2018-10-23 22:42:55 +02:00
Thijs Wenker
4069ca2e0c CR feedback 2018-10-23 22:42:55 +02:00
Thijs Wenker
e5ef589a3c style 2018-10-23 22:42:54 +02:00
Thijs Wenker
4c3f5b3bbc Entity List Context Menu 2018-10-23 22:42:54 +02:00
SamGondelman
8807b90474 fix emitRadiusStart 2018-10-23 13:33:14 -07:00
Howard Stearns
97bc84ed87 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-10-23 13:32:35 -07:00
David Back
9df8ea35bb Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-23 13:28:35 -07:00
tapalisa
7a684081f0
Merge pull request #14235 from huffman/feat/edit-copy-paste 
Add copy/paste functionality to edit.js
 2018-10-23 13:18:12 -07:00
Howard Stearns
a79fe4df79 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-10-23 13:09:33 -07:00
Howard Stearns
95b86bf5b7 initial limited commerce for oculus store prototype 2018-10-23 13:08:39 -07:00
Brad Hefta-Gaub
447bfae828
Merge pull request #13884 from ctrlaltdavid/M17853 
Highlight tablet when it is near-grabbable
 2018-10-23 12:31:41 -07:00
David Back
9afb111fbe add link, fix group order 2018-10-22 18:42:06 -07:00
David Back
d5dc93e800 QA fixes and reset server script status 2018-10-22 18:31:21 -07:00
Ryan Huffman
d7dce456b2 Fix incorrect default entity properties in Create 2018-10-22 18:29:27 -07:00
David Back
e8bda1793f Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-22 15:12:45 -07:00
David Back
e5caf01681 CR change for body click event 2018-10-22 14:51:54 -07:00
Kerry Ivan Kurian
a1bb685176 Remove cruft 2018-10-22 14:00:08 -07:00
Zach Fox
f5a5c0dad3 Attempt to fix wearable bug? 2018-10-22 14:00:06 -07:00
Zach Fox
f9cc4f5a69 Count unique source and url pairs 2018-10-22 14:00:01 -07:00
Zach Fox
de93bbb08b Only show unique resources 2018-10-22 13:59:59 -07:00
Zach Fox
d44f9e2ccc Tons of improvements 2018-10-22 13:59:57 -07:00
Zach Fox
7be5d5674d Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2 2018-10-22 13:59:35 -07:00
Ryan Huffman
573df2d922 Move copy/paste/cut to SelectionManager 2018-10-22 13:56:08 -07:00
Ryan Huffman
e0851c4807 Add cut to Create, and update shortcuts 2018-10-22 13:56:08 -07:00
Ryan Huffman
65fdd16d90 Cleanup copy/paste changes 2018-10-22 13:56:07 -07:00
Ryan Huffman
9cc2add4a0 Add copy/paste functionality to edit.js 2018-10-22 13:56:07 -07:00
David Rowe
35c1241c98 Fix tablet highlighting not working if start up in HMD 2018-10-23 09:08:38 +13:00
Dante Ruiz
1ce1902fa8 remove magic numbers 2018-10-22 12:49:24 -07:00
David Back
ddbe02dd4e CR changes and fix extra info toggle 2018-10-22 11:56:47 -07:00
John Conklin II
b3698388ea
Merge pull request #14245 from huffman/feat/default-grabbable-setting 
Add a 'grabbable' option to the new-model dialog
 2018-10-22 11:42:40 -07:00
Wayne Chen
d008bfa523 partial requested code changes 2018-10-22 11:29:36 -07:00
David Back
f5616acba9 Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter 2018-10-22 11:21:27 -07:00
Wayne Chen
7284c3ad53 Merge branch 'intersttiial-do-not-intersect-web' of https://github.com/danteruiz/hifi into mergedInterstitialBugFixes 2018-10-22 10:28:35 -07:00
Wayne Chen
e2b90aac9d Merge branch 'interstitialIgnoreFix' of https://github.com/wayne-chen/hifi into mergedInterstitialBugFixes 2018-10-22 10:28:12 -07:00
Wayne Chen
d12ee393d7 Merge branch 'fix-some-more-interstitial-issues' of https://github.com/danteruiz/hifi into mergedInterstitialBugFixes 2018-10-22 10:27:13 -07:00
Wayne Chen
4a8348e0d1 Merge branch 'interstitial-loading-imporvements' of https://github.com/danteruiz/hifi into mergedInterstitialBugFixes 2018-10-22 10:14:40 -07:00
Wayne Chen
27813d4948 Merge branch 'fix/loadingscreen-optimization' of https://github.com/FlameSoulis/hifi into mergedInterstitialBugFixes 2018-10-22 10:05:55 -07:00
Wayne Chen
afd8baca87 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialIgnoreFix 2018-10-22 10:01:57 -07:00
Ryan Huffman
9d13902cd3 Improve paramater names in model dialog window 2018-10-20 11:26:12 -07:00
Ryan Huffman
f1258e4445 Add a 'grabbable' option to the new-model dialog 2018-10-19 16:42:45 -07:00
Brad Hefta-Gaub
1ff69844f2
Merge pull request #14225 from wayne-chen/interstitialHideProgressJS-RC75 
hide progress overlays if interstitial mode
 2018-10-19 16:35:42 -07:00
David Back
76dbee265e Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter 2018-10-19 16:05:04 -07:00
David Back
e59f1516ef CR changes 2018-10-19 16:01:53 -07:00
David Rowe
71ec5f3612 Fix tablet highlighting when using the Create and Shapes apps 2018-10-20 11:57:46 +13:00
David Rowe
eb179363f6 Merge branch 'master' into M17853 
# Conflicts:
#	scripts/system/controllers/controllerDispatcher.js
 2018-10-20 11:19:26 +13:00
Flame Soulis
5db7c7821e Proper formatting (aka no spaces after anonymous funcs) 2018-10-19 08:51:13 -04:00
Flame Soulis
ba459eda9e Removed duplicate backgroundAlpha 2018-10-19 08:41:04 -04:00
Flame Soulis
fcde53fc65 Include black-sphere.fbx and update linked url 2018-10-19 08:22:43 -04:00
Flame Soulis
014c1590dd Made MP3 constistant 128kbps and fixed path resolving 2018-10-19 08:16:14 -04:00
Flame Soulis
e499309c8e Upload interstitial page sound and update link 2018-10-19 06:49:48 -04:00
John Conklin II
37dce01dcb
Merge pull request #14099 from humbletim/fb18305-grabbable-menu-fix 
More reliable "Create Entities as Grabbable" settings persistence.
 2018-10-18 18:26:48 -07:00
John Conklin II
bbccd0ff73
Merge pull request #14120 from zfox23/MS18609_snapShareBugs 
Fix MS18609: Various Snapshot sharing bugs
 2018-10-18 18:21:23 -07:00
John Conklin II
5095a4e0eb
Merge pull request #14196 from sethalves/interstitial-domain-full 
go to error-room when failing to connect to a full domain
 2018-10-18 17:49:35 -07:00
John Conklin II
addae51976
Merge pull request #14215 from ctrlaltdavid/M19308 
Hide mini tablet immediately upon near grabbing an entity
 2018-10-18 17:47:17 -07:00
Ryan Huffman
a4adf2c716
Fix name of Particles to ParticleEffect for default properties in edit.js 2018-10-18 17:39:24 -07:00
David Rowe
3e49d55dbf Merge branch 'master' into M12661 
# Conflicts:
#	scripts/system/controllers/controllerModules/farActionGrabEntity.js
 2018-10-19 11:24:43 +13:00
David Back
45a92fd537 style tweaks 2018-10-18 15:12:38 -07:00
David Back
11add70ef2 style tweaks 2018-10-18 14:58:51 -07:00
Wayne Chen
6cf9608c97 adding fade in and fade outt in interstitial for progress 2018-10-18 13:12:04 -07:00
David Rowe
490c085eb8 Merge branch 'master' into M16440 
# Conflicts:
#	scripts/system/controllers/controllerModules/hudOverlayPointer.js
#	scripts/system/controllers/controllerModules/inVREditMode.js
 2018-10-19 09:06:33 +13:00
Seth Alves
7f150e6ed3 Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-18 09:53:18 -07:00
Zach Fox
72b3777953 Merge branch 'master' of github.com:highfidelity/hifi into MS18609_snapShareBugs 2018-10-18 09:39:34 -07:00
Kerry Ivan Kurian
3b15548ea3 Display resource-access events in marketplace item tester 
Includes refactoring marketplace item tester into a single-page app.
 2018-10-18 01:04:47 -07:00
David Back
f13008dbe9 tabs 2018-10-17 20:04:28 -07:00
David Back
6b5e616d2a
Merge branch 'master' into entityPropertiesRefactor 2018-10-17 20:01:15 -07:00
David Back
ad920ddc86 fix double min, unique collides subproperty ids 2018-10-17 19:44:38 -07:00
Thijs Wenker
b9cfa28c08 style fixes 2018-10-17 19:42:47 -07:00
Thijs Wenker
684f7d5689 move export selection button to bottom of the list 2018-10-17 19:37:56 -07:00
David Back
9e35af0c4a remove space 2018-10-17 18:24:09 -07:00
David Back
9cd3c35cc6 style changes and fix hidden top row 2018-10-17 18:18:51 -07:00
Wayne Chen
fd3c0d2f76 pushing with new fix 2018-10-17 15:03:09 -07:00
Brad Hefta-Gaub
0e0542ec6e
Merge pull request #13890 from sethalves/grab-properties-1 
move grab pseudo-properties (userData) into first-class EntityItemProperties
 2018-10-17 13:29:20 -07:00
David Back
001601d28f Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter 2018-10-17 11:30:10 -07:00
Thijs Wenker
4ef2ad041b
Merge pull request #14136 from thoys/feat/create/exportSelection 
MS19053: [CreateApp/EntityList] Move export selection button to bottom of the list
 2018-10-17 19:50:37 +02:00
David Back
a2aa63e9ed adjust no entities message 2018-10-16 14:28:52 -07:00
David Back
5ae4425729 Merge branch 'entityListTypeFilter' of github.com:dback2/hifi into entityListTypeFilter 2018-10-16 14:20:48 -07:00
David Back
58e8d4071d Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter 2018-10-16 13:52:27 -07:00
David Back
50becb5c37 merge particle explorer into properties, resurrect sliders, other tidying/fixes 2018-10-16 12:39:34 -07:00
Ryan Huffman
738ac30f1d Update default entity properties in Create 2018-10-15 13:42:10 -07:00
David Rowe
c9919ff69d Hide mini tablet immediately upon near grabbing an entity 2018-10-16 08:22:30 +13:00
Thijs Wenker
f1885159d2 style fixes 2018-10-15 21:17:41 +02:00
unknown
978cd4bb77 styling tweaks, fix X clear search not refreshing 2018-10-12 18:57:26 -07:00
unknown
a85336044f add X to clear button to filter search 2018-10-12 18:03:47 -07:00
David Rowe
7d3eca57bb Fix mouse pointer not recognizing or highlighting collisionless entities 2018-10-13 10:22:41 +13:00
David Rowe
3bc4581f82 Fix far grabbing collisionless entity removing collisionless property 2018-10-13 10:22:27 +13:00
David Rowe
ca4fe0682e Fix collisionless entities not being able to be far grabbed 2018-10-13 10:22:05 +13:00
Howard Stearns
a92aa1f9da new treatment for hmd/tablet login 2018-10-12 14:17:23 -07:00
Dante Ruiz
fa6b3019f6 fix js memory leak 2018-10-12 12:07:39 -07:00
Dante Ruiz
d7dc69129a improve loading bar progress 2018-10-12 11:43:03 -07:00
unknown
6320f9bab7 tweaks 2018-10-12 11:39:54 -07:00
Seth Alves
47d3c9ba27 go to error-room when failing to connect to a full domain 2018-10-12 11:28:54 -07:00
unknown
97438a08d9 styling fixes, add icon, adjust Types text, click outside to close 2018-10-11 23:04:33 -07:00
David Back
4883a60afc entity list type filter WIP - still some style issues 2018-10-11 18:55:14 -07:00
David Back
62c5fb8e2e tweaks / dropdown fix 2018-10-11 14:25:06 -07:00
David Back
3f08400741 comment 2018-10-11 12:48:08 -07:00
David Back
5528050898 CR changes - propertyName vs propertyID, store name/elementID, return property element 2018-10-11 12:44:07 -07:00
Dante Ruiz
451142f9a3 fixing some more interstittial issues 2018-10-11 11:33:19 -07:00
David Back
ac0e999629 fix colors 2018-10-10 17:31:06 -07:00
David Back
31e665ab8b CR changes - runtime property data rework 2018-10-10 16:49:20 -07:00
Dante Ruiz
a47a1c03e6 ignore web entities 2018-10-10 14:08:47 -07:00
Dante Ruiz
296ea8a5af fix overlay issues during interstitial mode 2018-10-10 12:00:58 -07:00
David Back
60d102c9bf styling fixes 2018-10-09 12:42:57 -07:00
David Back
7aba0a9082 cleanup 2018-10-09 10:17:39 -07:00
David Back
27d9e8bd23 initial pass refactored re-ordered data-driver entity properties 2018-10-09 10:11:30 -07:00
Wayne Chen
6f9593dabd adding fix for far action grab 2018-10-08 16:59:39 -07:00
David Rowe
0b163ffaf8 Fix typos 2018-10-09 11:05:48 +13:00
Alexander Ivash
19c3f1516f relax 'isWearable' conditions to treat entities like 'ghost.json' as wearables 2018-10-09 00:17:19 +03:00
Wayne Chen
ea8229fca4 adding fix for length check 2018-10-08 13:10:41 -07:00
divya
91df342ae9
Merge pull request #14094 from wayne-chen/interstitialMerged 
Merged interstitial page/redirect domain improvements
 2018-10-08 10:32:29 -07:00
Wayne Chen
f758438dcc
Merge pull request #9 from danteruiz/interstitialMerged 
fix for failing to enter domain
 2018-10-05 16:19:25 -07:00
Dante Ruiz
36c2cceb57 fix for failing to enter domain 2018-10-05 15:39:51 -07:00
Wayne Chen
8abbd51bb1 removing unused variable 2018-10-04 23:11:27 -07:00
Wayne Chen
89e2cf7153
Merge pull request #7 from danteruiz/interstitialMerged 
Interstitial merged
 2018-10-04 17:10:27 -07:00
Wayne Chen
a2237aa48a reverting click overlay behavior 2018-10-04 16:41:14 -07:00
Wayne Chen
c423305bd1 check overlay visibility before showing back up again 2018-10-04 16:30:48 -07:00
Dante Ruiz
651f37aceb Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged 2018-10-04 15:01:39 -07:00
Dante Ruiz
bda9735b5d fix loading progress 2018-10-04 15:01:16 -07:00
Wayne Chen
2e3566bc73 hide overlays after clicking on them 2018-10-04 14:24:43 -07:00
Alexander Ivash
f8285ab3d8 FB18673 - Last line of GOTO desktop notification text cropped off on bottom 2018-10-05 00:14:13 +03:00
Wayne Chen
0a7102b4d3 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-04 08:59:26 -07:00
Wayne Chen
22a9030fb5 hiding text overlays when out of error state 2018-10-03 17:54:55 -07:00
Wayne Chen
d6af09ca62 ignoring entities in interstitial/saving address on 404 error 2018-10-03 17:40:42 -07:00
David Rowe
3bc1c2963d Fix HUD laser while in Shapes app 2018-10-04 13:15:33 +13:00
David Rowe
209d1535c2 Fix HUD laser while in Create app 2018-10-04 10:42:17 +13:00
sabrina-shanman
2ef85dfdba Merge branch 'master' into stt_parenting2 2018-10-03 11:39:00 -07:00
John Conklin II
4805d3564a
Merge pull request #14075 from ctrlaltdavid/M18586 
Teleport with play area
 2018-10-03 11:02:33 -07:00
Thijs Wenker
66c533b557 move export selection button to bottom of the list 2018-10-03 19:35:03 +02:00
Wayne Chen
efeb598495 fixing bug with hover overlay 2018-10-03 10:12:07 -07:00
John Conklin II
9a614d7523
Merge pull request #13977 from dback2/newEntityListView 
New optimized entity list view
 2018-10-03 09:23:11 -07:00
John Conklin II
8bd8d05409
Merge pull request #14118 from luiscuenca/handTouchLMFix 
Disable Hand Touch when Leap Motion is running
 2018-10-03 09:03:43 -07:00
David Rowe
2bdd8bfdc7 Update play area and sensor overlay models and raise a little 2018-10-03 11:09:04 +13:00
David Rowe
488599dbb0 Update teleport play area FBX model to be visible from below 2018-10-03 09:31:11 +13:00
David Rowe
c0231057f8 Revert foot calc scaling change 2018-10-03 09:28:19 +13:00
John Conklin II
2cd9e565b0
Merge pull request #14101 from dback2/editHandlePickPlaneImprovements 
Edit handle pick plane improvements
 2018-10-02 10:42:46 -07:00
Seth Alves
834699fa12 Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
David Rowe
f7fd76b316 Merge branch 'master' into M18586 
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
 2018-10-02 16:49:16 +13:00
David Rowe
84a06fbe64 Don't immediately hide occlusion highlights after teleporting 2018-10-02 16:11:01 +13:00
sabrina-shanman
67dc526ee2 Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2 2018-10-01 17:17:32 -07:00
Brad Hefta-Gaub
7c9464572a
Merge pull request #14027 from huffman/feat/deprecate-undo-stack 
Remove UndoStack API
 2018-10-01 17:13:48 -07:00
John Conklin II
9cbd819a39
Merge pull request #13965 from ctrlaltdavid/M17428-f 
Mini tablet in palm
 2018-10-01 16:56:36 -07:00
John Conklin II
3bbc01477e
Merge pull request #14055 from davidkelly/dk/18147 
Do not have active buy button on invalidated items
 2018-10-01 16:50:53 -07:00
John Conklin II
878d2a6f25
Merge pull request #14102 from howard-stearns/account-managed-wallet-punchlist2 
Account-managed wallet flow improvements
 2018-10-01 16:43:01 -07:00
David Back
b5edf42fd0
Merge branch 'master' into editHandlePickPlaneImprovements 2018-10-01 16:36:30 -07:00
Brad Hefta-Gaub
edd5db7768
Merge pull request #14042 from thoys/perf/create/getMultipleEntities 
Speed up Entity List properties fetching by adding Entities.getMultipleEntities API
 2018-10-01 16:16:48 -07:00
Brad Hefta-Gaub
ef063a4072
Merge pull request #14026 from huffman/fix/edit-rotation 
Fix edit rotation handle fidgeting
 2018-10-01 16:15:32 -07:00
Brad Hefta-Gaub
6eae178389
Merge pull request #13997 from gcalero/case_18057 
Fix switch from Top View to My View
 2018-10-01 16:13:07 -07:00
Wayne Chen
36dbcd41ba Merge branch 'interstitialMerged' of https://github.com/wayne-chen/hifi into interstitialMerged 2018-10-01 16:11:40 -07:00
Wayne Chen
69b547a9fe text overlays for consistency 2018-10-01 16:11:27 -07:00
Wayne Chen
8f36bc0850
Merge pull request #4 from danteruiz/interstitialMerged 
Interstitial screen updates
 2018-10-01 15:43:04 -07:00
Dante Ruiz
66bb5f68d2 updating interstitialmode 2018-10-01 15:26:56 -07:00
David Rowe
87ff6dd56d Fix play area sizing and positioning for different base avatar sizes 2018-10-02 10:53:31 +13:00
David Rowe
6ccd73ea47 Merge branch 'master' into M18586 2018-10-02 10:17:24 +13:00
Zach Fox
0081f9aac0 Also fix MS18512 2018-10-01 12:24:47 -07:00
Zach Fox
58f098577d Fix MS18609: Various Snapshot sharing bugs 2018-10-01 12:09:49 -07:00
luiscuenca
5ccbc5c029 Disable Hand Touch when Leap Motion is running 2018-10-01 10:47:06 -07:00
Wayne Chen
eab57633a5 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-01 09:21:26 -07:00
David Rowe
7560a2a923 Short circuit unnecessary repetition 2018-09-29 16:00:44 +12:00
David Rowe
2449868ea9 Fix mini tablet sizing for different sizes of avatar 2018-09-29 13:51:00 +12:00
David Rowe
8464a70c9e Fix initial tablet scale 2018-09-29 12:42:41 +12:00
John Conklin II
130e8dfbe9
Merge pull request #14023 from dback2/selectEntityEveryFrameFix 
Only call selectEntity once triggered when using edit handles
 2018-09-28 16:38:10 -07:00
Ryan Huffman
feb230b3bd Remove old comment in entitySelectionTool.js 2018-09-28 16:17:52 -07:00
Howard Stearns
053f22182a fix inspection case 2018-09-28 11:57:36 -07:00
Wayne Chen
a8b86bd555 removing debug statement 2018-09-28 08:44:49 -07:00
Wayne Chen
5c9094d81f removing debug print statement 2018-09-27 21:24:04 -07:00
Wayne Chen
d5950db2a4 fix for showing the text overlay in mac 2018-09-27 21:20:06 -07:00
David Rowe
545c2591e3 Merge branch 'master' into M18586 2018-09-28 16:19:44 +12:00
David Rowe
7f518d0aa1 Make teleport parabolas semi-transparent 2018-09-28 16:13:25 +12:00
howard-stearns
b45677cd02 additionally handle item urls (marketplace links from cert inspections) 2018-09-27 19:42:01 -07:00
David Rowe
7b7447739a Remove unused code noticed in passing 2018-09-28 14:23:20 +12:00
David Rowe
45993ba475 Provide mini tablet details via API instead of messages 2018-09-28 14:23:08 +12:00
howard-stearns
a6ef25f662 just whitespace and varname changes 2018-09-27 18:14:16 -07:00
sabrina-shanman
411dbbbad3 Make scripts use the default scaleWithParent when creating ray/parabola 
picks
 2018-09-27 17:34:06 -07:00
Wayne Chen
5d27cddab5 consolidating getting oops message 2018-09-27 17:16:18 -07:00
Howard Stearns
f96c7f4db4 minimal time handshake 2018-09-27 17:05:18 -07:00
David Back
215e7e6da7 remove unneeded variable 2018-09-27 17:04:43 -07:00
David Back
b7c098c260 remove unneeded variable 2018-09-27 17:02:54 -07:00
David Back
4204adf60f fix deselecting entity when re-clicking row, fix ctrl/shift selections 2018-09-27 16:59:23 -07:00
Wayne Chen
8b29f7c294 making text box smaller for no occlusion 2018-09-27 16:56:45 -07:00
Howard Stearns
7616639a40 Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-27 16:12:21 -07:00
David Rowe
d98e7cea4e Fix not being able to grab tablet with other hand 2018-09-28 11:09:16 +12:00
Howard Stearns
ad676b14a1 doh - return with a newline (and no semicolon) does not continue. Don't 
need extra handler in marketplace any more.
 2018-09-27 16:06:55 -07:00
David Back
8c306b8428 disable debug pick plane 2018-09-27 16:04:18 -07:00
David Back
f5d9dd82d9 better pick plane for stretch, camera-facing pick plane for scale, debug pick plane, overall cleanup 2018-09-27 16:01:20 -07:00
Howard Stearns
4cf5b51124 works, using additional handler from wallet.js 2018-09-27 15:34:16 -07:00
David Rowe
1088a0f9ae Fix invalid state transition in desktop mode 2018-09-28 10:19:17 +12:00
David Rowe
fc78d0582e Tidying 2018-09-28 10:18:00 +12:00
humbletim
025bc19d62 save "Create Grabbable" in menuItemEvent, not scriptEnding 2018-09-27 17:08:49 -04:00
David Rowe
2456fd0e99 Merge branch 'master' into M17428-f 2018-09-28 08:41:57 +12:00
Wayne Chen
03d2fa2787 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-09-27 09:47:08 -07:00
David Rowe
3284b2a90e Immediately hide fading overlays if other hand starts teleporting 2018-09-27 15:20:43 +12:00
David Rowe
6ae206677d Add Settings > Controls option for displaying play area 2018-09-27 14:55:53 +12:00
David Rowe
b9c6811fdc Restructure post-teleport fading code 2018-09-27 14:44:30 +12:00
David Back
046a4e4041 ordering/comment tweak 2018-09-26 18:02:15 -07:00
David Back
7e7dc33acd more CR changes + fix resizing 2018-09-26 17:57:44 -07:00
Wayne Chen
813defebfc Merge branch 'update-interstitial' of https://github.com/danteruiz/hifi into interstitialMerged 2018-09-26 16:45:22 -07:00
Wayne Chen
33db8e1f24 only allow right-click for buttons 2018-09-26 16:40:43 -07:00
Wayne Chen
fda3ec87ce removing lingering print statement 2018-09-26 15:57:57 -07:00
Wayne Chen
afae4f3b96 adding toolbar reappearing 2018-09-26 15:33:57 -07:00
Howard Stearns
da5f77afcd Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-26 15:26:52 -07:00
Howard Stearns
6e2a7c280e bottleneck opening our marketplace, and make sure it sets up wallet 
first
 2018-09-26 15:21:53 -07:00
Wayne Chen
db77cbcbc1 new location drop - unparent overlays 2018-09-26 15:12:48 -07:00
Zach Fox
6a3fa28fad Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps 2018-09-26 15:12:04 -07:00
Zach Fox
9a21354c27 Merge branch 'notificationsForFourApps' of github.com:zfox23/hifi into notificationsForFourApps 2018-09-26 15:08:20 -07:00
Howard Stearns
940db4f112 fix recently introduced bug 2018-09-26 15:01:30 -07:00
Zach Fox
6877af04f1 Fix GOTO notifs; fix WALLET notifs (pending backend change) 2018-09-26 14:57:32 -07:00
Ryan Huffman
09b2565e76 Remove UndoStack API 
edit.js shares a global undo stack through the UndoStack API. Because
the stack is globally shared, disabling the feature while create is
disabled doesn't make a lot of sense because it might disabling the
ability to undo/redo with another feature. Because UndoStack is only
used by edit.js, UndoStack is being removed in favor of a local undo
stack implemented within edit.js.
 2018-09-26 14:43:11 -07:00
Wayne Chen
db41a1c16b error state signal for 404/interstitial 2018-09-26 13:48:15 -07:00
John Conklin II
7df90881cd
Merge pull request #14007 from kkurian/marketplace-item-tester 
Marketplace item tester interface
 2018-09-26 11:25:53 -07:00
John Conklin II
d1771b2928
Merge pull request #14058 from danteruiz/fix-dispacther-module-order 
fix equip while keeping new functionality
 2018-09-26 11:06:45 -07:00
Dante Ruiz
fa5dfb6e28 Merge branch 'master' of github.com:highfidelity/hifi into update-interstitial 2018-09-26 09:18:12 -07:00
Wayne Chen
4a87773986 fixing interstitial page, clearing up debug statements 2018-09-26 07:41:18 -07:00
David Rowe
496e0a6304 Update teleport FBX models 2018-09-26 17:20:56 +12:00
Wayne Chen
3e5e324c7e parenting text to head 2018-09-25 20:39:22 -07:00
Wayne Chen
54f800fbda including images/parent buttons to text 2018-09-25 20:21:05 -07:00
Kerry Ivan Kurian
28ec98be9e Uninstall marketplace item tester on wallet shutdown 2018-09-25 19:24:46 -07:00
Wayne Chen
42579f3d16 fixing oops dialog text index lookups 2018-09-25 18:21:51 -07:00
Wayne Chen
26b6967ba6 adding overlays to redirect domain 2018-09-25 18:16:18 -07:00
Kerry Ivan Kurian
e6249e690e Remove duplicate line 2018-09-25 15:52:26 -07:00
Kerry Ivan Kurian
ff83713365 Use persistent object id counter 2018-09-25 00:58:01 -07:00
Kerry Ivan Kurian
ca1da9c830 Implement delete-from-list functionality in marketplace item tester 2018-09-25 00:57:59 -07:00
Kerry Ivan Kurian
505e08b841 Resolve merge conflicts 2018-09-25 00:57:43 -07:00
David Rowe
a00cacc03e Fix post-teleport display; hide immediately avatar moves 2018-09-25 16:02:19 +12:00
Zach Fox
1ac2800e18 Fix wallet dot logic 2018-09-24 17:50:37 -07:00
Zach Fox
be304ea975 Small bugfixes again 2018-09-24 17:33:23 -07:00
David Rowe
03f0b95a3f Fix unwanted hexagonal occlusion artefact 2018-09-25 12:03:41 +12:00
David Rowe
7396bf0dbe Immediately hide post-teleport play area if start teleporting again 2018-09-25 11:39:41 +12:00
David Rowe
06b4f51a08 Misc fixes 2018-09-25 11:33:08 +12:00
Kerry Ivan Kurian
697f556a60 Persist list of marketplace items in test 
The list of resources between runs of the marketplace item tester now persist between runs of the tester.
 2018-09-24 16:30:49 -07:00
David Rowe
90ef109476 Remove superseded Pointers API functions 2018-09-25 11:11:53 +12:00
Dante Ruiz
57ae8ff8a1 update interstitial page stability count and loading bar 2018-09-24 16:09:53 -07:00
David Rowe
4927ffece3 Misc fixes 2018-09-25 10:33:49 +12:00
David Rowe
991ceb643c Fix teleport not working after script reload in HMD mode 2018-09-25 10:18:52 +12:00
David Rowe
858abaf6fc Fix sensor overlays not displaying after re-enter HMD mode 2018-09-25 09:49:11 +12:00
Zach Fox
a76c3f028d Small bugfixes 2018-09-24 14:46:00 -07:00
Howard Stearns
71cff45fbb Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-24 14:38:21 -07:00
John Conklin II
55848e6959
Merge pull request #14008 from sethalves/fix-local-angular-velocity 
fix bug that caused localAngularVelocity to get zeroed out
 2018-09-24 14:32:57 -07:00
Howard Stearns
d3391b9273 Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-24 13:50:52 -07:00
John Conklin II
1f6f51993d
Merge pull request #14029 from huffman/fix/keyboard-logging-in-edit 
Remove verbose logging of keyboard messages in edit.js and gridTool.js
 2018-09-24 12:54:43 -07:00
John Conklin II
9916496118
Merge pull request #14041 from huffman/fix/entity-list-no-highlight-74 
Fix entity list selection failing when selecting entities not in list
 2018-09-24 11:02:36 -07:00
David Back
df48c60a8f further improvements/fixes 2018-09-24 10:28:37 -07:00
Zach Fox
57c303440b Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps 2018-09-24 09:32:53 -07:00
David Back
074c3f2c7c Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView 2018-09-24 09:23:44 -07:00
Dante Ruiz
5a8ab61426 Merge branch 'master' of github.com:highfidelity/hifi into update-interstitial 2018-09-24 09:21:36 -07:00
David Rowe
5ff2c36917 Get play area displaying and working again 2018-09-24 15:53:47 +12:00
David Rowe
e29b403abc Merge branch 'master' into M18586 
# Conflicts:
#	interface/src/raypick/PointerScriptingInterface.cpp
#	interface/src/raypick/PointerScriptingInterface.h
#	interface/src/raypick/StylusPointer.h
#	libraries/pointers/src/Pointer.h
#	scripts/system/controllers/controllerModules/teleport.js
 2018-09-24 11:44:28 +12:00
Dante Ruiz
d4450ac780 fix equip and keeping new functionallity 2018-09-21 15:59:00 -07:00
David Kelly
fe9b972c80 Do not have active buy button on invalidated items 2018-09-21 15:46:57 -07:00
John Conklin II
ea7bc26ad8
Merge pull request #14038 from wayne-chen/fixInterstitialButton 
Fix Interstitial GoTo button stretch
 2018-09-21 11:44:48 -07:00
Dante Ruiz
d3368146ce saving work 2018-09-21 11:42:26 -07:00
Zach Fox
6284074ff9 Don't show banner when app is open but continue updating data 2018-09-21 10:47:59 -07:00
David Back
506b9d8645 more fixes for deleting/selecting, potential optimizations 2018-09-21 10:02:41 -07:00
David Rowe
b1bbcb9e5e Tidying 2018-09-21 13:48:28 +12:00
David Rowe
9426f72652 Make mini tablet disappear when using grip the same as the trigger 2018-09-21 13:45:10 +12:00
David Rowe
eac1666e01 Disable grabbing the mini tablet with the grip button 2018-09-21 12:44:55 +12:00
David Rowe
0ae7fdc7b1 Remove ability to grab the mini tablet with the other hand 2018-09-21 12:02:46 +12:00
David Rowe
5719b7020d Merge branch 'master' into M17428-f 2018-09-21 10:47:56 +12:00
Zach Fox
33c04631ea Comments on Confluence doc 2018-09-20 14:37:46 -07:00
Kerry Ivan Kurian
ae4352f450 Rez entity in marketplace item tester 2018-09-20 13:55:22 -07:00
Ryan Huffman
1ee655c8f8 Fix sorting of entity list not working as expected 2018-09-20 13:51:00 -07:00
Thijs Wenker
d1f35c8c54 update the entityList update with newly added Entities.getMultipleEntities function 2018-09-20 22:48:56 +02:00
Ryan Huffman
72adfb7ff0 Fix entity list selection failing when selecting entities not in list 2018-09-20 13:46:22 -07:00
Zach Fox
87e91a4401 GOTO doesn't care about SINCE; reduce data for PEOPLE 2018-09-20 13:36:50 -07:00
Wayne Chen
8bd698b143 leaving button in natural dims 2018-09-20 11:13:27 -07:00
David Back
e1758c7974 CR changes 2018-09-20 11:08:01 -07:00
Zach Fox
ed84b49ece Small bugfixes and using original endpoints 2018-09-19 16:15:59 -07:00
Howard Stearns
d644a63990 consistent/usefull checkout flow when you don't have enough money. 2018-09-19 16:00:40 -07:00
Ryan Huffman
8805ce49e3 Remove verbose logging of keyboard messages in edit.js and gridTool.js 2018-09-19 15:06:58 -07:00
Ryan Huffman
431daecd8e Fix shifting of yaw rotation handle 2018-09-19 14:33:51 -07:00
David Back
e701c79984 Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView 2018-09-19 14:06:28 -07:00
David Back
46c8083fb9 only call selectEntity one time per trigger 2018-09-19 10:13:15 -07:00
Zach Fox
f70ecdad16 Small bugfix 2018-09-18 17:00:53 -07:00
Zach Fox
9db11aeda7 Bugfixes and new algo for PAL notifs 2018-09-18 16:35:53 -07:00
Zach Fox
4987164706 Notifications for GOTO (using a cool algorithm) 2018-09-18 15:30:43 -07:00
Zach Fox
55a0f77697 Notifications for MARKET 2018-09-18 14:45:14 -07:00
Zach Fox
a97f9eb79a Logic for Wallet notifications; some bugfixes 2018-09-18 12:28:03 -07:00
Zach Fox
d487914656 Prevent text notification from appearing when not necessary 2018-09-18 11:28:59 -07:00
Kerry Ivan Kurian
f2a046da91 Install marketplace item tester 2018-09-18 00:08:09 -07:00
Zach Fox
c453594eb7 Overhaul notification logic for PAL 2018-09-17 14:41:18 -07:00
Zach Fox
143a059b16 Small changes to AppUI and PAL 2018-09-17 11:11:36 -07:00
Zach Fox
23fab0985b Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi 2018-09-17 11:11:21 -07:00
David Rowe
5b3d92e816 Persist showing mini tablet for a while after it would otherwise hide 2018-09-16 08:09:26 +12:00
Seth Alves
f86075b2dd Revert "Fix for angularVelocity zeroing out on duplication or undo" 
This reverts commit 9c96a10f6c.
 2018-09-15 09:21:12 -07:00
David Rowe
9d051b71bb Fix mini tablet sometimes flipping when grabbed by other hand 2018-09-15 10:14:22 +12:00
John Conklin II
65ef04ae75
Merge pull request #13937 from luiscuenca/stt_teleport_wip 
Safe Teleport Target
 2018-09-14 15:11:18 -07:00
Zach Fox
9c5544af39 Merge in big work from appui_notifications branch 2018-09-14 14:37:04 -07:00
Zach Fox
9e50904376 Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi 2018-09-14 14:36:22 -07:00
luiscuenca
04e6225a95 Threshold back 2018-09-14 11:22:47 -07:00
luiscuenca
8c9173b639 Safe landing for discrepancies 2018-09-14 11:06:30 -07:00
David Back
86972cf4fb
Merge pull request #13992 from dback2/entityListSearchCase 
Fix entity list search case-sensitivity and allow id search
 2018-09-14 10:58:44 -07:00
Howard Stearns
4378f5bf1c
Merge pull request #13996 from howard-stearns/text-tuning-for-wallet-setup-cta 
Text tuning for wallet setup call to action
 2018-09-14 10:17:22 -07:00
David Back
296e2ba488 lowercase search term at start 2018-09-14 09:57:27 -07:00
Gabriel Calero
cb49635627 Fix switch from Top View to My View 2018-09-14 13:34:04 -03:00
howard-stearns
685b2978ce Text tuning for wallet setup call to action 2018-09-14 08:26:25 -07:00
David Rowe
45281960af Don't display mini tablet if user is away 2018-09-14 20:30:17 +12:00
David Rowe
80aa74600f Fix mini tablet sometimes remaining parented when it shouldn't be 2018-09-14 20:15:08 +12:00
David Rowe
ba56457663 Smooth the transition between expanded mini tablet and tablet proper 2018-09-14 20:14:54 +12:00
David Rowe
f01ebe57ea Trial hiding the UI when it's expanding to become the tablet proper 2018-09-14 18:55:29 +12:00
unknown
f9480c24a5 store search term lower 2018-09-13 20:07:49 -07:00
unknown
ae2005b8c4 Merge branch 'master' of https://github.com/highfidelity/hifi into entityListSearchCase 2018-09-13 19:37:16 -07:00
luiscuenca
fb37e13aae fix hat stand fail 2018-09-13 18:21:22 -07:00
David Back
b65bd6736f also allow search using entity id 2018-09-13 18:20:11 -07:00
Wayne Chen
53582bddcd pushing more changes 2018-09-13 17:26:08 -07:00
Wayne Chen
bf7dd94db7 button was clipped; adding higher res img 2018-09-13 17:25:33 -07:00
Wayne Chen
2b8aebdb6b Revert "Merge branch 'master' into fixGoToButtonInterstitial" 
This reverts commit b4b0c519f3, reversing
changes made to aef3ed3e01.
 2018-09-13 17:21:29 -07:00
Wayne Chen
40451a1fc1 Revert "Revert "Merge branch 'master' into fixGoToButtonInterstitial"" 
This reverts commit c5468fd8e9.
 2018-09-13 17:21:07 -07:00
Wayne Chen
c5468fd8e9 Revert "Merge branch 'master' into fixGoToButtonInterstitial" 
This reverts commit b4b0c519f3, reversing
changes made to 77d5ebf34f.
 2018-09-13 17:18:49 -07:00
Wayne Chen
b4b0c519f3
Merge branch 'master' into fixGoToButtonInterstitial 2018-09-13 17:11:34 -07:00
David Rowe
fe8c237d64 Don't display mini tablet in peripheral vision 2018-09-14 11:22:31 +12:00
David Rowe
c27bb04596 Display mini tablet when it or palm is facing the camera 2018-09-14 11:10:26 +12:00
Wayne Chen
77d5ebf34f
changing button URL - typo 2018-09-13 15:47:25 -07:00
Wayne Chen
db1acb87b8 button was clipped; adding higher res img 2018-09-13 15:38:24 -07:00
David Rowe
bbfb2b1374 Merge branch 'master' into M17428-f 2018-09-14 10:36:49 +12:00
David Back
4bc046187a fix searching case-sensitivity 2018-09-13 15:06:14 -07:00
David Back
34afe7a69a remove fixing search cases (for separate PR) 2018-09-13 15:01:49 -07:00
David Back
56ddafed26 fix deleting scroll-away items, fix searching case sensitivity, comments 2018-09-13 14:56:12 -07:00
luiscuenca
b517808bc2 Fix smaller size avatar capsule and land on detailed mesh 2018-09-12 21:24:19 -07:00
David Rowe
4978f80f43 Don't turn on laser when mini tablet is expanding 2018-09-13 12:27:30 +12:00
David Rowe
0437c50c06 Fix mini tablet not reliably being grabbed 2018-09-13 12:20:00 +12:00
David Rowe
54dd868b3c Rotate mini tablet to keep it "vertical" 2018-09-13 11:54:59 +12:00
David Back
430ad87c20 Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView 2018-09-12 16:17:41 -07:00
David Back
7768e08510 rename func 2018-09-12 16:06:14 -07:00
Zach Fox
5a1d074e2f Goto now uses AppUi; lint 2018-09-12 16:04:37 -07:00
David Back
06504ade88 Merge branch 'master' of https://github.com/highfidelity/hifi into centerScaleCubeHMD 2018-09-12 16:04:22 -07:00
David Back
1b8e9ed906 get controller position from avatar frame 2018-09-12 16:02:43 -07:00
Zach Fox
01073ca18d Lots of changes; marketplaces.js working now 2018-09-12 15:46:17 -07:00
David Back
55a4c55f78 remove unused and rename var 2018-09-12 14:48:27 -07:00
David Back
3da442a8f9 allow highlights in hmd, fix center scale hmd math 2018-09-12 14:44:04 -07:00
John Conklin II
e243792cac
Merge pull request #13623 from wayne-chen/fixGrabWebSurface-case-16192 
MS16192: Fix Near Grabbing After Using Web Entity
 2018-09-12 12:50:44 -07:00
David Back
cf1c1296a7 fix center scale cube in hmd 2018-09-12 11:44:26 -07:00
Wayne Chen
521361293a
moving comment locations inside conditionals 2018-09-12 11:03:00 -07:00
Wayne Chen
acf34dcfdf
one more unused variable 2018-09-12 10:58:05 -07:00
Wayne Chen
8bef0d0de4
removing unused variables 2018-09-12 10:55:40 -07:00
Wayne Chen
a96e78c72d
removing debug 2018-09-12 10:54:38 -07:00
Wayne Chen
b9f0af63e1 changing check for near grabbing modules - fixes grabbing for dynamic 2018-09-12 10:38:21 -07:00
David Back
70d427f852 more fixes for resizing, deleting, selecting etc 2018-09-12 09:43:14 -07:00
Zach Fox
de2548d926 Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi 2018-09-12 09:30:00 -07:00
David Back
e191fe53ba Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView 2018-09-12 08:58:02 -07:00
Zach Fox
6d345e506b Marketplaces.js WIP 2018-09-11 19:42:12 -07:00
Wayne Chen
045ac4cb0d allowing grip button for interrupting web scroll 2018-09-11 17:43:03 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged 2018-09-11 17:17:33 -07:00
David Back
ac04c501cb Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView 2018-09-11 17:13:02 -07:00
David Back
7eb05a3cc8 merge changes, fix various issues 2018-09-11 16:34:21 -07:00
David Rowe
a1c49bd2b6 Hide mini tablet if lasering or grabbing something else 2018-09-12 11:18:26 +12:00
Wayne Chen
b6c5ae2a68 staging changes 2018-09-11 15:23:40 -07:00
David Rowe
de95ee0a18 Merge branch 'master' into M17428-f 2018-09-12 09:49:29 +12:00
Dante Ruiz
b665dbe13e finished requested changes 2018-09-11 14:18:12 -07:00
Ryan Huffman
530fa5aee9
Merge pull request #13865 from dback2/editHandleScaleImprovements 
Edit handle scale improvements
 2018-09-11 12:57:47 -07:00
Zach Fox
ea04ee6d35 Wallet now uses AppUi 2018-09-11 12:37:53 -07:00
luiscuenca
fedea6e84d Comply with review comments 2018-09-11 12:23:25 -07:00
Zach Fox
3dabd392ef HELP app now uses AppUi 2018-09-11 12:21:02 -07:00
Zach Fox
1aaa90675c Snapshot.js now uses AppUi 2018-09-11 12:04:39 -07:00
Wayne Chen
0a145fbe2e Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-09-11 11:47:23 -07:00
Wayne Chen
d9e0352028 removing debug comments 2018-09-11 11:44:32 -07:00
Wayne Chen
7aae536624 adding fix to allow web scroll 2018-09-11 11:41:24 -07:00
David Back
50fed873d1 Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView 2018-09-11 09:52:25 -07:00
luiscuenca
82b662d08e Add pick offset 2018-09-11 09:34:36 -07:00
Ryan Huffman
c7f6bf181b
Merge pull request #13943 from huffman/perf/create-profile-no-listjs 
Improvements to entity list loading times
 2018-09-11 09:33:28 -07:00
luiscuenca
13de22adb3 Fix radius scale 2018-09-11 07:22:59 -07:00
Ryan Huffman
4b8f5ea6b9 Fix syntax and duplicate event handlers in entityList.js 2018-09-10 16:44:13 -07:00
unknown
1ad3a09984 CR changes 2018-09-10 16:09:21 -07:00
unknown
17c3163264 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleScaleImprovements 2018-09-10 15:31:58 -07:00
Wayne Chen
1aa8b7c81b Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-09-10 15:07:12 -07:00
John Conklin II
5a1485a4f5
Merge pull request #13968 from thoys/fix/create/reloadCrash 
MS18269: Fix Reloading Scripts with Create open crashes system
 2018-09-10 15:01:43 -07:00
David Rowe
992b9f847c Reduce near grab distance of tablet so that stylus works on tablet 2018-09-11 09:58:19 +12:00
David Rowe
16a94f827d Fix tablet highlight not working with stylus 2018-09-11 09:51:28 +12:00
John Conklin II
29c80fc075
Merge pull request #13959 from thoys/bug/create/createPosNewEntities 
MS17841: CreateApp - Adjust default position of new entities
 2018-09-10 14:45:56 -07:00
Ryan Huffman
5aa5552727 Fix PROFILE not forwarding calls when disabled 2018-09-10 14:07:25 -07:00
Ryan Huffman
0fadfd2f4c Remove list.js in entityList.html 2018-09-10 12:14:07 -07:00
Thijs Wenker
2000954ad2 Temporary fix for reload crash MS18269 2018-09-10 20:13:06 +02:00
luiscuenca
a9f676354b Only invisible pointers and scale fix 2018-09-10 08:54:53 -07:00
David Rowe
1faef9db8c Fix tablet ending upside down if it expands into other grabbing hand 2018-09-09 12:07:33 +12:00
David Rowe
baf1e80445 Code tidying 2018-09-09 11:37:05 +12:00
David Rowe
5fd3f563d6 Move mini tablet down in the palm a little. 2018-09-09 10:55:05 +12:00
David Rowe
66f75e856e Fix goto and expand displaying as hovered when redisplay mini tablet 2018-09-08 16:41:36 +12:00
David Rowe
5fcb69c724 Remove extraneous CSS 2018-09-08 16:13:36 +12:00
David Rowe
7dba2e6a2e Merge branch 'master' into M17428-f 2018-09-08 12:45:11 +12:00
David Rowe
8eeed772eb Update button layout 2018-09-08 12:40:36 +12:00
David Rowe
c0a153482a Update mini tablet model 2018-09-08 11:55:47 +12:00
luiscuenca
d09391faa5 Fix invisible error 2018-09-07 12:17:40 -07:00
Ryan Huffman
3cc90d3c80 Disable profiling in entityList.js 2018-09-07 12:07:19 -07:00
Ryan Huffman
9b9785d250 Fix entity list not handling deleted entities 2018-09-07 12:04:14 -07:00
Thijs Wenker
dd6801219b Create entities from avatar a bit lower to be able to transform them away from the user easier 2018-09-07 19:54:26 +02:00
Wayne Chen
fc4c728181 Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-09-07 10:11:34 -07:00
David Rowe
f206a8f158 Display mini tablet on hand being gazed at if there is a choice 2018-09-07 19:43:51 +12:00
David Rowe
12454d7ec7 Increase mini tablet grow/shrink time 2018-09-07 16:48:36 +12:00
David Rowe
f3cbca6cee Change "bubble" button to "goto" 2018-09-07 16:43:21 +12:00
David Rowe
d0e73b00f7 Restructure mini tablet code 2018-09-07 15:41:30 +12:00
Dante Ruiz
45a99a9244 fixing some bugs 2018-09-06 17:55:10 -07:00
Dante Ruiz
2f9119529a editing the interstitial page 2018-09-06 17:06:17 -07:00
David Back
b82f6d0bad lines/spacing 2018-09-06 16:54:58 -07:00
David Back
14a3eb4c97 lines/spacing 2018-09-06 16:52:58 -07:00
David Back
0a67c49ef9 remove separate new entity list with option, fix row clicking 2018-09-06 16:50:36 -07:00
David Back
3d75d4726a scale invertly once passing minimum 2018-09-06 16:04:59 -07:00
Dante Ruiz
98dafa3b67 fix overlayParentID 2018-09-06 14:31:49 -07:00
David Back
6ac38190c1 tweak scaling multiple 2018-09-06 12:23:38 -07:00
David Back
92ff522862 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleScaleImprovements 2018-09-06 11:54:05 -07:00
Dante Ruiz
ec2d89fd25 fixing toolbar disappering 2018-09-06 11:16:58 -07:00
Roxanne Skelly
8a20969103 Fix typo 2018-09-06 10:38:10 -07:00
Dante Ruiz
200f6d540a Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-09-06 09:59:51 -07:00
luiscuenca
01424b8179 Head Collision Pick added 2018-09-06 09:39:33 -07:00
David Back
82ed57e41f triple list structure, added columns, sorting 2018-09-05 17:59:03 -07:00
luiscuenca
abb632afda Update capsule when scale/load and teleport without safe landing 2018-09-05 16:51:34 -07:00
Roxanne Skelly
bb8d9c5cf0 For stories, base the notification popups off of the action_string instead of a hard-coded value. 2018-09-05 16:50:08 -07:00
Ryan Huffman
335f66d165 Add filtering support to entity list 2018-09-05 14:30:48 -07:00
Ryan Huffman
739530cb85 Limit Entity List to only getting the properties it needs 2018-09-05 14:30:36 -07:00
Ryan Huffman
a9a5bf1e97 Replace entity list UI with custom, brute-force solution 2018-09-05 14:30:19 -07:00
Ryan Huffman
f2cc2f1485 Update entity list UI to be updated in a single batch 2018-09-05 14:30:19 -07:00
Ryan Huffman
f6ac755bae Add profiling to edit.js fof the entity list 2018-09-05 14:30:19 -07:00
Ryan Huffman
133ac0662a Move entity list qml to scripts dir 2018-09-05 14:30:19 -07:00
David Rowe
f23d93add3 Fix grabbing tablet with grip not working 2018-09-06 09:17:00 +12:00
David Rowe
daae3f50c8 Increase tablet highlight outline width 2018-09-06 09:09:30 +12:00
David Back
40d4f581f5 working scrolling 2018-09-05 13:16:23 -07:00
unknown
f941026a62 new entity list view wip 2018-09-04 19:11:09 -07:00
luiscuenca
99e6e3d112 Collision Pick added to teleport.js 2018-09-04 17:18:26 -07:00
David Rowe
c41d74621e Merge branch 'master' into M17217-b 
# Conflicts:
#	interface/src/raypick/PathPointer.cpp
 2018-08-31 14:26:24 +12:00
David Rowe
9203bbc5d8 Don't highlight tablet when it is grabbed 2018-08-31 11:02:36 +12:00
David Rowe
f84f3b20cd Disable near and far lasers when tablet is grabbable 2018-08-31 10:25:12 +12:00
David Rowe
ecb58a9629 Merge branch 'master' into M17853 2018-08-31 08:36:54 +12:00
Dante Ruiz
93b0f15116 addressing some feedback 2018-08-30 13:22:17 -07:00
John Conklin II
f5ebdfa233
Merge pull request #13905 from zfox23/fixPr13870 
Fixup PR13870: Make the feature work in Master
 2018-08-30 11:08:23 -07:00
Dante Ruiz
8c77820e30 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-30 09:45:41 -07:00
David Rowe
73253977fe Merge branch 'M17428-c' into M17428-d 
# Conflicts:
#	scripts/system/miniTablet.js
 2018-08-30 16:21:31 +12:00
David Rowe
ec20fb7edb Reorient and reposition mini tablet 2018-08-30 16:16:49 +12:00
David Rowe
a01a5e3b39 Merge branch 'M17428-c' into M17428-d 2018-08-30 13:44:02 +12:00
David Rowe
a5c3450bfc Tweak mini tablet UI layout 2018-08-30 13:43:31 +12:00
Zach Fox
b8cd5dd8b9 Fixup PR13870: Make the feature work in Master 2018-08-29 16:58:19 -07:00
John Conklin II
7298cb4654
Merge pull request #13888 from dback2/editControllerMapping 
Edit mode controller mapping using new platform state variables
 2018-08-29 16:06:47 -07:00
John Conklin II
47ce8be526
Merge pull request #13854 from wayne-chen/fixTabletButton-case-16847 
MS16847: Tablet button doesn't load in HMD mode
 2018-08-29 13:20:04 -07:00
David Back
96d2ba660c Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping 2018-08-29 12:05:51 -07:00
David Back
0e53fa3f8b only focus with selection 2018-08-29 12:05:46 -07:00
David Back
dcf2074d7e remove [ camera key, allow F to enter camera without selection 2018-08-29 11:56:37 -07:00
David Rowe
c6d0ad39c0 Merge branch 'M17428-c' into M17428-d 2018-08-29 22:13:43 +12:00
David Rowe
15fcafa2f5 Use SVGs for buttons 2018-08-29 22:13:09 +12:00
David Rowe
b338c9f6fa Updated tiny table model and layout 2018-08-29 22:10:24 +12:00
David Rowe
91c1e1b276 Different expansion points and delta rotations if grabbed by other hand 2018-08-29 09:59:04 +12:00
David Rowe
f5c49026ab Expand tablet after it's been released from grab by other hand 2018-08-29 09:49:42 +12:00
David Rowe
49f5d5f2b7 Display mini tablet rotated in palm 2018-08-29 08:55:46 +12:00
David Rowe
e5c733e7f2 Merge branch 'master' into M17428-c 2018-08-29 08:20:00 +12:00
David Back
511478a563 use not Mac instead of Windows 2018-08-27 18:11:19 -07:00
David Back
f81fe6b29f add more inputs to controller mapping 2018-08-27 16:35:36 -07:00
Seth Alves
52bbb4d2ab fix ray-pick results on entities with non-default registration point. clean up grab scripts to correctly use this fix. 2018-08-27 16:21:01 -07:00
David Rowe
4830ba24ae Highlight tablet when it is near-grabbable 2018-08-28 09:53:54 +12:00
David Back
b6edb2c9d6 platform states, edit controller mapping, separate mac/win delete 2018-08-27 14:53:13 -07:00
danteruiz
e4293d9ad5 fixing some entity visual problems 2018-08-26 21:50:01 -07:00
Dante Ruiz
af19849a75 fixing merge conflict 2018-08-24 15:48:42 -07:00
Dante Ruiz
3796675123 script update and visuallyReady entities 2018-08-24 15:46:39 -07:00
John Conklin II
fcdbc6c6d2
Merge pull request #13778 from SamGondelman/bloom 
Enable bloom in zone properties
 2018-08-24 14:46:31 -07:00
David Back
30c6975198 maintain stretch cube position vs mouse when stretching 2018-08-24 11:53:03 -07:00
David Back
5e4e255e94 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleScaleImprovements 2018-08-24 10:15:17 -07:00
Howard Stearns
9a472fa388
Merge pull request #13870 from zfox23/wallet_autologout 
Implement Wallet Security feature - Auto Logout checkbox
 2018-08-23 18:04:38 -07:00
Zach Fox
dddb2141f0 Implement Wallet Security feature - Auto Logout checkbox 2018-08-23 15:45:29 -07:00
Zach Fox
e3d03cd321 Fix MS17738: Fix a case where the BLAST icon didn't show up in Snapshot Review 2018-08-23 13:16:02 -07:00
David Rowe
b6e4a22db7 Rotate the mini tablet as it expands 2018-08-23 13:06:28 +12:00
David Back
8eddb36c82 resize scale cube 2018-08-22 17:29:40 -07:00
David Back
8c422cb0eb change corner cubes to center cube, replace spheres with cubes 2018-08-22 16:54:59 -07:00
Dante Ruiz
bb83a2f620 interstitial script ending cleanup fixes 2018-08-22 16:48:10 -07:00
David Rowe
335eb98bb7 Increase size of the "..." button 2018-08-23 11:14:21 +12:00
David Rowe
6dcce0e953 Revert display test to depending just on hand to camera angle for now 2018-08-23 10:59:23 +12:00
David Rowe
883479d654 Merge branch 'master' into M17428-c 2018-08-23 10:43:44 +12:00
Dante Ruiz
f5441b2721 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-22 15:28:42 -07:00
Dante Ruiz
78458d62de revert some changes and fix toolbar issue 2018-08-22 15:20:56 -07:00
Dante Ruiz
535fdf32cf saving changes 2018-08-22 13:13:00 -07:00
John Conklin II
32562511e8
Merge pull request #13782 from ElderOrb/FB17184 
Add Support for Managing Avatar Entities to the Avatar App
 2018-08-22 10:20:04 -07:00
Dante Ruiz
26a30edec9 trying to fix loading bar 2018-08-21 18:27:21 -07:00
Dante Ruiz
71e8ccd190 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-21 16:20:16 -07:00
Wayne Chen
4e9a544618 redoing newline 2018-08-21 16:01:24 -07:00
Wayne Chen
bb176eb228 trailing debug statements 2018-08-21 16:00:01 -07:00
Wayne Chen
7360629d31 modifying variable naming to fit convention 2018-08-21 14:13:55 -07:00
Wayne Chen
5b4eb92281 adding fix 2018-08-21 14:04:29 -07:00
John Conklin II
1b4314ae45
Merge pull request #13846 from ctrlaltdavid/M17652-b 
Reduce strength of teleport parabola
 2018-08-21 11:32:40 -07:00
Wayne Chen
222391532a Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-08-21 11:18:17 -07:00
Wayne Chen
bfb9b67968 more debug statements 2018-08-21 11:17:33 -07:00
Dante Ruiz
db3d3d3d93 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-21 09:56:59 -07:00
David Rowe
4b12e18c27 Merge branch 'master' into M17428-c 2018-08-21 16:52:30 +12:00
David Rowe
536db64123 Mitigate against UI overlay possibly getting rotated 2018-08-21 16:48:35 +12:00
David Rowe
e25b2f6e0f Support stylus input on the mini tablet 2018-08-21 16:47:40 +12:00
David Rowe
f6a607efcc Expand / shrink mini-tablet when showing / hiding 2018-08-21 15:43:37 +12:00
David Rowe
5e7f68d4b7 Use a smaller near grab radius for tablet and mini-tablet 2018-08-21 14:00:20 +12:00
David Rowe
e24d920bdd Tune teleport and play area 2018-08-21 11:45:01 +12:00
David Rowe
0a82f8adc9 Merge branch 'master' into M17217-b 2018-08-21 11:25:58 +12:00
David Rowe
67eb03ba7d Reduce strength of teleport parabola 2018-08-21 11:18:00 +12:00
David Rowe
69e5eb9b1c Move tablet towards fingertips as it expands 2018-08-21 10:46:48 +12:00
David Rowe
dc86230e40 Make "..." expand tablet per display hand rather than centered 2018-08-21 10:33:13 +12:00
David Rowe
f4a8dc49e9 Add button sounds 2018-08-21 10:28:23 +12:00
David Rowe
4268297769 Mini tablet button actions 2018-08-21 09:17:53 +12:00
Seth Alves
c876cda89d
Merge pull request #13826 from ctrlaltdavid/M17615 
Disable Vive teleport button if transitioning from direction button
 2018-08-20 14:05:45 -07:00
David Rowe
6791d3f1b6 Mini tablet button icons and states 2018-08-21 08:36:04 +12:00
Dante Ruiz
2261ad2bcb clean up the interstitial page 2018-08-20 11:14:48 -07:00
Ryan Huffman
ead0126365
Merge pull request #13815 from thoys/fix/create/createZeroRotationEntities 
MS17562: CreateApp - newly created Entity rotation should be zero
 2018-08-20 09:07:38 -07:00
David Rowe
4e23caf46d Fix tablet proper not being grabbed once mini tablet has expanded 2018-08-20 17:57:59 +12:00
David Rowe
ff54516790 Maintain overlays ready for display in HMD mode 2018-08-20 17:46:07 +12:00
David Rowe
aca343330f Base UI elements 2018-08-20 16:00:02 +12:00
David Rowe
94041291d5 Add web3d overlay for UI surface 2018-08-20 10:58:01 +12:00
Alexander Ivash
9f92ff5de9 fix for duplicating wearables on saving 
note: the issue was caused by newly-introduced code converting between attachments & entities
fix removes attachments-related code because attachments are deprecated and converted into entities on the fly
 2018-08-18 16:38:35 +03:00
David Rowe
fce45339a2 Shorter teleport parabola 2018-08-18 12:39:34 +12:00
David Rowe
26576fa760 Fix Vive left/right buttons not disabling teleport 2018-08-18 09:34:16 +12:00
David Rowe
2c389af751 Display mini tablet only if camera is also looking at the hand 2018-08-17 16:18:22 +12:00
David Rowe
846f38584f Merge branch 'master' into M17428 2018-08-17 15:01:35 +12:00
David Rowe
7e46a99400 Merge branch 'master' into M17217-b 2018-08-17 10:35:52 +12:00
David Rowe
5328b48acc Make Vive snap turn buttons lock teleport, also 2018-08-17 09:09:11 +12:00
David Rowe
bf733ded0f Handle Vive controller not being available at start-up 2018-08-17 09:08:28 +12:00
John Conklin II
96fd4704ac
Merge pull request #13829 from huffman/fix/edit-zoom-stuck 
Fix edit orbit camera getting stuck zooming
 2018-08-16 08:21:31 -07:00
David Rowe
40f7914aae Expand from lower left/right of proxy tablet 2018-08-16 19:11:03 +12:00
David Rowe
7a1a86f182 Expand proxy tablet immediately it is grabbed; grab with either hand 2018-08-16 16:20:28 +12:00
David Rowe
cb9b7f567a Move update functions into state machine 2018-08-16 16:08:36 +12:00
David Rowe
8d1b947bbd Fix variable names 2018-08-16 13:35:36 +12:00
elderorb
ea22fdb400
Merge branch 'master' into FB17184 2018-08-16 02:08:47 +03:00
David Rowe
a86fdeafc0 Merge branch 'master' into M17248-a 2018-08-16 10:38:30 +12:00
Ryan Huffman
2f833f16d8 Force entity list tool to refresh when opened 2018-08-15 14:19:20 -07:00
Ryan Huffman
24af22a52f Fix edit orbit camera getting stuck zooming 2018-08-15 13:56:44 -07:00
Seth Alves
83718ca06d
Merge pull request #13746 from alexiamandeville/emoteIcon 
updating emote app icon
 2018-08-15 08:29:48 -07:00
David Rowe
2034162c76 Disable Vive teleport button if transitioning from direction button 2018-08-15 21:31:53 +12:00
Seth Alves
3623590e90
Merge pull request #13784 from sethalves/far-point-joints 
Far point joints
 2018-08-14 15:40:07 -07:00
John Conklin II
8c5344ad1a
Merge pull request #13781 from thoys/fix/localAngularVelocityZeroesOut 
MS17380: Create App fix for angularVelocity zeroing out on duplication or undo
 2018-08-14 11:37:33 -07:00
Seth Alves
527b27da96 pseudo-joints for far-grab positions 2018-08-14 08:55:20 -07:00
Seth Alves
54fa7dd0b6
Merge pull request #13817 from sethalves/fix-desktop-handshake 
fix desktop press-x handshake
 2018-08-14 08:42:10 -07:00
John Conklin II
73ef2ff09c
Merge pull request #13804 from thoys/fix/create/cantMoveFocusCameraOutPastLowLimit 
MS17291: Create-app increase focus distance limit
 2018-08-13 14:58:17 -07:00
Seth Alves
4fa0c96046 fix desktop press-x handshake 2018-08-13 11:57:48 -07:00
Thijs Wenker
221dfb8979 typo fix 2018-08-11 05:46:48 +02:00
Thijs Wenker
a20be5b50d remove rotation for newly created entities 2018-08-11 02:28:01 +02:00
Thijs Wenker
f26188d5b8 added comment for limit choice 2018-08-11 01:54:13 +02:00
Dante Ruiz
75cc1c62c0 mostly done interstitial page 2018-08-10 16:53:34 -07:00
Thijs Wenker
876079bb81 deactivate Create App when desktop windows are closed 2018-08-11 00:41:50 +02:00
David Rowe
2a177e04e1 Misc. tweaks 2018-08-11 10:11:56 +12:00
Ryan Huffman
c0ac76bf4a
Merge pull request #13797 from dback2/rotationRingSize 
Edit handle rotation ring size
 2018-08-10 13:53:10 -07:00
David Rowe
b4ec1f4310 Reorient tablet proxy 2018-08-11 06:18:26 +12:00
David Back
1d0da4042a
Merge pull request #13771 from dback2/entityListCtrlReselection 
Reselecting same entity in list will unselect it
 2018-08-10 10:41:57 -07:00
David Rowe
7a7fca3982 Update tiny tablet model 2018-08-11 05:34:01 +12:00
Dante Ruiz
46297c6b22 interstitial page 2018-08-10 10:20:39 -07:00
John Conklin II
de0cdf6d8d
Merge pull request #13793 from wayne-chen/fixWebTabletJSBug 
Fixing web tablet JavaScript error
 2018-08-10 09:31:17 -07:00
Alexander Ivash
ce6c8c72f5 ensure selection of newly-added wearable always happens after pushing updated wearables list to UI 2018-08-10 19:09:47 +03:00
Alexander Ivash
90fb0d7be6 add possibility to add wearable from external url 2018-08-10 17:59:11 +03:00
Thijs Wenker
925cfc9b23 Set a max focus distance value of 14km to not lose the edit handles by far-clipping 2018-08-10 16:45:27 +02:00
Alexander Ivash
0a28361dc8 treat ModelEntityItem-s with relayParentJoints as wearables 2018-08-10 12:58:45 +03:00
David Rowe
c89955b416 Use FBX for tablet proxy 2018-08-10 13:53:53 +12:00
David Rowe
3732de51a3 Tidying 2018-08-10 13:25:41 +12:00
David Rowe
bc456ae5c8 Don't show proxy if in toolbar mode 2018-08-10 13:18:21 +12:00
David Rowe
557f18f370 Don't show proxy if tablet has been opened by other means 2018-08-10 13:10:24 +12:00
David Rowe
b240a4248d Size and position according to avatar scale 2018-08-10 12:51:06 +12:00
David Rowe
0aa42d70d6 Don't let the tablet proxy hand do the initial grab 2018-08-10 12:37:21 +12:00
John Conklin II
6c647c8185
Merge pull request #13768 from thoys/fix/create/triggerable-reset 
MS17413 Triggerable value does not reset on entity deselect
 2018-08-09 17:13:34 -07:00
David Rowe
047ea0deaf Remove the post-teleport spot if a new teleport is started 2018-08-10 11:31:50 +12:00
Dante Ruiz
353121be7d making some changes 2018-08-09 16:29:37 -07:00
David Rowe
a08bcd325d Merge branch 'master' into M17217-b 
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
 2018-08-10 11:25:39 +12:00
Alexia Mandeville
38973f0840 Adding icon states to emote app, active state 2018-08-09 16:00:36 -07:00
John Conklin II
6447bcab5b
Merge pull request #13765 from dback2/serverScriptStatus 
Fix server script status
 2018-08-09 14:51:17 -07:00
John Conklin II
f31776516b
Merge pull request #13791 from dback2/editHandlesAlpha 
Alpha 1 for edit handles
 2018-08-09 14:50:43 -07:00
David Rowe
5bada416bb Show/hide/expand tablet proxy 2018-08-10 09:41:25 +12:00
David Back
cc953ab691 Merge branch 'master' of https://github.com/highfidelity/hifi into rotationRingSize 2018-08-09 13:36:13 -07:00
David Back
e36e9aa68f tweak rotation ring size 2018-08-09 13:35:55 -07:00
John Conklin II
6481aea2f4
Merge pull request #13715 from SamGondelman/parabolic 
Enable parabolic teleport
 2018-08-09 13:12:17 -07:00
Dante Ruiz
9a8ebdd021
Merge pull request #13739 from dback2/cloneChildrenFix 
Fix cloning a parented entity
 2018-08-09 13:05:28 -07:00
John Conklin II
f4f0c5fcad
Merge pull request #13767 from ctrlaltdavid/M15772 
Fix entity stay highlighted after hand leaves when far grabbing another
 2018-08-09 12:53:41 -07:00
Wayne Chen
2a6ff90a2c fixing web tablet error 2018-08-09 11:30:10 -07:00
David Back
a6d944e034 use alpha 1 for edit handles 2018-08-09 10:32:34 -07:00
John Conklin II
34697b6b07
Merge pull request #13770 from huffman/fix/edit-duplicate-fix 
Fix duplicating multiple entities causing infinite looping
 2018-08-09 09:07:37 -07:00
Dante Ruiz
faa5411757 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-09 08:42:14 -07:00
David Rowe
521797b32f Script and state machine basics 2018-08-09 20:44:01 +12:00
Dante Ruiz
0fed48bd0e improving interstitial page 2018-08-08 18:15:27 -07:00
Anthony Thibault
90b0bd333f
Merge pull request #13774 from danteruiz/revert-tablet-material-entity 
Revert to using overlays instead of material entities for button highlighting.
 2018-08-08 17:33:26 -07:00
David Rowe
71341cf700 Display teleport target after teleport 2018-08-09 10:51:12 +12:00
SamGondelman
a0c3c09b05 Merge remote-tracking branch 'upstream/master' into bloom 2018-08-08 14:44:02 -07:00
David Back
a04ffd969e deselect when reselecting same entity, fix indents 2018-08-08 13:32:38 -07:00
Ryan Huffman
544a6504f2
Merge pull request #13760 from ctrlaltdavid/M16932 
Render Touch controllers at physical hands's locations
 2018-08-08 13:11:21 -07:00
David Back
adc2c9c6fc Merge branch 'master' of https://github.com/highfidelity/hifi into entityListCtrlReselection 2018-08-08 12:41:54 -07:00
SamGondelman
2959a406d7 working on enabling bloom 2018-08-07 21:52:05 -07:00
David Rowe
f7c17df6cc Float play area and sensors above the ground 2018-08-08 16:32:08 +12:00
Dante Ruiz
a9fd034f09 switching to location api 2018-08-07 16:02:54 -07:00
David Rowe
fd977a758b Update teleport destination model 2018-08-08 10:49:34 +12:00
David Rowe
96767c1103 Merge branch 'master' into M17217-b 
# Conflicts:
#	plugins/openvr/src/OpenVrDisplayPlugin.cpp
 2018-08-08 10:43:58 +12:00
David Rowe
f65b1a26ae Merge remote-tracking branch 'SamGondelman/parabolic2' into M17217-b 2018-08-08 10:06:43 +12:00
David Back
3c5c5d8552
Merge pull request #13750 from dback2/editLogSpamFix 
Fix edit log spam with -1 hand
 2018-08-07 13:51:39 -07:00
David Rowe
a7170a5892 Fix typo 2018-08-08 08:49:29 +12:00
Dante Ruiz
269afb9a49 remove tablet material entities code remove create 2018-08-07 11:19:22 -07:00
Dante Ruiz
8c5eefcc95 some file and code cleanup 2018-08-07 10:58:45 -07:00
Dante Ruiz
d78c571df6 revert to use overlays instead of entities for tablet highlighting 2018-08-07 10:56:53 -07:00
Thijs Wenker
9c96a10f6c Fix for angularVelocity zeroing out on duplication or undo 2018-08-07 19:35:49 +02:00
David Back
d88615219c CR changes 2018-08-07 10:19:48 -07:00
David Back
174519e86e fix reselecting same entity in list 2018-08-07 09:56:51 -07:00
Ryan Huffman
61fdce9c11 Fix duplicating multiple entities causing infinite looping 2018-08-07 09:52:14 -07:00
Thijs Wenker
95c32c8e45 fix reset triggerable checkbox 2018-08-07 17:23:49 +02:00
David Rowe
c9c23b8db3 Fix entity stay highlighted after hand leaves when far grabbing another 2018-08-07 15:34:17 +12:00
David Back
f9e25d36e7 use wrapper emitScriptEvent, change to Fetching 2018-08-06 17:52:27 -07:00
Dante Ruiz
6a4a56cee3 imporving the interstitial page script 2018-08-06 17:42:21 -07:00
David Back
e5abd9d57d fix server script status event, use [ Getting status ] 2018-08-06 17:03:32 -07:00
David Back
112327a3c1
Merge pull request #13735 from dback2/entityCameraKeyFix 
Use key codes for entity camera keys
 2018-08-06 14:07:48 -07:00
David Rowe
83ed572a33 Render Touch controllers at physical hands's locations 2018-08-04 19:27:44 +12:00
David Rowe
e008f057eb Fade play area after teleport 2018-08-04 18:19:59 +12:00
David Rowe
c0dc70c076 Parent play area to teleport target unless underneath avatar 2018-08-04 17:26:18 +12:00
David Rowe
ed5e77df37 Scale-in teleport target from zero size 2018-08-04 15:11:53 +12:00
SamGondelman
f1ca0411c0 drawInFront parabolas 2018-08-03 16:43:13 -07:00
David Rowe
653a281482 Use new teleport destination FBX 2018-08-04 10:11:22 +12:00
David Rowe
11b85e30db Merge branch 'master' into M17217-a 2018-08-04 09:44:39 +12:00
David Rowe
1cd3869b2c Reinstate FBX file that original version or parabolic branch deleted 2018-08-04 09:42:52 +12:00
David Back
0565e0400c fix edit log spam with -1 hand 2018-08-03 11:08:56 -07:00
Dante Ruiz
a2717e2efa editing interstitialPage.js 2018-08-03 10:47:20 -07:00
Dante Ruiz
683b42e35b Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-03 09:59:35 -07:00
Dante Ruiz
b9cfbfb3be adding interstitial page file to default sctipts 2018-08-03 09:59:21 -07:00
David Rowe
5be945715f Include the teleporter target in the occlusion 2018-08-03 08:22:36 +12:00
David Rowe
29dbc01361 Add alternative code to position Oculus sensors at correct elevation 2018-08-03 08:12:44 +12:00
David Rowe
57da0fef63 Show occluded parts of the play area overlays 2018-08-02 15:21:56 +12:00
David Rowe
eed0159b5e Scale-in play area from zero size 2018-08-02 14:45:09 +12:00
David Rowe
07049b9481 Update and tidy play area and Oculus sensor models 2018-08-02 11:08:21 +12:00
David Back
0b9e520b53 fix grab cloning parented entitiy 2018-08-01 16:00:25 -07:00
John Conklin II
f02e91806c
Merge pull request #13686 from huffman/fix/undo-create-entity 
Fix added entities not being undoable in Create
 2018-08-01 13:11:17 -07:00
David Back
cdbf75666f new line 2018-08-01 12:46:49 -07:00
David Back
f946bb73ef remove constants 2018-08-01 12:46:17 -07:00
David Back
97e45643b0 spacing 2018-08-01 12:44:40 -07:00
David Back
ca3151ae39 Merge branch 'master' of https://github.com/highfidelity/hifi into entityCameraKeyFix 2018-08-01 12:43:04 -07:00
David Back
3e9e00f1d6 use key codes for entity camera keys 2018-08-01 12:42:50 -07:00
Thijs Wenker
c562a6945d
Merge pull request #13671 from huffman/fix/create-copy-follows-user 
Fix duplication not working as expected on grabbed entities
 2018-08-01 19:25:33 +02:00
SamGondelman
e11030bbc3 mukul's changes, enable parabolic teleport 2018-08-01 09:46:17 -07:00
Ryan Huffman
6369cee0d1 Fix added entities not being undoable in Create 2018-08-01 09:40:29 -07:00
David Rowe
981b6fc4c9 Display play area and sensor about teleport target 2018-08-01 17:18:38 +12:00
David Back
e8068fea0a block selecting overlays with other hand 2018-07-31 17:18:35 -07:00
David Rowe
cf12124b34 Merge remote-tracking branch 'SamGondelman/parabolic' into M17217-a 2018-08-01 10:14:15 +12:00
Ryan Huffman
bbdc7ba380 Fix Uuid null comparison and dangling comma in Create tool 2018-07-31 13:57:27 -07:00
David Back
ad9ec26781 print 2018-07-31 11:53:17 -07:00
David Back
7bf7663f09 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues 2018-07-31 11:51:26 -07:00
David Back
4a722a62f7 use click handler only, remove triggerClicked 2018-07-31 11:51:16 -07:00
Ryan Huffman
431cbf2694
Merge pull request #13699 from thoys/fix/create/triggerable 
MS16809: handle both triggerable and wantsTrigger in CreateApp
 2018-07-31 10:34:31 -07:00
John Conklin II
8e277758ad
Merge pull request #13700 from danteruiz/fix-grabbing-problem 
Impove the way we checkForChildTooFarAway in nearParentGrabEntity.js
 2018-07-31 09:46:57 -07:00
David Back
03f0116b79 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues 2018-07-31 09:28:14 -07:00
John Conklin II
bd2ab38bfe
Merge pull request #13701 from ElderOrb/FB16702 
FB16702 - Avatar App does not save Animation JSON Override URL
 2018-07-30 14:51:32 -07:00
John Conklin II
200292c18e
Merge pull request #13675 from howard-stearns/forget-you 
pal refresh fixes
 2018-07-30 14:38:24 -07:00
David Back
b420ef8cf2 fix trigger clicks on vive 2018-07-30 13:21:09 -07:00
David Back
bec54cc182 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues 2018-07-30 12:26:48 -07:00
SamGondelman
19cf2b0a29 mukul's changes, enable parabolic teleport 2018-07-30 11:28:59 -07:00
Sam Gondelman
8201997a16
Merge pull request #13660 from SamGondelman/parabolic 
Parabolic Picking + Pointers
 2018-07-30 10:49:02 -07:00
Thijs Wenker
d486a0721d
Merge pull request #13698 from dback2/resetPropertiesNoSelection 
Reset entity property fields when no selection
 2018-07-30 19:37:12 +02:00
Dante Ruiz
0f46001f9a remove redundent variable 2018-07-30 10:29:53 -07:00
Dante Ruiz
4caf613269 making requested changes 2018-07-30 10:19:27 -07:00
David Back
398c530214 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues 2018-07-30 10:18:19 -07:00
Wayne Chen
c8845e1a23 Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-07-28 09:42:12 -07:00
Dante Ruiz
cf6850de48 better stuff 2018-07-27 17:53:21 -07:00
Dante Ruiz
887a416656 Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem 2018-07-27 17:50:12 -07:00
Dante Ruiz
6320401308 somewhat better distance from bounding box 2018-07-27 17:49:49 -07:00
SamGondelman
1ef54b2fe6 back to ray teleport 2018-07-27 14:58:56 -07:00
John Conklin II
fc88165e23
Merge pull request #13696 from SamGondelman/particleRot 
Particles don't spin with head roll, new spin + rotateWithEntity properties
 2018-07-27 14:54:48 -07:00
Thijs Wenker
9dce1b64b6
Merge pull request #13695 from huffman/fix/create-focus-on-create 
Fix edit.js not being able to delete after creating entity
 2018-07-27 22:43:34 +02:00
Ryan Huffman
103f9e04fa Fix duplication not working as expected on grabbed entities 2018-07-27 13:32:12 -07:00
Dante Ruiz
30b4815bf9 Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem 2018-07-27 13:13:10 -07:00
David Rowe
3bfdd3ff58 Maintain virtual and real world orientations when teleport 2018-07-27 15:18:40 +12:00
David Back
cd842afc1c prevent both hands triggering same time, allow one to trigger after other 2018-07-26 17:52:25 -07:00
David Back
dcdf734114 remove unneeded 2018-07-26 16:43:07 -07:00
David Back
82e5d6ad29 use triggerClicks from controllers for edit handles 2018-07-26 16:38:25 -07:00
Alexander Ivash
29f7cab7df FB16702 - Avatar App does not save Animation JSON Override URL 
note: PR also changes logic of 'hint' - previously it showed hard-coded senseless text, now - current value of 'animation URL'
 2018-07-27 02:08:44 +03:00
Dante Ruiz
74bb2301b0 minimize diff 2018-07-26 16:05:56 -07:00
Dante Ruiz
31d31af941 minimize diff 2018-07-26 16:05:18 -07:00
David Back
ff6ed971d8 comments, re-org, submesh number 2018-07-26 15:40:27 -07:00
Dante Ruiz
02232daa58 Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem 2018-07-26 15:26:24 -07:00
Dante Ruiz
6edd109dfe revert back to the old way we checkForChildTooFarAway 2018-07-26 15:23:54 -07:00
SamGondelman
74b3143bc3 remove scaling from teleport script 2018-07-26 12:23:14 -07:00
howard-stearns
699d1647ca typo, and more conservative item limit 2018-07-26 12:01:56 -07:00
howard-stearns
9b61e8c4ad Merge branch 'master' of github.com:highfidelity/hifi into forget-you 2018-07-26 11:50:15 -07:00
SamGondelman
1c1b68ee66 emitterShouldTrail fix, review comments, rotateWithEntity 2018-07-26 11:41:16 -07:00
Thijs Wenker
6e23caca0d handle both wantsTrigger and triggerable in CreateApp 2018-07-26 20:25:42 +02:00
David Back
cb8e9f218b reset all property fields when no selection 2018-07-26 11:23:28 -07:00
Zach Fox
cc921ed9c4
Merge pull request #13685 from zfox23/MS16820_rateLimitPolaroids 
Fix MS16820: Rate limit Snapshot Polaroids
 2018-07-25 15:45:51 -07:00
SamGondelman
9b41cb5554 improve model picking performance, scale parabola v/a with avatar, improve followNormal behavior, turn off followNormal on teleport, remove 1 m no teleport spot 2018-07-25 15:19:25 -07:00
Ryan Huffman
0e0966004c Fix edit.js not being able to delete after creating entity 
This fix puts focus back on the main window when creating an entity so that the user can use shortcuts like 'f' and 'delete'
 2018-07-25 14:52:56 -07:00
Sam Gondelman
2aeef2e016
min spinSpread is 0 2018-07-25 09:40:52 -07:00
Sam Gondelman
b4cc9c8004
typo 2018-07-25 09:36:43 -07:00
SamGondelman
4750611af9 particles don't spin with head roll, add particle spin properties, negative emitSpeed 2018-07-24 23:47:58 -07:00
Zach Fox
04754d0dab Fix MS16820: Rate limit Snapshot Polaroids 2018-07-24 15:28:37 -07:00
Alexander Ivash
6db46e84ff FB17036 Avatar App causes error on cache reload (CTRL+R) 2018-07-25 01:11:26 +03:00
SamGondelman
fbcddf1445 test gradual normal interpolation 2018-07-24 14:15:49 -07:00
Thijs Wenker
b7d12c6b1c
Merge pull request #13656 from huffman/fix/create-selection-box 
Fix the Create selection box not always matching outline
 2018-07-24 19:49:20 +02:00
SamGondelman
318ef907b8 parabola/polyvox, fixing some bugs 2018-07-24 10:08:35 -07:00
Wayne Chen
c0dfbac480 adding comment for possible solution - still WIP 2018-07-24 10:04:51 -07:00
John Conklin II
2ac9463830
Merge pull request #13653 from ElderOrb/fake-wearables-fix 
FB16870: Avatar Wearables showing incorrect number
 2018-07-23 15:55:11 -07:00
howard-stearns
48184c102b Merge branch 'master' of github.com:highfidelity/hifi into forget-you 2018-07-23 15:25:46 -07:00
howard-stearns
f87db26cad pal refresh that remembers your place 2018-07-23 15:25:06 -07:00
Wayne Chen
e4a5be668a adding check function for pointing at near grabbable entity 2018-07-23 12:29:01 -07:00
Wayne Chen
1ec136a19c removing debug overlay statements 2018-07-23 12:18:26 -07:00
Wayne Chen
a2aeacab64 adding fix for near grabbing with web entity 2018-07-23 12:17:19 -07:00
Wayne Chen
89f9cd089f Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-07-23 11:51:39 -07:00
Ryan Huffman
d1da7675f6
Merge pull request #13648 from huffman/fix/create-xz-lines 
Fix xz guides not showing when translating with Shift
 2018-07-23 10:44:47 -07:00
Seth Alves
4f45fbc5f5
Merge pull request #13661 from danteruiz/avatarapp-undefined-data 
fix avatar app from crashing when avatar entity variable is undefined.
 2018-07-23 10:18:31 -07:00
Seth Alves
a6a4dd3b8e
Merge pull request #13570 from danteruiz/fix-tablet-material-entities 
clean up tablet material entities  and don't display them in create menu
 2018-07-23 09:50:23 -07:00
Wayne Chen
1880c49d03 removing garbage file 2018-07-20 17:18:58 -07:00
Wayne Chen
32886d67d9 optimizing near-/far- grabbable entities a bit 2018-07-20 17:17:36 -07:00
Wayne Chen
be5fdef974 adding check in isReady for grabbing non-web entitys 2018-07-20 15:26:55 -07:00
danteruiz
9bf6cff5cd fix indent isssues 2018-07-20 12:27:51 -07:00
Ryan Huffman
ae26c5fe9a Remove extraneous logging 2018-07-20 11:38:02 -07:00
Ryan Huffman
32122a7c1f Replace magic numbers with RAIL_AXIS_LENGTH 2018-07-20 11:37:42 -07:00
danteruiz
ce3922a3c1 fix avatarEntities undefined crash 2018-07-20 11:23:02 -07:00
Wayne Chen
4e3a6cb320 adding ignore for far-/near- grabbable entities when operating on web surface 2018-07-20 11:18:20 -07:00
SamGondelman
763e6465a2 followNormal, fixin stuff 2018-07-20 10:41:24 -07:00
Alexander Ivash
f5717b7648 add check for SELF_ID 2018-07-20 19:33:16 +03:00
Wayne Chen
5276d84aa5 pushing what i coded out loud - it broke the way grabbing works 2018-07-19 17:08:12 -07:00
Alexander Ivash
fb8640de47 FB16870: Avatar Wearables showing incorrect number 2018-07-20 02:51:17 +03:00
Ryan Huffman
2305099874 Fix the Create selection box not always matching outline 2018-07-19 16:09:21 -07:00
SamGondelman
956c1511b6 Merge remote-tracking branch 'upstream/master' into parabolic 2018-07-19 15:23:25 -07:00
Wayne Chen
1942eaf68f Merge branch 'fixGrabWebSurface-case-16192' of https://github.com/wayne-chen/hifi into fixGrabWebSurface-case-16192 2018-07-19 13:47:48 -07:00
Wayne Chen
b60d650843 Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-07-19 13:47:38 -07:00
Ryan Huffman
25b558e6b4 Fix xz guides not showing when translating with Shift 2018-07-19 12:56:18 -07:00
SamGondelman
39fa3420ec pointer rendering, update teleport.js 2018-07-19 12:02:39 -07:00
Qliemillar
2163bf1ef0
Merge pull request #13628 from r3tk0n/16726-Vive-Blackboxes 
16726 - Remove Black Boxes ( HMD.requestShowHandControllers() )
 2018-07-19 12:34:38 -06:00
Howard Stearns
2378cdfdc6
Merge pull request #13624 from howard-stearns/app-refactor4-merge 
appUi module, and use in People app
 2018-07-19 11:07:54 -07:00
Qliemillar
3466d944fb
Merge pull request #13630 from huffman/fix/create-undo-while-disabled-visual 
Disable showing the entity edit tools when undoing while disabled
 2018-07-19 09:03:40 -06:00
howard-stearns
a904182cc2 cr feedback 2018-07-18 14:03:26 -07:00
Thijs Wenker
b29044fd7e
Merge pull request #13618 from dback2/clickHandleSwitchEntityFix 
Fix quickly clicking an edit handle causing selected entity change
 2018-07-18 22:49:11 +02:00
howard-stearns
74914ffb3e Merge branch 'master' of github.com:highfidelity/hifi into app-refactor4-merge 2018-07-18 13:16:50 -07:00
Ryan Huffman
b015845371 Disable showing the entity edit tools when undoing while disabled 2018-07-18 11:54:40 -07:00
r3tk0n
a9eb8103f6 Clean up comments a bit. 2018-07-18 09:52:25 -07:00
r3tk0n
f7b49598b5 Disabled tip boxes for Vive controllers, as per experience team request. 2018-07-18 09:50:59 -07:00
Qliemillar
080d664341
Merge pull request #13619 from luiscuenca/handTouchDisabler 
Allow creators to disable hand touch from javascript
 2018-07-18 08:16:37 -06:00
Wayne Chen
ac642f126a adding extra conditional to ensure all modules are checked 2018-07-17 20:52:50 -07:00
Wayne Chen
30ca5a8cbd code cleanup to use web laser if laser is not pointing at grabbable entity 2018-07-17 16:44:49 -07:00
Wayne Chen
eb7bde1bfc switching near grab priority to be before web surface laser 2018-07-17 15:38:56 -07:00
Wayne Chen
f444d0ae28 Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-07-17 15:03:04 -07:00
Qliemillar
07a7bbbcf6
Merge pull request #13621 from thoys/fix/create/desktop-tablet#master 
[FIX] Use create app in tablet mode when choosing to use tablet in desktop mode
 2018-07-17 14:36:55 -06:00
howard-stearns
bfd9e208b5 Merge branch 'master' of github.com:highfidelity/hifi into app-refactor4-merge 2018-07-17 12:31:18 -07:00
Wayne Chen
2c16c6579f Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-07-17 11:54:15 -07:00
Wayne Chen
813c58a1fb adding check to see if near grabbing is ready 2018-07-17 11:53:55 -07:00
Thijs Wenker
09e1090e72 Use create app in tablet mode when choosing to use tablet in desktop mode 2018-07-17 17:33:13 +02:00
Qliemillar
42daa33d11
Merge pull request #13560 from danteruiz/fix-parent-grab-and-flickering 
fix parent grab dropping and cullig flickering when flying at high velocities
 2018-07-17 08:53:41 -06:00
luiscuenca
82a3b73de8 Added disable hand touch for entityID 2018-07-17 07:06:48 -07:00
howard-stearns
cb5ac6f42c Merge branch 'master' of https://github.com/highfidelity/hifi into app-refactor4-merge 2018-07-16 17:43:53 -07:00
luiscuenca
84dac94379 Allow creator to disable hand touch 2018-07-16 17:03:50 -07:00
Zach Fox
7cdb84ee68
Merge pull request #13602 from zfox23/MS16562_massivePalSpeedup 
Fix MS16562: Massive PAL speedup!
 2018-07-16 16:45:01 -07:00
howard-stearns
2c92b02b95 lint 2018-07-16 16:28:44 -07:00
howard-stearns
f1fed37763 cleanup 2018-07-16 15:58:01 -07:00
howard-stearns
4e6aa34814 Merge branch 'master' of github.com:highfidelity/hifi into app-refactor4 2018-07-16 13:07:08 -07:00
howard-stearns
ffa5259319 cleanup references to button, tablet 2018-07-16 13:06:12 -07:00
howard-stearns
46061a2a15 initial with pal 2018-07-16 11:54:05 -07:00
Dante Ruiz
20a8275343 min diff 2018-07-16 11:43:29 -07:00
Dante Ruiz
fa2b975e8f undo some wrong changes 2018-07-16 11:42:38 -07:00
Dante Ruiz
0fa2a71d0f actually fix requested changes 2018-07-16 11:35:53 -07:00
Dante Ruiz
d81420542c making PR requests 2018-07-16 11:00:27 -07:00
Dante Ruiz
47eb7a0899 Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab-and-flickering 2018-07-16 10:04:42 -07:00
Qliemillar
511b297be5
Merge pull request #13597 from dback2/entityListDeleteSpamFix 
Fix entity list refresh when entity deleted
 2018-07-16 09:49:25 -06:00
David Back
46a9521939 fix selecting an edit handle causing selected entity change 2018-07-13 17:40:24 -07:00
Zach Fox
c3ffe7eb97 Fix bubble shading; fix audio loudness calculation 2018-07-13 13:55:32 -07:00
David Back
c225c3deca
Merge pull request #13608 from dback2/alignSelectionToGridFix 
Fix aligning selection to grid
 2018-07-13 13:33:26 -07:00
Zach Fox
4daa0c6537 CR feedback 2018-07-13 12:47:45 -07:00
David Back
0a738e36a8
Merge pull request #13569 from dback2/hmdHandlesInBoundingBox 
Only clamp edit handles in HMD when outside bounding box
 2018-07-13 10:55:54 -07:00
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
Alexander Ivash
437f49ac22 16683 Avatar App - Add to Favorites Button Not Working 2018-07-13 03:01:02 +03:00
Zach Fox
fa518b995a Fix my audio level 2018-07-12 15:16:54 -07:00
Zach Fox
92756d81ad Implement MS16562: Massive PAL speedup! 2018-07-12 15:05:31 -07:00
unknown
306a77c039 fix delete event 2018-07-12 12:46:18 -07:00
Zach Fox
ee08ef981d Slightly increase linear damping 2018-07-11 10:44:24 -07:00
Zach Fox
6218f80387 MS14743 again: More bandaids for preventing Snappy printouts from falling thru floor 2018-07-11 10:07:02 -07:00
Zach Fox
2fad55e5d0 Prevent PAL from re-enabling ContextOverlayInterface when it's not supposed to 2018-07-10 15:56:13 -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
81f5631ce9
Merge pull request #13386 from ElderOrb/FB13949 
AvatarApp
 2018-07-09 15:20:18 -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
David Back
d4f43a56f2
Merge pull request #13556 from dback2/deselectInput 
Change deselecting entities to Ctrl + D and prevent W/A/S/D/E/Q movements with Ctrl
 2018-07-09 10:40:33 -07:00
David Back
17220b9360
Merge pull request #13549 from dback2/parentChildCopy 
Re-parent entities after duplicating and duplicate children with parents
 2018-07-09 10:06:18 -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
d04c2eaf73 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleMacFix 2018-07-06 18:01:16 -07:00
David Back
f815ad1ddd tabs 2018-07-06 17:02:41 -07:00
David Back
c271e1aae4 fix triggering at non-web overlays 2018-07-06 17:02:29 -07:00
Alexander Ivash
7feb9910c9 use rotation degrees instead of quaternions for comparison 
re-query entity properties after editing it to get actual changes
 2018-07-07 02:36:19 +03:00
Alexander Ivash
168584169c do not close avatarapp on hiding tablet 2018-07-07 02:36:19 +03:00
Alexander Ivash
19f37246a6 capitalize avatarapp name in toolbar/tablet icons 2018-07-07 02:36:19 +03: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
David Back
a415d1eb37 Merge branch 'master' of https://github.com/highfidelity/hifi into parentChildCopy 2018-07-06 14:32:17 -07:00
John Conklin II
6e13b0e141
Merge pull request #13453 from gcalero/web_overlay_android 
Support web3d overlays in android
 2018-07-06 13:02:56 -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
Alexander Ivash
67fb8af87c update avatarapp on avatar switch 2018-07-06 21:00:56 +03:00
Alexander Ivash
8021434984 remove debug tracing 2018-07-06 21:00:56 +03:00
Alexander Ivash
5990d2725a disallow to scale avatar with controllers 2018-07-06 21:00:55 +03:00
Alexander Ivash
58de136dfa fix MARKETPLACES_INJECT_SCRIPT_URL, apply it on opening avatar info 2018-07-06 21:00:55 +03:00
Alexander Ivash
dbf1aa779a reflect changes in grabbed wearable position/rotation in UI 2018-07-06 21:00:55 +03:00
Alexander Ivash
cc151d6187 Change the name of the app from “AvatarApp” to “Avatar”. 2018-07-06 21:00:54 +03:00
Alexander Ivash
b445cc6105 allow changing avatar scale without saving; revert on cancel 2018-07-06 21:00:54 +03:00
Alexander Ivash
73ec34825b add proper application icon 2018-07-06 21:00:54 +03:00
Alexander Ivash
764dc6d156 add link to 'external avatar' dialog 2018-07-06 21:00:53 +03:00
Alexander Ivash
91e1714b0e external avatars support 2018-07-06 21:00:53 +03:00
Alexander Ivash
3ac44376b2 bind Settings page to a backend 2018-07-06 21:00:53 +03:00
Alexander Ivash
1cc086f9c6 cleanup and bugfixing 2018-07-06 21:00:53 +03:00
Alexander Ivash
74bfea59cc reply => data 2018-07-06 21:00:53 +03:00
Alexander Ivash
bcb373618f navigation to market / my purchases from message dialog links 2018-07-06 21:00:53 +03:00
Alexander Ivash
4ce8e29d97 navigate to BodyMart / AvatarIsland on 'get avatars' / 'get wearables' 2018-07-06 21:00:53 +03:00
Alexander Ivash
3baa1a588f bound 'displayName' to backend, adjust font 2018-07-06 21:00:53 +03:00
Alexander Ivash
10f2fe5fe6 implement adding bookmark 
improve comparision of attachments/wearables
 2018-07-06 21:00:53 +03:00
Alexander Ivash
c3f0cb67a6 fix for inability to ajuste wearables after cancelling changes 2018-07-06 21:00:53 +03:00
Alexander Ivash
512e72d6d1 integrate deleting favorite avatars with backend 2018-07-06 21:00:53 +03:00
Alexander Ivash
51c8248463 introduce reverting avatar wearables on cancel 2018-07-06 21:00:53 +03:00
Alexander Ivash
9914a1d523 AdjustWearables: implement deleting/refreshing wearables/wearable 2018-07-06 21:00:52 +03:00
Alexander Ivash
b6769f9678 avatar selection & wearables adjustments work-on-progress 2018-07-06 21:00:52 +03:00
Alexander Ivash
4fa72eab6d show real wearables from avatar in combobox 2018-07-06 21:00:52 +03:00
Alexander Ivash
5007c259bb query real avatar favorites (but use fake urls for now) 2018-07-06 21:00:52 +03:00
Alexander Ivash
1ddfc87396 wip on avatarapp 2018-07-06 21:00:51 +03: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
4763ccf1ec Merge branch 'master' of https://github.com/highfidelity/hifi into deselectInput 2018-07-05 14:53:21 -07:00
David Back
2bcc96269e comments, fix doubles in list, fix re-parenting to 0 2018-07-05 13:10:56 -07:00
John Conklin II
dfa0b96a93
Merge pull request #13546 from sethalves/fix-display-controller-buttons 
keep buttons from drifing away from in-world display of controllers
 2018-07-05 13:09:07 -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
Seth Alves
73071df857 when displaying the in-world controller model, make buttons and joysticks be children of the base controller model, rather than children of the avatar 2018-07-05 10:07:49 -07:00
David Back
2e70853ffc
Merge branch 'master' into editHandleMacFix 2018-07-05 09:51:56 -07:00
Zach Fox
01c4b57d11
Merge pull request #13539 from zfox23/MS16413_snapPrintFall 
Implement MS16413: Improve angularVelocity of printed Snaps
 2018-07-05 09:50:06 -07:00
Thijs Wenker
574bfd177d Create app (desktop mode): 
- Fix insta-close on switching from other app to create app.
- Fix new model and particle dialogs.
 2018-07-05 17:57:00 +02: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
986864fc53 ctrl D for deselect 2018-07-03 15:09:11 -07:00
Zach Fox
6efb895708 Implement MS16413: Improve angularVelocity of printed Snaps 2018-07-03 13:43:04 -07: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
Seth Alves
62ec693280
Merge pull request #13526 from wayne-chen/fixStillOnlySnap-case-15860 
fixing still only snap in snap app
 2018-07-03 11:36:25 -07:00
Thijs Wenker
d5fb094d8a enable Desktop.CLOSE_BUTTON_HIDES flag for create app native windows 2018-07-03 18:49:23 +02: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
Wayne Chen
2bbc5b6137 remove ray pick print statement - it bloats the debug window 2018-07-03 09:11:57 -07:00
Thijs Wenker
7ed03c2f77 - native window presentation mode update 
- de-activate create on displayMode change.
 2018-07-03 17:26:18 +02:00
Wayne Chen
aefa52b4c9 fixing still only snap in snap app 2018-07-02 17:00:31 -07: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
John Conklin II
d9a3676c7c
Merge pull request #13493 from alexiamandeville/sittingUpdate 
Resolving issue where VR input for movement stops emotes
 2018-07-02 12:30:50 -07:00
David Back
e1de226aae change toggle input to t 2018-07-02 11:11:02 -07:00
David Back
122b385dd3 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleToggleFix 2018-07-02 10:57:47 -07:00
David Back
fd4a8fdd83 fix color NaN check 2018-06-29 15:33:55 -07:00
Gabriel Calero
a6d093d8c9 Merge remote-tracking branch 'upstream/master' into web_overlay_android 2018-06-29 15:09:32 -03:00
David Back
328bf37f64 Merge branch 'master' of https://github.com/highfidelity/hifi into particleExplorerOptionalPropFix 2018-06-29 10:34:17 -07:00
David Back
6f0ac32344 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleToggleFix 2018-06-28 17:32:18 -07:00
David Back
7b9341954f Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleToggleFix 2018-06-28 12:10:42 -07:00
Zach Fox
2d27de12bd Fix MS14743: Change SNAP prints such that they don't fall through the floor 2018-06-28 12:06:31 -07:00
Thijs Wenker
7fe9365a76 create app - native windows 2018-06-28 19:12:03 +02:00
John Conklin II
138342ba91
Merge pull request #13485 from zfox23/MS16257_clearOverlay 
Implement MS16257: Remove 'clear overlay when moving' setting and code
 2018-06-28 09:31:04 -07:00
David Back
e74d30ce22 fix color fallbacks 2018-06-27 17:43:41 -07:00
Alexia Mandeville
8228afb378 Resolving issue where VR input for movement stops emotes 2018-06-27 17:15:54 -07:00
David Back
dd09ec1656 Merge branch 'master' of https://github.com/highfidelity/hifi into particleExplorerOptionalPropFix 2018-06-27 16:32:21 -07:00
John Conklin II
e9d2797573
Merge pull request #13472 from alexiamandeville/sittingUpdate69 
Restoring Emote app to stable build state, adding sit and love emotes
 2018-06-27 16:00:53 -07:00
Zach Fox
cfc8c0fb09 Implement MS16257: Remove 'clear overlay when moving' setting and code 2018-06-27 14:07:04 -07:00
Alexia Mandeville
0f25ab7376
Fixing error from typo 2018-06-27 13:30:10 -07:00
David Back
2cdda23169 more robustness for optional properties 2018-06-27 13:05:39 -07:00
John Conklin II
2da3192c33
Merge pull request #13402 from ctrlaltdavid/21895 
Make desktop left and right mouse button actions independent
 2018-06-27 12:46:11 -07:00
Zach Fox
bdeb22703c
Merge pull request #13474 from zfox23/MS16235_handshakeParticles 
Fix MS16235: Set previously-buggy Handshake particle properties to 0
 2018-06-27 12:16:48 -07:00
Gabriel Calero
1e09f98f6e Pick entity or overlay depending on distance 2018-06-27 12:23:43 -03: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
Zach Fox
6f956ffb8d Fix MS16235: Set previously-buggy Handshake particle properties to 0 2018-06-26 15:45:18 -07:00
Alexia Mandeville
b3eec72c90 Removing animations.zip 2018-06-26 15:39:50 -07:00
Alexia Mandeville
6f6a9b2c64 Style formatting, updating comments 2018-06-26 15:02:46 -07:00
Alexia Mandeville
92acbdbbd7 Adding sit and love emotes 2018-06-26 14:21:10 -07:00
David Back
40b2525b99
Merge pull request #13439 from dback2/editHandleFixesImprovements 
Edit handle fixes
 2018-06-26 13:33:25 -07:00
John Conklin II
47f907f44e
Merge pull request #13441 from wayne-chen/collisionlessGrab-case-12661 
Fixing collisionless grabbing
 2018-06-26 13:05:25 -07:00
David Back
46b5c0cc8e
Merge pull request #13448 from dback2/multiSelectColorInvisibleFix 
Fix multi-selection color setting visible/locked to false
 2018-06-26 11:28:58 -07:00
Gabriel Calero
48cdd6d64c Fix web entities for android 2018-06-26 12:30:03 -03:00
Gabriel Calero
7e640abb39 Support Web entities in android 2018-06-26 12:01:01 -03:00
Sam Gondelman
acfd562309
Merge pull request #13435 from gcalero/breakpad_android 
Breakpad integration for android Interface (part II)
 2018-06-25 16:47:07 -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
Gabriel
ea2c1298e5
Remove crash added with testing purposes only 2018-06-25 19:13:47 -03:00
Gabriel Calero
0a70e844bf Merge remote-tracking branch 'upstream/master' into web_overlay_android 2018-06-25 17:41:51 -03:00
Gabriel Calero
fedc0a9e61 Support web3d overlays in android 2018-06-25 16:37:03 -03: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
39b3e5a711 tabs 2018-06-22 18:15:16 -07:00
David Back
09ccd3acf0 fix multi-selection color setting visible/locked to false 2018-06-22 18:13:40 -07:00
David Back
88762e879f Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision 2018-06-22 13:53:04 -07:00
David Back
80adad7965 myAvatar constant 2018-06-22 13:52:43 -07:00
David Back
6a4c5ed12a Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision 2018-06-22 11:58:28 -07:00
Wayne Chen
1239472f2d adding line for allowing grabbing of collisionless overlays 2018-06-22 11:35:01 -07:00
Wayne Chen
5b36449edd allowing grabbing of collisionless entities 2018-06-22 09:54:25 -07:00
Sam Gondelman
850e2d5cf5
Merge branch 'master' into particleFix 2018-06-21 17:32:24 -07:00
SamGondelman
223350b7be remove logging, play with debounce times 2018-06-21 17:26:39 -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
e3e8de1042 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleFixesImprovements 2018-06-21 10:24:12 -07:00
John Conklin II
835528b212
Merge pull request #13383 from dback2/autoLaserFix2 
Fix auto lasering locked web entities & only auto laser tablet and web overlays
 2018-06-21 09:21:54 -07:00
David Rowe
d43be5ce19 Code review 2018-06-21 16:35:37 +12:00
David Back
54145e0310 use previous pick ray when translate reaches end 2018-06-20 15:53:38 -07:00
Menithal
55e75298bd Added Logging 2018-06-21 01:24:32 +03:00
Menithal
903762b122 Make sure max constraints reset 
This now occurs when selecting a new entity and having the UI filled
again
 2018-06-21 01:04:01 +03:00
David Back
7704e8c2a9 fix stretching too far, improve stretch sphere vs camera dist sizing 2018-06-20 14:47:41 -07:00
Menithal
32982326b1 Moved WebBridge sync to oninput: 
This avoids the settings_update being called only when the image
finishes loaded
 2018-06-21 00:08:36 +03:00
Menithal
d878ec66e2 Added Lock for not sending settings_update 
This occurs only when fields are being filled
 2018-06-21 00:07:14 +03:00
SamGondelman
2f0877dc0f debugging js 2018-06-19 16:36:13 -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
SamGondelman
de5fcccc7b proper reporting of nan values in get 2018-06-19 14:22:24 -07:00
SamGondelman
12a5d8b550 quiet ubuntu warnings, particle properties show radians 2018-06-19 12:51:35 -07:00
David Rowe
064f4ca204 Remove deleted entities from list without scrolling to top 2018-06-19 16:22:59 +12:00
David Rowe
5de451e8e0 Update entity list upon entity deletion 2018-06-19 14:52:49 +12:00
David Back
5b699d1cd4 tabs 2018-06-18 16:14:46 -07:00
David Back
7d4fa4f484 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleToggleFix 2018-06-18 15:56:05 -07:00
David Back
030e697945 fix toggling to world space 2018-06-18 15:55:55 -07:00
David Back
0c644c0504 Merge branch 'master' of https://github.com/highfidelity/hifi into autoLaserFix2 2018-06-18 11:06:56 -07:00
David Back
175e4b7013 also check tabletID 2018-06-18 11:06:33 -07:00
David Rowe
ffd66f4377 Make desktop left and right mouse button actions independent 2018-06-18 20:55:13 +12:00
David Rowe
e8154b5df1 Fix Create app selection updating when entities are deleted 2018-06-17 08:35:45 +12:00
SamGondelman
7771661948 fix particle spread properties 2018-06-15 17:35:49 -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
b10cf364c4 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision 2018-06-15 17:32:32 -07:00
David Back
6ef8206f3a temp disable myAvatar collisions when stretching 2018-06-15 17:32:03 -07:00
Gabriel Calero
583c46b3a0 Merge remote-tracking branch 'upstream/master' into breakpad_android 2018-06-15 21:21:03 -03:00
Seth Alves
b4b6c85aaf
Merge pull request #13366 from danteruiz/fixing-invisible-cursor 
fixing invisible cursor when coming from HMD mode
 2018-06-15 17:16:46 -07:00
Seth Alves
7ca6dfc8c5
Merge pull request #13371 from danteruiz/fix-focus-issues 
fix focus issues when mouse is offscreen
 2018-06-15 17:15:42 -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
Gabriel Calero
4cd94a32b8 Crash on audio button press with testing purpose 2018-06-15 17:44:28 -03:00
David Back
fcccaaea48 tabs 2018-06-14 17:49:02 -07:00
David Back
ed5b05eef4 fix auto laser on locked web entity, only auto laser at tablet or web overlays 2018-06-14 17:43:45 -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
John Conklin II
d023d6adef
Merge pull request #13321 from danteruiz/tablet-imporvments 
Tablet improvements
 2018-06-14 12:38:20 -07:00
John Conklin II
4f561b00da
Merge pull request #13003 from alexiamandeville/sittingUpdates 
Adding sitting and love to emote app
 2018-06-14 11:52:47 -07:00
Thijs Wenker
4d3087b98c fix cloneDynamic 2018-06-14 19:07:20 +02:00
Dante Ruiz
abee3e8b96 fix focus issue when mouse is offscreen 2018-06-13 17:07:05 -07:00
Dante Ruiz
a6202cf3cb fixing invisible cursor 2018-06-13 11:31:14 -07: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
Zach Fox
ffb9a47be0
Merge pull request #13355 from zfox23/MS14314_multipleSnapshots 
Interface Fix for MS14314: Make use of original image filename when sharing
 2018-06-12 15:10:22 -07:00
Anthony Thibault
717093abf7
Merge pull request #13171 from luiscuenca/handTouchToDefault 
Enable Avatar Hand Touch Script by Default
 2018-06-12 14:54:26 -07:00
Zach Fox
bf5d6de780 Merge branch 'master' of github.com:highfidelity/hifi into MS14314_multipleSnapshots 2018-06-12 11:19:05 -07:00
Zach Fox
cf9cf45d02
Merge pull request #13348 from zfox23/MS14129_buyButtonStuck 
Fix MS14129: Prevent Marketplace buttons from getting stuck in hover state
 2018-06-12 11:02:52 -07:00
Dante Ruiz
f1d11f9566 Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments 2018-06-12 10:21:12 -07:00
Luis Cuenca
9126a6f66d
hide debug lines 2018-06-12 10:12:28 -07:00
Zach Fox
860f9db939 Remove logging 2018-06-12 09:25:09 -07:00
Zach Fox
14034f29a1 Interface Fix for MS14314: Make use of original image filename when sharing 2018-06-11 17:10:09 -07:00
Sam Gondelman
e8ec32c7f8
Merge pull request #13340 from SamGondelman/modelTextures 
Try to fix ModelOverlay texture loading
 2018-06-11 16:09:10 -07:00
Dante Ruiz
6685fbbfc4 Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments 2018-06-11 13:56:54 -07:00
Dante Ruiz
f2d6b84e6c fix qa fail issues 2018-06-11 13:56:44 -07:00
John Conklin II
9db71fb40d
Merge pull request #13322 from dback2/fixEquipMessage 
Fix Hifi-Grab-Hand message for equipping
 2018-06-11 13:16:39 -07:00
Zach Fox
a5ef3fa729 Fix MS14129: Prevent Marketplace buttons from getting stuck on hover state 2018-06-11 12:00:51 -07:00
John Conklin II
d5b8570ef6
Merge pull request #13343 from ctrlaltdavid/21888 
Fix tablet attaching to hand while far-grabbing an entity
 2018-06-11 10:26:37 -07:00
Howard Stearns
5ce122f148
Merge pull request #13307 from howard-stearns/infinite-scroll 
Infinite scroll
 2018-06-11 10:03:52 -07:00
Sam Gondelman
9c66ee412a
Merge pull request #13325 from Cristo86/patch-1 
Use third person camera mode when switching to My View from Top View mode.
 2018-06-11 09:36:29 -07:00
Dante Ruiz
ba86c9753d Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments 2018-06-11 09:13:14 -07:00
SamGondelman
2dae613612 remove conserveResources 2018-06-08 17:58:06 -07:00
David Rowe
54b96cd602 Fix incomplete transition from far-grabbing entity to grabbing tablet 2018-06-09 11:32:10 +12:00
David Rowe
dc46c2077d Fix function name 2018-06-09 11:01:18 +12: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
howard-stearns
2761688d39 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-07 16:14:57 -07:00
druiz17
8c83bd29a3 making requested changes 2018-06-07 14:04:39 -07:00
Zach Fox
93eba5fe5e
Merge pull request #13293 from zfox23/MS7224_cubeSnapshots 
Fix MS7224: Add dimensions to printed Snapshot entity
 2018-06-07 12:52:20 -07:00
Cristian Duarte
664884c9a8
Use third person camera mode when switching to My View from Radar mode. 
This makes it consistent with the default third person camera in My View.
 2018-06-07 16:41:41 -03:00
howard-stearns
890c97e7cb Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-07 12:24:27 -07:00
luiscuenca
df32fe60e4 using RayPick API 2018-06-07 11:44:59 -07:00
luiscuenca
5403db6d51 Merge branch 'master' into handTouchToDefault 2018-06-07 11:42:26 -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
389bddb0f4
Merge pull request #13255 from ctrlaltdavid/21884 
Fix properties not populating particle explorer tab
 2018-06-07 09:42:45 -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
David Back
8f5de7b16a use messageGrabEntity flag instead 2018-06-06 18:05:26 -07:00
David Back
0ee55a09b6 fix tabs 2018-06-06 17:35:25 -07:00
David Back
048872c79a use messageEquip flag to fix Hifi-Hand-Grab 2018-06-06 17:32:52 -07:00
David Rowe
32c21a1397 Fix particle property value reverting to old value when switch tabs 2018-06-07 12:22:56 +12:00
Dante Ruiz
5a89a51b85 make edit mode play nicely 2018-06-06 16:04:36 -07:00
David Rowe
3e100fb141 Merge branch 'master' into 21884 2018-06-07 10:46:53 +12: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
David Rowe
b4b63187ae Fix typo 2018-06-05 08:48:10 +12:00
howard-stearns
5257a254cb more for the previous 2018-06-04 13:12:41 -07:00
howard-stearns
254abfa04a add request-services to default scripts. 2018-06-04 12:59:08 -07:00
SamGondelman
8af1beca8d add isGroupCulled for model overlays 2018-06-04 12:07:57 -07:00
Zach Fox
cf7a3d1af6 Fix MS7224: Add dimensions to printed Snapshot entity 2018-06-04 11:30:29 -07:00
howard-stearns
29b09d64e6 checkpoint with PAL working. 2018-06-01 13:33:45 -07:00
howard-stearns
e6ffb9a3e5 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-01 11:10:13 -07:00
Seth Alves
708cbbc984
Merge pull request #13258 from wayne-chen/toggleAdvancedMovementFile-case-15453 
JavaScript exception in toggleAdvancedMovementForHandControllers.js
 2018-06-01 10:48:24 -07:00
howard-stearns
84f5f0a653 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-06-01 09:58:08 -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
Wayne Chen
9f20d52d01 adding alternate solution. 2018-05-31 15:05:33 -07:00
Wayne Chen
d66b548fc5 fixing typo in script file. 2018-05-31 15:04:29 -07:00
howard-stearns
e8e12eef8f checkpoint 2018-05-31 14:42:52 -07:00
David Rowe
3c5a779a98 Don't modify function parameter 2018-06-01 09:36:28 +12:00
David Back
d20d594ae5 use setCollisionEnabled for avatar collisions 2018-05-31 10:50:54 -07:00
howard-stearns
b0d3729d4d Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-30 17:09:57 -07:00
howard-stearns
bdd38cef7a checkpoint 2018-05-30 17:09:13 -07:00
Wayne Chen
34120da63f re-adding toggleSpaceMode 2018-05-30 16:06:34 -07:00
Dante Ruiz
072d8b70b1 adding back notifcations 2018-05-30 13:36:02 -07:00
David Rowe
8c9bdf51a7 Remove superfluous variable 2018-05-30 17:16:08 +12:00
David Rowe
03cec8cb54 Fix properties not populating particle explorer tab 2018-05-30 17:15:33 +12:00
howard-stearns
a84829392f Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-29 16:14:22 -07:00
Gabriel Calero
bb73af7230 Show stats button only in debug mode. Add isDebugMode to Script public interface 2018-05-29 17:21:44 -03:00
howard-stearns
17be460adf checkpoint 2018-05-25 16:37:06 -07:00
Alexia Mandeville
cdf56d3c6d Adding comment for clarification, formatting comment style 2018-05-25 10:42:56 -07:00
Wayne Chen
8453c7baba reverting commit 802cedf1bc regarding toggleSpaceMode 2018-05-25 09:25:05 -07:00
Wayne Chen
89f7eb0b30 Adding fix for enabling saved front/back advanced controls. 2018-05-25 09:21:01 -07:00
Alexia Mandeville
5540561730 Removing trigger input stopping animation to enable VR 2018-05-24 18:45:04 -07:00
Alexia Mandeville
81d615c9db Revert "Removing sit functionality from teleport" 
This reverts commit 36df9d7de8.
 2018-05-24 17:36:29 -07:00
howard-stearns
235971f8bf checkpoint 2018-05-24 15:23:45 -07:00
Wayne Chen
3d0e0da42f re-adding removed toggleSpaceMode function 2018-05-24 11:08:26 -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
Dante Ruiz
9df79462ad fix snapshot 2018-05-22 09:06:10 -07:00
Liv Erickson
604b3cac1c check for null entities in grab, add conversion for old userdata cloneable 2018-05-21 16:19:43 -07:00
howard-stearns
fc6bfe9e44 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-21 10:41:45 -07:00
Dante Ruiz
249d22b4b4 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates 2018-05-21 10:31:24 -07:00
Anthony Thibault
4f69ae253d
Merge pull request #12906 from Triplelexx/21794_move_inspect 
WorkList #21794: Modify inspect.js to work with Avatars as well as entities
 2018-05-21 09:40:42 -07:00
howard-stearns
d385a255c4 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-18 16:53:08 -07:00
Liv
0927cadf10
Merge pull request #13093 from RebeccaStankus/edit-bug-14671 
moved checkEditPermissionsAndUpdate function to higher scope
 2018-05-18 16:44:53 -07:00
Liv
99960b3024
Merge pull request #13085 from ctrlaltdavid/21863 
Fix intermittent ability to select particle and light entities
 2018-05-18 16:44:11 -07:00
Dante Ruiz
3b59af3ed7 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates 2018-05-18 16:42:31 -07:00
Dante Ruiz
60dd7e49ab making requested changes 2018-05-18 16:41:39 -07:00
Liv Erickson
de05388ebf Merge branch 'master' of github.com:highfidelity/hifi into clone-server 2018-05-18 10:42:26 -07:00
RebeccaStankus
27638b9ced Removing duplicate function 2018-05-18 09:20:03 -07:00
Sam Gondelman
74840d2130
Merge pull request #12935 from gcalero/android_new_login 
Android new login
 2018-05-17 15:53:25 -07:00
David Back
900b373c96 Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-17 09:04:28 -07:00
Gabriel Calero
96da032b16 Add missing js to haptic feedback change 2018-05-17 11:49:44 -03:00
Gabriel Calero
8741c5e6a4 Make haptic pulse duration configurable in VirtualPadDevice 2018-05-17 11:37:13 -03: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
Zach Fox
585957409d
Merge pull request #13141 from zfox23/spectatorCameraImprovements 
Spectator Camera V2
 2018-05-16 13:38:07 -07:00
David Rowe
b74f42dc23 Merge branch 'master' into 21863 2018-05-17 07:44:39 +12:00
Zach Fox
0021af8714 Merge in in-progress changes from old commerce_paginationAndFiltering branch 2018-05-16 12:28:52 -07:00
David Back
06fa4efe05 add comment 2018-05-16 11:39:53 -07:00
David Back
6c946d7ac5 prevent continuous clone calls 2018-05-16 11:36:57 -07:00
Dante Ruiz
37c51a7246 Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates 2018-05-16 10:41:40 -07:00
Dante Ruiz
e676348c4f fixing some menu reog bugs 2018-05-16 10:40:28 -07:00
Gabriel Calero
5afc9c6df3 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-16 12:45:17 -03:00
vladest
5127cb0ea6 Merge branch 'master' into menu-updates 2018-05-16 14:37:00 +02:00
David Back
1e2d2819d5 tweaks 2018-05-15 17:36:39 -07: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
John Conklin II
ce1231910c
Merge pull request #13140 from Cristo86/android_avatar_name 
@SamGondelman We just do a quick 5-10 minute Windows check, just to make sure Windows/Mac weren't broken by the change.
 2018-05-15 13:22:15 -07:00
vladest
7ea6181520 Merge branch 'master' into menu-updates 2018-05-15 21:54:45 +02:00
Zach Fox
bccaa2dbe5 Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-15 11:50:38 -07:00
Dante Ruiz
931c8f5abe
Merge pull request #13110 from ctrlaltdavid/21866 
Don't unnecessarily scroll HTML content when keyboard is raised
 2018-05-15 11:00:38 -07:00
Seth Alves
6da59d15e5
Merge pull request #13167 from dback2/lowercaseUnequip 
Desktop equip: fix unequipping with capital U
 2018-05-15 10:55:19 -07:00
John Conklin II
a76be78386
Merge pull request #13163 from sethalves/fix-near-grab-to-hips 
fix near-grab attaching entity to hips
 2018-05-15 10:28:36 -07:00
Howard Stearns
39ccfc86ef
Merge pull request #13168 from zfox23/MS_15090 
MS15090: Fix gifting when running marketplaces.js separately
 2018-05-15 10:12:29 -07:00
David Back
623410a0aa Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-15 09:53:24 -07:00
Dante Ruiz
82422edb59 fixinig the controller settings page and have menu option on by default 2018-05-14 18:51:39 -07:00
luiscuenca
acd1721c88 Load handTouch.js as a default script 2018-05-14 17:26:03 -07:00
Zach Fox
43254e2981 Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-14 15:12:44 -07:00
Howard Stearns
d7121265d0
Merge pull request #13150 from howard-stearns/fix-lastEdited-vs-pal 
fix lastEdited vs pal
 2018-05-14 15:12:07 -07:00
Zach Fox
a881d07e59 MS15090: Fix gifting when running marketplaces.js separately 2018-05-14 13:12:58 -07:00
David Back
ac78e14585 fix unequipping with capital U 2018-05-14 11:44:25 -07:00
Cristian Luis Duarte
e7abf3c7be Android - Display Names - Use my avatar uuid directly when finding ray intersection 2018-05-14 15:26:57 -03:00
vladest
0a67fc3b36 Merge conflicts 2018-05-12 11:24:35 +02:00
Cristian Luis Duarte
aaa6038d28 Prevent calling ending on displayNames if was never started 2018-05-11 22:27:58 -03:00