Repository navigation
add armadillo and goat - #851
Merged
Merged
Conversation
…sync # Conflicts: # pomme-client/src/app/core.rs # pomme-client/src/app/phases/in_game.rs # pomme-client/src/entity/mod.rs # pomme-client/src/renderer/entity_model.rs # pomme-client/src/renderer/pipelines/entity_renderer.rs # tests/ingame/entities/dolphin.toml # tests/ingame/entities/parrot.toml
github-actions
Bot
added
the
merge conflict
…lo-goat-sync # Conflicts: # pomme-client/src/app/core.rs # pomme-client/src/net/mod.rs
github-actions
Bot
removed
the
merge conflict
github-actions
Bot
added
the
merge conflict
# Conflicts: # pomme-client/src/app/phases/in_game.rs # pomme-client/src/entity/mod.rs # pomme-client/src/renderer/entity_model.rs # pomme-client/src/renderer/pipelines/entity_renderer.rs
github-actions
Bot
removed
the
merge conflict
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds armadillo and goat models, animations and synced data, with the armadillo peek and goat ram events, plus in-game scripts for both.