Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 08:01:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
73123 commits 76 branches 59 tags 1.2 GiB
Commit graph

7007 commits

Author SHA1 Message Date
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
Anthony Thibault
fede22499c Added app to control exponential filters on vive trackers, in real time 2018-10-15 11:58:13 -07: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
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
Anthony Thibault
717a5ed31b Added snap threshold to AccelerationLimiterFilter 2018-10-11 09:22:12 -07:00
Anthony Thibault
e5c2605ac2 Added filtered-puck-attach app to test filters on tracked objects. 2018-10-10 17:53:14 -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
Anthony Thibault
09c3b39f0d Update puck-attach.js with model that matches the orientation of the pucks 2018-10-10 14:00:16 -07:00
Dante Ruiz
296ea8a5af fix overlay issues during interstitial mode 2018-10-10 12:00:58 -07:00
Anthony Thibault
8d56a313e8 renamed viveTrackedObjects.js to drawTrackedObjects.js 
Removed requirement of having a Vive hooked up.  Input recordings can have trackedObjects within them.
 2018-10-09 14:05:26 -07:00
David Back
60d102c9bf styling fixes 2018-10-09 12:42:57 -07:00
Anthony Thibault
8c8b30c0f9 Removed deceleration updated app 2018-10-09 10:51:02 -07:00
Anthony Thibault
527c0d4195 Added accelerationFitlerApp. 
Attempts to make deceleration limit filter work better.
 2018-10-09 10:51:02 -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
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
Sam Gateau
46a50b04ea
Merge pull request #14034 from samcake/black-bis 
Refactor Deformed mesh rendering pipeline for better scalability and performances at runtime
 2018-10-04 20:41:28 -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
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
Sam Gateau
c194e795ac Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-10-03 12:12:15 -07: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
Alexia Mandeville
d769f83cdd
Merge branch 'master' into menu-updates 2018-10-02 16:43:08 -07:00
sam gateau
680f5f5703 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-10-02 15:25:19 -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
Sam Gateau
d1d4920c35 Check and fixed the shader for nvidia regarding the unpacked variable name, adjust luci.js to be able to move the viewport 2018-10-01 21:35:18 -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
Sam Gateau
c593f00839 Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-10-01 19:10:18 -07: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
Thijs Wenker
eeda7400c9 check if id matches in filtered getMultipleEntityProperties 2018-10-01 19:36:53 +02:00
Wayne Chen
eab57633a5 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-01 09:21:26 -07:00
sam gateau
305ea80a18 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-10-01 08:37:19 -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
Thijs Wenker
e266e2ebbf filter getEntity(Multiple)Properties entities unitTest 2018-09-29 02:44:11 +02: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
John Conklin II
789062d0b9
Merge pull request #14103 from howard-stearns/shorter-handshake 
minimal time handshake
 2018-09-28 16:29:38 -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
Howard Stearns
2d29906e3c Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-28 11:22:57 -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
Sam Gateau
97de12fcbc Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-09-27 19:01:55 -07: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
Roxanne Skelly
af6db93b70 Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-27 12:05:21 -07:00
Roxanne Skelly
330789471d Fix merge conflict and set proper polling times 2018-09-27 12:03:37 -07: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