Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-07 10:02:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #604 from AleziaKurdis/534_601_Default_images

Browse source 
New URL for default Particle and Image resource
This commit is contained in:
daleglass 2020-08-20 23:26:45 +02:00 committed by GitHub
commit 90c957c9e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/system/create/edit.js
View file

@ -44,7 +44,8 @@ var CREATE_TOOLS_WIDTH = 490;
var MAX_DEFAULT_ENTITY_LIST_HEIGHT = 942;
var ENTIRE_DOMAIN_SCAN_RADIUS = 27713;
var DEFAULT_IMAGE = "https://hifi-content.s3.amazonaws.com/DomainContent/production/no-image.jpg";
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";
var createToolsWindow = new CreateWindow(
Script.resolvePath("qml/EditTools.qml"),
@ -436,7 +437,7 @@ const DEFAULT_ENTITY_PROPERTIES = {
ParticleEffect: {
lifespan: 1.5,
maxParticles: 10,
textures: "https://content.highfidelity.com/DomainContent/production/Particles/wispy-smoke.png",
textures: DEFAULT_PARTICLE,
emitRate: 5.5,
emitSpeed: 0,
speedSpread: 0,