[Port]Wonder delta #812

trest100 · 2024-10-02T09:37:09Z

Описание PR

Перенос карты WonderDelta

Медиа

Тип PR

Изменения

github-actions · 2024-10-02T09:37:55Z

RSI Diff Bot; head commit 42c6b7e merging into f0330e5
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_Ataraxia/Furniture/Altars/Cults/bananium.rsi

State	Old	New	Status
full			Added

Resources/Textures/_Ataraxia/Furniture/Benches/parkbench_bamboo.rsi

State	Old	New	Status
left			Added
middle			Added
right			Added

Resources/Textures/_Ataraxia/Furniture/Benches/parkbench_wooden.rsi

State	Old	New	Status
left			Added
middle			Added
right			Added

Resources/Textures/_Ataraxia/Furniture/Benches/pews.rsi

State	Old	New	Status
arm_left			Added
arm_right			Added
left			Added
middle			Added
right			Added

Resources/Textures/_Ataraxia/Furniture/Benches/sofa.rsi

State	Old	New	Status
arm_left			Added
arm_right			Added
corner			Added
corner_out			Added
left			Added
middle			Added
right			Added

Resources/Textures/_Ataraxia/Furniture/Benches/sofa_corp.rsi

State	Old	New	Status
arm_left			Added
arm_right			Added
corner			Added
corner_out			Added
left			Added
middle			Added
right			Added

Resources/Textures/_Ataraxia/Furniture/Benches/steel_bench.rsi

State	Old	New	Status
left			Added
middle			Added
right			Added

Resources/Textures/_Ataraxia/Furniture/Benches/steel_bench_white.rsi

State	Old	New	Status
left			Added
middle			Added
right			Added

Resources/Textures/_Ataraxia/Furniture/Tables/wood.rsi

State	Old	New	Status
full			Added
state_0			Added
state_1			Added
state_2			Added
state_3			Added
state_4			Added
state_5			Added
state_6			Added
state_7			Added

Resources/Textures/_Ataraxia/Furniture/bookshelf.rsi

State	Old	New	Status
base			Added
book-0			Added
book-1			Added
book-10			Added
book-11			Added
book-12			Added
book-13			Added
book-14			Added
book-15			Added
book-16			Added
book-17			Added
book-18			Added
book-19			Added
book-2			Added
book-20			Added
book-3			Added
book-4			Added
book-5			Added
book-6			Added
book-7			Added
book-8			Added
book-9			Added
empty			Added
smooth			Added

Resources/Textures/_Ataraxia/Furniture/furniture.rsi

State	Old	New	Status
dresser			Added

Edit: diff updated after 42c6b7e

github-actions · 2024-10-13T13:43:45Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-13T13:45:09Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-13T14:11:53Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-13T14:13:34Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-13T14:18:50Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-13T14:29:59Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-13T14:42:49Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-13T14:58:22Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-13T16:09:53Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-13T16:10:30Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-13T17:03:23Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-13T17:21:51Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-13T18:12:30Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-14T16:25:41Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-15T12:00:30Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-15T15:51:35Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-15T16:15:55Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-15T17:54:04Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-15T23:38:53Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-17T08:56:27Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-17T09:08:36Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-18T10:43:40Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-18T13:34:20Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-19T07:40:11Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-19T08:05:18Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-19T10:30:50Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-19T10:53:35Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-19T13:44:27Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-20T03:33:38Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-20T03:39:48Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-20T04:12:16Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-20T04:37:42Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-20T05:04:05Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-20T08:25:37Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-20T08:29:26Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-20T08:37:08Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-20T08:56:51Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-20T10:55:40Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-20T11:08:14Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-20T11:14:42Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-20T18:13:54Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-10-20T21:23:27Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

coderabbitai · 2024-12-30T21:56:19Z

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>, please review it.
- Generate unit testing code for this file.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai generate unit testing code for this file.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read src/utils.ts and generate unit testing code.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

github-actions · 2024-12-31T10:31:37Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

trest100 added 2 commits October 2, 2024 12:36

Update RobustToolbox

97c032a

Delta + divani

42c6b7e

trest100 requested a review from Rxup as a code owner October 2, 2024 09:37

trest100 marked this pull request as draft October 2, 2024 09:37

github-actions bot added Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping. No C# Нету кода. labels Oct 2, 2024

github-actions bot added the MERGE CONFLICT ПИЗДА! label Oct 13, 2024

trest100 closed this Oct 20, 2024

KayzelW reopened this Dec 30, 2024

github-actions bot added the size/XL label Dec 30, 2024

KayzelW added Derelict Про PR забыли :( and removed size/XL labels Dec 30, 2024

KayzelW added the size/XL label Dec 30, 2024

github-actions bot added the S: Merge Conflict label Dec 31, 2024

[Port]Wonder delta #812

Are you sure you want to change the base?

[Port]Wonder delta #812

Conversation

trest100 commented Oct 2, 2024

Описание PR

Медиа

Тип PR

github-actions bot commented Oct 2, 2024 • edited Loading

github-actions bot commented Oct 13, 2024

github-actions bot commented Oct 13, 2024

github-actions bot commented Oct 13, 2024

github-actions bot commented Oct 13, 2024

github-actions bot commented Oct 13, 2024

github-actions bot commented Oct 13, 2024

github-actions bot commented Oct 13, 2024

github-actions bot commented Oct 13, 2024

github-actions bot commented Oct 13, 2024

github-actions bot commented Oct 13, 2024

github-actions bot commented Oct 13, 2024

github-actions bot commented Oct 13, 2024

github-actions bot commented Oct 13, 2024

github-actions bot commented Oct 14, 2024

github-actions bot commented Oct 15, 2024

github-actions bot commented Oct 15, 2024

github-actions bot commented Oct 15, 2024

github-actions bot commented Oct 15, 2024

github-actions bot commented Oct 15, 2024

github-actions bot commented Oct 17, 2024

github-actions bot commented Oct 17, 2024

github-actions bot commented Oct 18, 2024

github-actions bot commented Oct 18, 2024

github-actions bot commented Oct 19, 2024

github-actions bot commented Oct 19, 2024

github-actions bot commented Oct 19, 2024

github-actions bot commented Oct 19, 2024

github-actions bot commented Oct 19, 2024

github-actions bot commented Oct 20, 2024

github-actions bot commented Oct 20, 2024

github-actions bot commented Oct 20, 2024

github-actions bot commented Oct 20, 2024

github-actions bot commented Oct 20, 2024

github-actions bot commented Oct 20, 2024

github-actions bot commented Oct 20, 2024

github-actions bot commented Oct 20, 2024

github-actions bot commented Oct 20, 2024

github-actions bot commented Oct 20, 2024

github-actions bot commented Oct 20, 2024

github-actions bot commented Oct 20, 2024

github-actions bot commented Oct 20, 2024

github-actions bot commented Oct 20, 2024

coderabbitai bot commented Dec 30, 2024

Review skipped

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

github-actions bot commented Dec 31, 2024

github-actions bot commented Oct 2, 2024 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)