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

5479 commits

Author SHA1 Message Date
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
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