Skip to content

Commit

Permalink
Merge 71071c8 into b1db736
Browse files Browse the repository at this point in the history
  • Loading branch information
cyaiox authored Feb 5, 2024
2 parents b1db736 + 71071c8 commit 7797a78
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 9 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@dcl/crypto": "^3.4.5",
"@dcl/hashing": "^3.0.4",
"@dcl/mini-rpc": "^1.0.7",
"@dcl/schemas": "^9.4.1",
"@dcl/schemas": "^9.14.0",
"@dcl/sdk": "^7.3.41",
"@dcl/single-sign-on-client": "^0.1.0",
"@dcl/ui-env": "^1.5.0",
Expand Down
20 changes: 16 additions & 4 deletions src/components/ItemEditorPage/CenterPanel/CenterPanel.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,31 @@
import * as React from 'react'
import type { Wearable } from 'decentraland-ecs'
import { BodyShape, PreviewEmote, WearableCategory } from '@dcl/schemas'
import { Dropdown, DropdownProps, Popup, Icon, Loader, Center, EmoteControls, DropdownItemProps, Button } from 'decentraland-ui'
import { WearablePreview } from 'decentraland-ui/dist/components/WearablePreview/WearablePreview'
import {
Dropdown,
DropdownProps,
Popup,
Icon,
Loader,
Center,
EmoteControls,
DropdownItemProps,
Button,
WearablePreview
} from 'decentraland-ui'
import { t } from 'decentraland-dapps/dist/modules/translation/utils'
import { Color4 } from 'lib/colors'
import { isDevelopment } from 'lib/environment'
import { isTPCollection } from 'modules/collection/utils'
import { ItemType } from 'modules/item/types'
import { toBase64, toHex } from 'modules/editor/utils'
import { getSkinColors, getEyeColors, getHairColors } from 'modules/editor/avatar'
import BuilderIcon from 'components/Icon'
import { ControlOptionAction } from 'components/Modals/CreateSingleItemModal/EditThumbnailStep/EditThumbnailStep.types'
import { Color4 } from 'lib/colors'
import AvatarColorDropdown from './AvatarColorDropdown'
import AvatarWearableDropdown from './AvatarWearableDropdown'
import { Props, State } from './CenterPanel.types'
import './CenterPanel.css'
import { isDevelopment } from 'lib/environment'

export default class CenterPanel extends React.PureComponent<Props, State> {
state = {
Expand Down Expand Up @@ -245,6 +255,7 @@ export default class CenterPanel extends React.PureComponent<Props, State> {
} = this.props
const { isShowingAvatarAttributes, showSceneBoundaries, isLoading } = this.state
const isRenderingAnEmote = visibleItems.some(item => item.type === ItemType.EMOTE) && selectedItem?.type === ItemType.EMOTE
const zoom = emote === PreviewEmote.JUMP ? 1 : undefined

return (
<div className={`CenterPanel ${isImportFilesModalOpen ? 'import-files-modal-is-open' : ''}`}>
Expand All @@ -253,6 +264,7 @@ export default class CenterPanel extends React.PureComponent<Props, State> {
profile="default"
bodyShape={bodyShape}
emote={emote}
zoom={zoom}
skin={toHex(skinColor)}
eyes={toHex(eyeColor)}
hair={toHex(hairColor)}
Expand Down
3 changes: 3 additions & 0 deletions src/modules/translation/languages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,9 @@
"emotes": {
"wave": "Wave",
"idle": "Idle",
"run": "Run",
"walk": "Walk",
"jump": "Jump",
"clap": "Clap",
"dab": "Dab",
"dance": "Dance",
Expand Down
3 changes: 3 additions & 0 deletions src/modules/translation/languages/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@
"emotes": {
"wave": "Saludar",
"idle": "Inactivo",
"run": "Correr",
"walk": "Caminar",
"jump": "Saltar",
"clap": "Aplaudir",
"dab": "Dab",
"dance": "Bailar",
Expand Down
3 changes: 3 additions & 0 deletions src/modules/translation/languages/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@
"emotes": {
"wave": "打招呼",
"idle": "",
"run": "",
"walk": "",
"jump": "",
"clap": "",
"dab": "轻拍",
"dance": "",
Expand Down

0 comments on commit 7797a78

Please sign in to comment.