Commit graph

83679 commits

Author SHA1 Message Date
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
44cc060200
Merge pull request #4 from kasenvr/master
Make it even
2020-09-09 22:18:18 -04:00
kasenvr
7a686d95e0
Merge pull request #671 from ctrlaltdavid/fix/gltf-blendshapes
Fix and extend glTF blendshapes support
2020-09-03 13:57:57 -04:00
kasenvr
b9e72b803d
Merge pull request #653 from kasenvr/fix/osx-folder-icons
Update OSX folder icons to Vircadia & OSX build docs
2020-09-02 21:54:05 -04:00
kasenvr
bbc5044451
Merge pull request #639 from ctrlaltdavid/enhancement/domain-login-items
Don't display domain log-in items unless relevant
2020-09-02 18:51:14 -04:00
kasenvr
e2c5504be4
Merge pull request #441 from odysseus654/pr/cxx-crashing
improve crashpad reporting of unhandled c++ exceptions
2020-09-02 18:51:01 -04:00
kasenvr
c7fbddf024
Merge pull request #631 from vegaslon/bug/TestFixAvatarApp
Test moving to qt image error handling in avatar app
2020-09-02 18:50:31 -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
04aabff8c7
Merge pull request #672 from ctrlaltdavid/fix/relative-json-tidy
Tidy JSON relative URLs importing code
2020-09-02 18:48:35 -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
David Rowe
9fc9b203ae Rename constant 2020-09-02 12:45:44 +12:00
Kalila L
b8181d92a5 Merge branch 'master' into pr/441 2020-09-01 17:42:35 -04:00
David Rowe
2bfdaa31ab Add FIXME for missing relative URL handling case 2020-09-02 09:20:35 +12:00
David Rowe
4214182b2f Tidy JSON relative URLs importing 2020-09-01 21:08:52 +12:00
kasenvr
f2cc30d6d9
Merge pull request #276 from HifiExperiments/parenting
Improving performance of entity updates
2020-09-01 04:34:51 -04:00
kasenvr
6a872ef525
Merge pull request #586 from makitsune/relative-urls
Allow resolving relative urls when importing entities json
2020-09-01 04:34:12 -04:00
kasenvr
e4a80a9931
Merge pull request #465 from kasenvr/feature/domain-metadata-exporter
Domain Metadata Exporter
2020-08-31 18:08:37 -04:00
David Rowe
22e6ae9710 Fix hasBlendedMeshes() value 2020-08-31 21:44:19 +12:00
David Rowe
bd1be872a8 Support using blendshapes in file without needing an FST 2020-08-31 21:31:55 +12:00
David Rowe
0fcc73d5cd Fix multiple blendshapes targeted to one model blendshape 2020-08-31 11:20:56 +12: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
David Rowe
5d02e0fe28 Fix blendshapes on planar meshes 2020-08-29 16:12:10 +12:00
David Rowe
128745ef36 Make blendshapes work for glTF with multiple mesh parts 2020-08-29 16:11:35 +12:00
David Rowe
a819b140dc Don't weight blendshapes by default blendshape values 2020-08-29 14:17:54 +12:00
David Rowe
f946791791 Make blendshaps work for glTF with single mesh part 2020-08-29 14:17:13 +12:00
David Rowe
77dbe7a254 Rename FACESHIFT_BLENDSHAPES to BLENDSHAPE_NAMES 2020-08-29 11:21:56 +12:00
David Rowe
e0767e2f8c Add HFM model dump for FBX files 2020-08-29 11:02:54 +12:00
David Rowe
98cef38aea Initial tidying 2020-08-29 09:14:49 +12:00
daleglass
c099cfe904
Merge pull request #652 from kasenvr/kasenvr-patch-1
Update BUILD.md
2020-08-27 23:39:31 +02:00
daleglass
0f6f788879
Merge pull request #641 from ArcadeFever/fix/AC-placeholder-rebrand
changed url for AC script examples from HiFi to Vircadia github
2020-08-27 23:34:58 +02: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
kasenvr
fabf8e9879
Add FAQ to BUILD_OSX.md 2020-08-27 03:40:05 -04:00
Kalila L
bfdcdee96b Attempt to fix isInEditMode error on line 780. 2020-08-27 01:52:21 -04:00
kasenvr
374b36539a
Update BUILD_OSX.md 2020-08-26 14:32:12 -04:00
kasenvr
693416cd0d
Update BUILD.md 2020-08-26 04:07:57 -04:00
Kalila L
9f8107006e Update OSX build instructions. 2020-08-25 03:36:51 -04:00
Kalila L
ca15adc0da Update OSX folder icons to Vircadia. 2020-08-25 03:25:00 -04:00
kasenvr
a4bea1ce30
Update BUILD.md 2020-08-25 01:11:12 -04:00