Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
84366 commits 2 branches 0 tags 1.1 GiB
Commit graph

8746 commits

Author SHA1 Message Date
Kalila L
b493f0c51d Alter icon positions, colors, combine visit and search box. Add tooltips for some buttons. 2020-09-23 01:22:04 -04:00
Kalila L
2d871a8f88 Add hover effect for cards and fix description for add location. 2020-09-23 00:54:50 -04:00
Kalila L
3866bf478b Fix icon resolutions. 2020-09-23 00:04:27 -04:00
Kalila L
0cb6261d11 Catch stragglers. 2020-09-22 20:25:19 -04:00
Kalila L
154a95ac86 Update all scripts, script-archive scripts still broken. 2020-09-22 19:24:58 -04:00
Kalila L
085bdf0016 Merge branch 'master' into pr/654 2020-09-22 01:55:24 -04:00
kasenvr
457cc56f1a
Update FloofChat.html 
Fix formatting issues.
 2020-09-21 23:48:36 -04:00
Alezia Kurdis
de21ebf853
Selection Tool "unlit" 
This commit includes 2 parts:
1- Re-adjustment in the code to stay aligned with axis/colors/Pitch-Yaw-Roll 
It seems that the Overlay 3dCircle was in fast patch to work while the Gizmo Ring is aligned for Axix versus Pitch-Yaw-Roll.
The modification has been done differently and is in fact a simpler solution.

2- Add a Material local entities parented to each tool entity to make the Selection tool "unlit"
This addresses Issue #709 Enhancement: Make create translate "widget" unlit
BUT there is a known issue: The Gizmo Ring are not supporting the Material currently. (an issue has been open for that see #744)
The Rotation rings are then not "unlit", but everything in the code is ready to support it when it will be done.
Gizmo Ring having practically designed for that specific usage, I think we should keep using them.
Other alternatives like using an image or a model would imply to considerable modifications. 
We would lose the angular representation (that can't be done with image or model). 
The remaining "unlit" issue is very low severity, the widget is still fully functional. So I think it can wait for the support of Material.
 2020-09-21 21:59:19 -04:00
Kalila L
5a321cdaa8 Fix links. 2020-09-21 16:23:30 -04:00
Kalila L
7b7038fae1 Bunch of URL updates later... 2020-09-21 00:54:49 -04:00
Kalila L
d3a97832a3 Update the rest of non /script-archive/ script URLs. 2020-09-21 00:14:22 -04:00
Kalila L
a95c457499 Update active scripts. 2020-09-20 23:37:44 -04:00
Kalila L
b1f32dd9ac Merge branch 'pr/691' into fix/URL-migrations 2020-09-20 17:58:26 -04:00
Kalila L
ecf3e67bdf Improve URL formatting and refactor. 2020-09-20 00:44:40 -04:00
Kalila L
2a5604a166 Fix chat window toggling for all users on domain. 2020-09-20 00:44:04 -04:00
Alezia Kurdis
dca2f2e00e
Replacement of 3D Overlays for Local Entities 
This replaces all the deprecated 3d Overlays for Local Entities.
No functional changes, only technical.

Many variables have been renamed for clarity. 
(Mainly the term "overlay" that were used to designate the elements of the selection tool. 
Now it refer to "toolEntity" to designate the entities composing the Selection Tool.)

The color of the different elements of the selection tools has also been adjusted.
They are now more contrasted and more vivid.
(The green and the blue of the previous version were too much close at the point that 
some color blind people might have difficulty to differenciate them.)
 2020-09-19 23:20:43 -04:00
Dale Glass
0310764013 More review fixes 2020-09-20 01:29:32 +02:00
Dale Glass
cd901f9e32 Move enum into ExternalResources namespace 2020-09-20 01:29:32 +02:00
Dale Glass
c65cc9570d Prototype for moving content away from hifi infrastructure 2020-09-20 01:29:32 +02:00
kasenvr
9fad6109ca
Merge pull request #703 from AleziaKurdis/feature_Create_App_materialData 
Feature: Create Material even without a URL.
 2020-09-16 23:36:56 -04:00
Alezia Kurdis
6ca176335e
Change "Add" button for "Create" 
Change "Add" button for "Create"
 2020-09-16 23:15:07 -04:00
Alezia Kurdis
1a0e69ed6e
Change "Add" button for "Create" 
Change "Add" button for "Create"
 2020-09-16 23:07:41 -04:00
Alezia Kurdis
ec4d559055
Added (Optional) to the label "Material URL" 
Added "(Optional)" to the label "Material URL"

"Material URL (Optional)"
 2020-09-15 22:24:08 -04:00
Alezia Kurdis
180742f790
Clarify the "materialURL" tooltip 
Clarify the "materialURL" tooltip that was a bit obscure.
New value:
"The URL to an external JSON file or "materialData".  Append "?<materialName>" to select a single material if multiple are defined."
 2020-09-10 00:15:07 -04:00
Alezia Kurdis
da6a86b411
Create Material without url 
This enhancement changes the behavior when a Material Entity is created using the Create App.
Previously, if we left the URL null, no entity was created.
With this fix, if we left the URL null, then the entity is created with "materialData" already set in materialURL (ready to use Material Data).
 2020-09-10 00:11:50 -04:00
Alezia Kurdis
6337e84894
Fix for Issue #696 
This fixes a refresh of the FILE value in the Create App Entity list when updating the imageURL of an Image Entity.
(It was missing in the condition that checks to add to the refresh of the list.)

This solves the issue #696.
 2020-09-09 22:41:05 -04:00
HifiExperiments
f453969ce8 Merge remote-tracking branch 'upstream/master' into gha 2020-09-09 09:32:52 -07:00
kasenvr
9004fb8060
Merge pull request #624 from ctrlaltdavid/feature/vircadia-about 
Add "About" JavaScript API and platform string
 2020-09-02 18:50:09 -04:00
kasenvr
b02205e5b8
Merge pull request #658 from kasenvr/feature/add-update-notififier 
Feature/add update notififier
 2020-09-02 18:49:13 -04:00
kasenvr
ee554ad8f1
Remove hardcoded checkForUpdates.js version value 
Uses About API instead of the deprecated HifiAbout API.
 2020-09-02 18:40:43 -04:00
Martin Allerton
86b2f1894c
Updated add location script code 
Have not been able to test this due to not been near a proper machine, but I believe this code change should hopefully resolve the issue with the add location beacon script being wrong.
 2020-09-02 19:46:47 +01:00
Kalila L
61d12c6641 Caps the variables. 2020-08-31 01:03:24 -04:00
Kalila L
6e39e048be First pass at centralizing some URLs. 2020-08-31 00:43:30 -04:00
Kalila L
b988bd15af Merge remote-tracking branch 'origin/feature/add-update-notififier' into fix/URL-migrations 2020-08-31 00:06:36 -04:00
Kalila L
1e15458c64 Merge branch 'feature/add-update-notififier' of https://github.com/kasenvr/project-athena into feature/add-update-notififier 2020-08-30 13:58:12 -04:00
Kalila L
ec25ac9e7d Update checkForUpdates.js 
"retrievedMetadata" -> "vircadiaMetadata"
 2020-08-30 13:57:45 -04:00
kasenvr
0b1dce14a0
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-08-30 13:56:09 -04:00
daleglass
aba63051e5
Merge pull request #606 from AleziaKurdis/530_593_CrAppUIadust 
Change colorSpread color-picker and other small fixes
 2020-08-27 23:30:16 +02:00
Kalila L
abac59c09b Add checkForUpdates.js to the defaultScripts.js 2020-08-27 05:38:50 -04:00
Kalila L
4836f4b369 NOTE: Undo commit before merging, for testing purposes only. 2020-08-27 05:32:07 -04:00
Kalila L
68055f2458 Add update checker and notifier for Interface. 2020-08-27 05:30:45 -04:00
Kalila L
e8526aa6b7 Update chat to accept system notifications. 2020-08-27 05:28:07 -04:00
Kalila L
2d7a640935 Create networkingConstants.js 2020-08-27 05:27:47 -04:00
Kalila L
d45c283f3b Add semanticVersionCompare function to utils.js 2020-08-27 03:53:04 -04:00
Kalila L
bfdcdee96b Attempt to fix isInEditMode error on line 780. 2020-08-27 01:52:21 -04:00
Martin Allerton
441381846b
Merge branch 'master' into feature/update-explore-ui 2020-08-25 20:33:28 +01:00
Kalila L
26d4eb8e67 Updates per CR. 
Co-Authored-By: David Rowe <david@ctrlaltstudio.com>
 2020-08-24 18:43:03 -04:00
daleglass
90c957c9e9
Merge pull request #604 from AleziaKurdis/534_601_Default_images 
New URL for default Particle and Image resource
 2020-08-20 23:26:45 +02:00
daleglass
012b6b0c84
Merge pull request #603 from AleziaKurdis/575_DuplicateNaming 
Incremental suffix to cloned entities's name (issue #575)
 2020-08-20 23:22:37 +02:00
HifiExperiments
91a35fb4ba change quick goto 2020-08-19 20:03:16 -07:00
Martin Allerton
a08a54f646 Removed cdn dependancies 
CDN dependencies replaced with physical local copied of the libraries
 2020-08-19 22:26:33 +01:00
Martin Allerton
d10f02d02e Inital version of reworked explore 2020-08-19 21:54:46 +01:00
kasenvr
d4bfce831f
Merge pull request #630 from AleziaKurdis/WebTransparencyUIforPR605 
New "useBackground" property for pr605
 2020-08-19 13:13:56 -04:00
Alezia Kurdis
46ca84167c
EOL unix 2020-08-18 23:28:44 -04:00
Alezia Kurdis
92f7e87081
EOL unix 2020-08-18 23:27:47 -04:00
Alezia Kurdis
c6cf0b8c33
New "useBackground" property on Web Entity 
New "useBackground" property on Web Entity.
 2020-08-18 23:22:39 -04:00
Alezia Kurdis
bda88828a0
Tooltip for useBackground 
Tooltip for useBackground
 2020-08-18 23:21:32 -04:00
Alezia Kurdis
8d217d215f
Better code fix for preview 
being more specific on the validation for the unresolvable relative path.
checking now if the path start with "file:///~" instead of only: "file:/"
This was too much restrictive since those direct path works and wouldn't return a preview:
Ex: "file://MYSERVER/folder/100_0057.jpg"
 2020-08-17 21:58:42 -04:00
Alezia Kurdis
341c114adf
Replace default url for external storage 
var DEFAULT_IMAGE = "http://eu-central-1.linodeobjects.com/vircadia-assets/interface/default/default_image.jpg";
var DEFAULT_PARTICLE = "http://eu-central-1.linodeobjects.com/vircadia-assets/interface/default/default_particle.png";
 2020-08-16 21:58:35 -04:00
David Rowe
70fd954ef4 Replace the "HifiAbout" API with a new "About" API 2020-08-17 11:34:58 +12:00
Kasen IO
1c457b766c Use https://google.com/ to test transparency. 2020-08-15 01:05:52 -04:00
Alezia Kurdis
2cd1fc8471
Keep the suffix only for Duplicate 
This update removes the incremental suffix from the "Paste"
since this can't really work.
This will be only for "Duplicate".
 2020-08-11 22:50:12 -04:00
Alezia Kurdis
d31f161d88
Remove the deprecated "acceleration" attribute 
This removes the "acceleration" attribute from the Create App. (Physic section)
because this attribute is deprecated.
 2020-08-09 00:10:40 -04:00
Alezia Kurdis
f3a6fa527b
Replace the colorSpread color-picker by a vector 
Replace the color picker of the attribute particle.colorSpread by a color vec3
To do this, a new type of UI field has been added "vec3rgb" to support the "red, green, blue" vector (non-Color-picker).
This addresses issue #593

Fix also the broken particle texture preview that, as for 'atp:/', doesn't support 'file:/'. 
This will be required for issue #534
 2020-08-08 00:14:26 -04:00
Alezia Kurdis
797d18d59d
CSS adjustment for the new field type 'vec3rgb' 
CSS has been adjusted for the new field type 'vec3rgb'.
Part of the fix for issue #593.
 2020-08-08 00:07:33 -04:00
Alezia Kurdis
c31ccc7a78
Fix unit for localAngularVelocity and other things 
Revisiting the tooltips for:
- colorSpread
- localAngularVelocity (Set the correct unit 'deg/s'. This addresses issue #530 )
- damping
- angularDamping
 2020-08-08 00:04:44 -04:00
Kasen IO
1601ea9231 Just to prove it works... needs to be done better. 2020-08-07 15:08:00 -04:00
Alezia Kurdis
856cb5cb2c
Replace default URL for Image and Particle 
Replace default URL for Image and Particle
and point now to a local deployed resource.
 2020-08-07 13:04:01 -04:00
Alezia Kurdis
91ebd378f5
Clone suffix without uniqueness check 
Simpler solution without any hazardous uniqueness check.
Cloned entities will systematically get the suffix " (2)", unless their name has already a suffix. 
In that case, we simply increment the suffix.
 2020-08-07 12:51:24 -04:00
Alezia Kurdis
47e3649298
Incremental suffix to duplicated entities 
This enhancement adds an incremental suffix to the name 
of the cloned entities resulting from "Duplicate" and "Paste".
The goal is to help to figure which entities is the coned one.
This addresses issue #575
 2020-08-06 22:28:32 -04:00
Kasen IO
9607491ea2 Add graphics settings menu bar button. 2020-08-05 23:37:45 -04:00
kasenvr
cc43112bf3
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-08-01 13:46:02 -04:00
Kasen IO
b64c44f5ee Make notices respect domain mute settings. 2020-07-31 17:30:50 -04:00
Kasen IO
bec293b8c7 Fix display name being incorrect. 2020-07-31 17:22:15 -04:00
Kasen IO
22085e2166 Add notification sound + delay to get name upon joining. 2020-07-29 22:16:07 -04:00
Kasen IO
a64b391a7b Add user enter and leave domain notification to chat. 2020-07-29 22:07:02 -04:00
Kasen IO
c933f21a77 Add ability to click on message to display chat window. 2020-07-29 22:06:43 -04:00
Kasen IO
382e47471e Fix date display for logs. 2020-07-29 22:06:24 -04:00
kasenvr
bfb4eaeb21
Merge pull request #538 from ctrlaltdavid/fix/camera-in-screenshot 
Delay taking snapshot further at low render rates
 2020-07-25 15:40:39 -04:00
kasenvr
d585b068b4
Merge pull request #521 from kasenvr/feature/inventory-app 
Feature/inventory app
 2020-07-23 17:15:37 -04:00
Kasen IO
e573842786 Add compiled script files. 2020-07-21 00:43:44 -04:00
Kasen IO
78643d13e8 Update packages. 2020-07-21 00:40:21 -04:00
Kasen IO
d5bf5dfe7d Fix comma. 2020-07-21 00:38:29 -04:00
Kasen IO
087ede2f91 Address CR comments. 2020-07-20 13:57:28 -04:00
kasenvr
770dd83efc
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-07-20 13:51:18 -04:00
kasenvr
022be754f1
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-07-20 13:48:48 -04:00
David Rowe
6a6bf6a5e0 Delay taking snapshot further at low render rates 2020-07-16 08:50:10 +12:00
Kasen IO
69a18ccd1b Add sortOrder by AleziaKurdis. 
Co-Authored-By: Alezia Kurdis <AleziaKurdis@users.noreply.github.com>
 2020-07-14 14:45:54 -04:00
Kasen IO
6c5dbb5baf Fix some errors, remove eslint file as eslint is already defined. 2020-07-10 20:19:26 -04:00
Kasen IO
6d981b25b4 Move inventory.js back to system scripts. 2020-07-08 17:26:40 -04:00
Kasen IO
c074f7573c Move inventory-app to unpublished, folder named for future pkg manager. 2020-07-08 14:31:37 -04:00
Kasen IO
ebc8f7db4c Merge branch 'master' into feature/inventory-app 2020-07-08 14:27:59 -04:00
Kasen IO
fd2691fa15 Some code cleaning. 2020-07-01 19:54:14 -04:00
Kasen IO
05ceedaa3f Fix grid chat notification sound. 2020-07-01 19:17:54 -04:00
Kasen IO
f74f0e8a53 Update path reference. 2020-07-01 18:19:13 -04:00
Kasen IO
c99a62b719 Indent + convert emojis to code form. 2020-06-30 19:33:42 -04:00
Kasen IO
16ef73c6f7 Merge branch 'master' into fix/chat-optimizations 2020-06-30 19:06:47 -04:00
kasenvr
c3c6ad47da
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-06-30 18:57:32 -04:00
kasenvr
555dd8fe98
Update scripts/communityScripts/chat/FloofChat.html 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-06-30 03:03:20 -04:00
kasenvr
82638e47c4
Merge pull request #476 from ctrlaltdavid/fix/update-more-app 
Update More app from community apps repo
 2020-06-29 23:18:03 -04:00
Kasen IO
c289434f01 Don't play sound if user sends msg, make localOnly, lower volume. 2020-06-29 22:06:20 -04:00
Kasen IO
baa24c311e Add notification sound + muting system. 2020-06-29 21:52:58 -04:00
Kasen IO
580d4826e9 Fix line lengths. 2020-06-27 14:25:15 -04:00
Kasen IO
6c3340051e Add external URL launching. 2020-06-27 01:08:55 -04:00
Kasen IO
dc5418748d Fix time and date formatting. 2020-06-27 00:43:39 -04:00
Kasen IO
394c9e2175 Chat window resize, shrink text size and boxes, add date to timestamp. 2020-06-26 21:48:58 -04:00
Kasen IO
968fd2b72d Move chat to correct folder. 2020-06-26 18:46:30 -04:00
Kasen IO
fc418fa9e4 Remove script that no longer exists created by the Vive Pro Eye PR. 2020-06-23 15:57:15 -04:00
David Rowe
84a2fe061f Update More app from community apps repo 2020-06-23 20:27:08 +12:00
kasenvr
4cc31fc427
Merge pull request #442 from kasenvr/fix/fix-model-scale-create-app 
Fix models not scaling correctly when loading due to timeout.
 2020-06-20 17:09:09 -04:00
kasenvr
13451bd275
Merge pull request #384 from JulianGro/rebrand 
Rebranding stuff
 2020-06-18 17:12:47 -04:00
Julian Groß
18318fdf71
Merge branch 'v2020.2.2-rc' into rebrand 2020-06-18 09:16:47 +02:00
Kasen IO
3e585267e4 Fix gizmo size issue post auto-resize of a new model. 2020-06-18 01:11:07 -04:00
David Rowe
189f6f5440 Code review 2020-06-15 08:04:51 +12:00
David Rowe
4e57d53dde Merge branch 'master' into feature/vive-pro-eye-tracking 2020-06-14 10:51:25 +12:00
kasenvr
2ae304864e
Merge pull request #439 from kasenvr/fix/remove-goto 
Remove old goto, update Explore app.
 2020-06-11 17:24:48 -04:00
Kasen IO
3910448367 Fix models not scaling correctly when loading due to timeout. 2020-06-11 15:36:13 -04:00
Kasen IO
8a2b6fcb0a Convert == to === in various places. 2020-06-10 19:18:25 -04:00
kasenvr
1d0cbe04c8
Update scripts/communityScripts/explore/explore.html 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-06-10 19:16:49 -04:00
Kasen IO
05837d178a Update Explore app to latest. 2020-06-10 13:33:33 -04:00
Kasen IO
6e7b3a387d Remove old goto, update community-apps beta link. 2020-06-10 02:54:42 -04:00
motofckr9k
3d05cdd61e Merge remote-tracking branch 'refs/remotes/kasen/master' 
Conflicts:
	BUILD_WIN.md
	CODING_STANDARD.md
	LICENSE
	cmake/installer/installer-header.bmp
	cmake/installer/installer.ico
	cmake/installer/uninstaller-header.bmp
	interface/resources/images/about-vircadia.png
	interface/resources/images/vircadia-logo.svg
	interface/resources/qml/LoginDialog.qml
	interface/resources/qml/dialogs/TabletLoginDialog.qml
	interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
	interface/src/Application.cpp
	pkg-scripts/athena-server.spec
	scripts/system/more/app-more.js
	scripts/system/more/css/styles.css
	scripts/system/more/more.html
 2020-06-10 02:49:13 +02:00
David Rowe
6df34d2a89 Reduce minimum inspect distance 2020-06-08 08:10:19 +12:00
Kasen IO
f1aa7391ec Fix test data. 2020-06-01 16:43:04 -04:00
Kasen IO
100bf3a91e Add .glb item type. 2020-06-01 15:41:09 -04:00
kasenvr
079c0c022e
Merge pull request #406 from kasenvr/fix/entity-size-on-create 
Bugfix: Create app now uses proper dimensions on create
 2020-06-01 12:40:50 -04:00
Kasen IO
778276bb43 Adjust how check is performed. 2020-05-30 20:56:28 -04:00
Kasen IO
3c21a4d3f6 Fix Create app using naturalDimensions for all entity types. 2020-05-30 19:58:54 -04:00
kasenvr
8157be5b5a
Merge pull request #405 from kasenvr/v0.86.0-k2.1 
Merge K2.1 into Master
 2020-05-30 18:49:38 -04:00
kasenvr
41c961198c
Merge pull request #369 from AleziaKurdis/feature/zonesSelectorSorted 
Zones Selector sorted by zone names
 2020-05-29 20:44:45 -04:00
Alezia Kurdis
0b330dfcd6
Zone selector sorting vs uppercases 
This makes the sorting of the Zone in the Zone selector
with the uppercase grouped with the lowercase for a same letter
but uppercase always first.
(Note: Accented char are considered as a different letter. We would need to support exception cases for all the existing charsets. These are only entities descriptors, not really for literature.)
 2020-05-28 23:32:44 -04:00
Kasen IO
83bbbbb8b1 Add distance display to share items menu. 2020-05-26 00:50:26 -04:00
David Rowe
b32bdba111 Reinstate controller module priorities per master 2020-05-26 14:58:27 +12:00
David Rowe
c05225ca2f Reinstate nearParentGrabOverlay controller module 
Fixes regression where tablet becomes large when grabbed if avatar is
small.
 2020-05-26 14:58:13 +12:00
Kasen IO
6c6a405020 Add periods and remove double copyright in tabletaboutdialog.qml 2020-05-25 16:41:16 -04:00
Kasen IO
a4bf1c4d82 Update copyright headers. 2020-05-25 15:59:43 -04:00
Alezia Kurdis
b7393b2398
Make the zones sort as case insensitive 
Make the sort of the zone selector to be case insensitive.
 2020-05-23 22:54:45 -04:00
Kasen IO
623857c0de Bump version number, add distance notice to receiving item. 2020-05-23 19:13:06 -04:00
humbletim
cb80c6be1a +app icon 2020-05-23 14:01:07 -04:00
Kasen IO
7e09b4c6a2 Styling of send item display name. 2020-05-23 12:09:40 -04:00
Kasen IO
172cfa9527 Fix send item display name. 2020-05-22 23:37:07 -04:00
motofckr9k
d406b81b47 Big rebrand 2020-05-22 20:35:27 +02:00
Alezia Kurdis
e6d092aefe
Code Adjustment 
Code Adjustment

{
    ...
    listExistingZones.sort(zoneSortOrder());
    return listExistingZones;
}

function zoneSortOrder() {
    return function(a, b) {
        if (a.name > b.name) {
            return 1;    
        } else if (a.name < b.name) {
            return -1;
        }
        return 0;
    }
}
 2020-05-21 22:13:33 -04:00
Kasen IO
5d75c177be Fix item inbox. 2020-05-21 21:17:11 -04:00
Kasen IO
301bc58e64 Fix folder finder. 2020-05-21 20:04:57 -04:00
Kasen IO
49cdfd7711 Update folder finder. 2020-05-21 19:52:43 -04:00
Kasen IO
259203dd9b Inbox now shows message if empty. 2020-05-21 19:21:11 -04:00
Kasen IO
a16e122c44 Comment out console.info's 2020-05-21 19:01:12 -04:00
Kasen IO
205830c383 Created event bus, fixed use item, receivingItemDialog non-working. 2020-05-21 18:50:53 -04:00
David Rowe
7634478aba Merge branch 'master' into feature/vive-pro-eye-tracking 2020-05-22 08:52:08 +12:00
Kasen IO
bb1f26d581 Update sorting for folders. 2020-05-20 18:39:52 -04:00
Kasen IO
42b82884b3 Update main sorting. 2020-05-20 18:32:59 -04:00
Alezia Kurdis
3023924cf1
Minor code adjustments 
Minor code adjustments
 2020-05-20 16:11:48 -04:00
Kasen IO
203095a999 Fix pushing management. 2020-05-20 15:38:36 -04:00
Kasen IO
ce1a1faf79 Fix copyright headers + some docs. 2020-05-20 15:02:03 -04:00
Kasen IO
8d9ad0aed4 Update More App to latest revision. 
More app now links to cdn.vircadia.com and also has a developer mode.
 2020-05-19 18:22:20 -04:00
Alezia Kurdis
3a0c4e1477
Zones Selector sorted by zone names 
This change makes the Zones Selector sorted by zone names.
To address issue: renderWithZones: zone list incorrectly sorted. #354
(But this doesn't fix the problem with the scrolling)
 2020-05-18 23:48:02 -04:00
kasenvr
7996698c8f
Merge branch 'master' into fix/other-renamings 2020-05-18 15:10:32 -04:00
Kasen IO
3c43207b0f Fix general folder movement. 2020-05-17 01:16:57 -04:00
Kasen IO
1b965dfc14 Latest not-working-state. 2020-05-16 23:35:24 -04:00
David Rowe
63ba8400f7 Merge branch 'master' into feature/vive-pro-eye-tracking 2020-05-16 11:23:38 +12:00
MotoFufu9k
dd9728a09f
Change standard grabbable setting to false 2020-05-13 23:06:36 +02:00
Alezia Kurdis
5d00341662
Correct value to ENTIRE_DOMAIN_SCAN_RADIUS 
Set the correct value to constant: ENTIRE_DOMAIN_SCAN_RADIUS

var ENTIRE_DOMAIN_SCAN_RADIUS = 27713;
to reach all the entities of a domain from the center,(including in the corners) the radius must be:
sqr((16000 ^2) + (16000) ^2 + (16000 ^2))
which is once rounded = to 27713.
 2020-05-09 15:24:18 -04:00
Alezia Kurdis
d575616a6d
Code Adjustments. 
Constant used for ENTIRE_DOMAIN_SCAN_RADIUS instead of 17000
Missing spaces,
and line too long being adjusted.
 2020-05-09 15:08:38 -04:00
Alezia Kurdis
6357dd91f5
Fix EOL from Windows to Unix 
Fix EOL from Windows to Unix
 2020-05-09 02:50:16 -04:00
Alezia Kurdis
c96591367b
Fix the wrong merge 2020-05-08 23:41:52 -04:00
Alezia Kurdis
74f7b324b8
Reconvert EOL to Unix style. 
Reconvert EOL to Unix style.
 2020-05-08 23:36:05 -04:00
Alezia Kurdis
637352052b
Merge branch 'master' into feature/renderWithZones-Create-UI 2020-05-08 15:20:31 -04:00
Alezia Kurdis
096bc40aa3
Merge the "screenshare" modifs 
Merge the "screenshare" modifs with renderWithZones update
 2020-05-08 15:16:38 -04:00
David Rowe
c6774016b5 Further fixes 2020-05-08 15:12:09 +12:00
David Rowe
395f950cb3 Fix whitespace and line endings in tabs.css 2020-05-08 14:59:01 +12:00
Alezia Kurdis
95562f7e23
Merged of "screenshare" and requested changes. 
1- Update some tooltips (changed "Set the" for "The")
for Lines: 9, 18, 24, 215, 325, 329, 332, 335, 611

2- Include merge for conflict (not detected by Github) for "screenshare" attribute
 2020-05-07 22:46:35 -04:00
Alezia Kurdis
91d234589e
Minor Code Adjustment 
Minor Code Adjustment
and uncommented the new property renderWithZones
 2020-05-06 23:39:11 -04:00
Alezia Kurdis
5180c9b247
Minor Code Adjustment 2020-05-06 23:36:39 -04:00
Alezia Kurdis
f43b0f52f5
Minor code adjustments 
Add missing space between ":" and the value for many class attributes.
 2020-05-06 23:16:56 -04:00
Alezia Kurdis
cc308c11b6
Minor Code Adjustment 
Line 50: removed extra space char.
 2020-05-06 23:06:33 -04:00
Alezia Kurdis
1671887602
Merge branch 'master' into kasen/core 2020-04-29 12:02:12 -04:00
Alezia Kurdis
962d4671eb
To avoid a regression at some point 2020-04-27 22:49:42 -04:00
Alezia Kurdis
c42734cba8
adding screenshare with the real file 2020-04-27 22:47:49 -04:00
Alezia Kurdis
75747a6a2f
to avoid regression 2020-04-27 22:20:19 -04:00
Alezia Kurdis
e850e6fe22
Adding field screenshare 
Adding field screenshare
to avoid conflict
 2020-04-27 22:05:24 -04:00
Seth Alves
10830cf68c recover from rebase errors 2020-04-26 14:50:43 -07:00
Seth Alves
3f249dfcd8 fix controller-module run order so that equip works again 2020-04-26 12:25:19 -07:00
Seth Alves
07034721c7 adjust when stylus input is active 2020-04-26 12:23:43 -07:00
Seth Alves
4f7252a0d8 enable and disable TranslateZ mapping, as needed 2020-04-26 12:23:43 -07:00
Seth Alves
a799d305ee don't mess with TranslateZ unless module is active 2020-04-26 12:23:43 -07:00
Seth Alves
600c2c3947 double OK to open/close tablet. touch thumb-tips to walk backwards 2020-04-26 12:23:43 -07:00
Seth Alves
865584e7e3 put tracked hand walk into a controller-dispatcher module 2020-04-26 12:23:40 -07:00
Seth Alves
63dcf0e1c9 use same near-grab module to grab entities and overlays 2020-04-26 12:22:53 -07:00
Seth Alves
17ceda0d3e quiet jshint 2020-04-26 12:22:53 -07:00
Seth Alves
5511b18432 don't allow the hand with the mini-tablet to trigger opening the tablet 2020-04-26 12:22:53 -07:00
Seth Alves
fa4d055ab1 disable far-trigger and grab if using hand tracker 2020-04-26 12:22:53 -07:00
Seth Alves
1c926db2db if hands are tracked, make mini-tablet be just a big open-tablet button (remove mute and goto buttons) 2020-04-26 12:22:53 -07:00
Seth Alves
296617977c get near-grab working with camera-tracked hands 2020-04-26 12:22:52 -07:00
Seth Alves
2c535fa204 touching tips of index-fingers together means walk forward 2020-04-26 12:22:50 -07:00
Seth Alves
3d4de67c49 allow thumb+index finger pinch to mean same as trigger click 2020-04-26 12:20:05 -07:00
kasenvr
5c2dab6ba5
Merge pull request #314 from kasenvr/kasen/core 
Update master with kasen/core's latest changes
 2020-04-25 14:46:01 -04:00
Kasen IO
d343589d16 Folder recursion safeguards established. 2020-04-24 03:16:31 -04:00
Kasen IO
3197ec12a5 Basic folder moving functionality, missing safeguards. 2020-04-24 02:52:05 -04:00
Kasen IO
35fe561ceb Fix deep iteration. 2020-04-24 01:14:11 -04:00