Skip to content

Spinnamajig and assorted deco items#1532

Open
Loqor wants to merge 15 commits intomainfrom
feat/spinny-thing
Open

Spinnamajig and assorted deco items#1532
Loqor wants to merge 15 commits intomainfrom
feat/spinny-thing

Conversation

@Loqor
Copy link
Member

@Loqor Loqor commented May 2, 2025 •
edited by drtheodor
Loading

About the PR

Why / Balance

Technical details

Media

Requirements

Breaking changes

Changelog

🆑

  • add: Spinnamajig and assorted deco items

MaketendoDev and others added 13 commits March 3, 2025 21:44
@MaketendoDev
feat: baseline for spin
41d29f0
@MaketendoDev
fix: unfinished code
33cd7cb
@MaketendoDev
fix: rendering (I cannot be bothered to find out how camels do their …
cfbc8bc 
…animations)
@Saturnorsomthing
chore: added the textures for the variants thingy
53f1ff3
@MaketendoDev
feat: animations almost
8e76b8d
@MaketendoDev
Merge remote-tracking branch 'origin/feat/spinny-thing' into feat/spi…
8dd4520 
…nny-thing
@Loqor
Merge branch 'main' into feat/spinny-thing
9ed0735 
# Conflicts:
#	src/main/java/dev/amble/ait/client/models/consoles/RenaissanceConsoleModel.java
#	src/main/java/dev/amble/ait/datagen/AITModDataGenerator.java
@Loqor
fix: readd psychic paper
ce2312a 
fmt
@Loqor
fmt
96a4407
@Loqor
Merge branch 'main' into feat/spinny-thing
97dae3b
@Loqor
fix: updated gallifreyan (it said gay now it says ait)
5f10863 
(casually pulling a white house)
@Loqor
Merge branch 'main' into feat/spinny-thing
c525f66
@Loqor
fix: readd new animations, animate the rotor, and fix the hitbox
455511b
@Loqor Loqor requested review from a team as code owners May 2, 2025 02:02
@github-actions github-actions bot added S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. size/M Denotes a PR that changes 100-999 lines. S: Needs Review Status: Requires additional reviews before being fully accepted. C: Textures Changes: Might require knowledge of spriting or visual design. and removed S: Needs Review Status: Requires additional reviews before being fully accepted. labels May 2, 2025
@GSMPBot GSMPBot requested review from drtheodor and duzos May 2, 2025 02:02
@Loqor Loqor self-assigned this May 2, 2025
@github-actions github-actions bot added the S: Needs Review Status: Requires additional reviews before being fully accepted. label May 2, 2025
@Loqor Loqor added S: DO NOT MERGE Status: Open item that should NOT be merged. DNM. Allows test to run unlike draft. and removed S: Needs Review Status: Requires additional reviews before being fully accepted. labels May 2, 2025
@github-actions github-actions bot added the C: Audio Changes: Might require knowledge of audio. label May 2, 2025
@drtheodor drtheodor removed the S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. label Jun 4, 2025
@drtheodor drtheodor added A: General Interactions Area: General in-game interactions that don't relate to another area. T: New Feature Type: New feature or content, or extending existing content. S: Conceptual Approval Status: Discussed by maintainers and has conceptual approval, but needs code review. S: Art Approval Status: The art (e.g. textures) has been approved by an art lead. labels Jun 4, 2025
@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted. label Sep 7, 2025
@github-actions
Copy link

github-actions bot commented Sep 7, 2025

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

@github-actions github-actions bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted. label Sep 7, 2025
@github-actions
Copy link

github-actions bot commented Oct 25, 2025

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

@github-actions github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted. label Oct 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@drtheodor drtheodor Awaiting requested review from drtheodor

@duzos duzos Awaiting requested review from duzos

At least 1 approving review is required to merge this pull request.

Assignees

@Loqor Loqor

Labels

A: General Interactions Area: General in-game interactions that don't relate to another area. C: Audio Changes: Might require knowledge of audio. C: Textures Changes: Might require knowledge of spriting or visual design. S: Art Approval Status: The art (e.g. textures) has been approved by an art lead. S: Conceptual Approval Status: Discussed by maintainers and has conceptual approval, but needs code review. S: DO NOT MERGE Status: Open item that should NOT be merged. DNM. Allows test to run unlike draft. S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted. size/M Denotes a PR that changes 100-999 lines. T: New Feature Type: New feature or content, or extending existing content.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Loqor @drtheodor @MaketendoDev @Saturnorsomthing