Commit graph

8596 commits

Author SHA1 Message Date
kasenvr
87d4fddb40
Merge branch 'master' into feature/transparent-web-entities 2020-09-26 01:25:02 -04:00
Kalila L
2c1a51e7c4 Remove inventory app from defaultScripts.js 2020-09-24 16:03:27 -04:00
Kalila L
a50918b723 Merge branch 'master' into fix/URL-migrations 2020-09-23 18:56:50 -04:00
Kalila L
ed5a7e82d7 Fix default URLs for edit.js 2020-09-23 01:57:00 -04:00
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
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
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
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