Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

spnati
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

4809eef2

Commit 4809eef2 authored 5 years ago by FarawayVision

Downloads
- Plain Diff

Merge branch 'bot-update-catria' into 'master'

Catria bug fixes & add some filtered lines and collectibles

See merge request spnati/spnati.gitlab.io!1558

parents a6bf4736 5cc2ece4

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

opponents/catria/behaviour.xml 347 additions, 86 deletions

opponents/catria/behaviour.xml
opponents/catria/collectable_NakedArmor.png 3 additions, 0 deletions

opponents/catria/collectable_NakedArmor.png
opponents/catria/collectable_armor.png 3 additions, 0 deletions

opponents/catria/collectable_armor.png
opponents/catria/collectable_bear.png 3 additions, 0 deletions

opponents/catria/collectable_bear.png
opponents/catria/collectable_sleepy.png 3 additions, 0 deletions

opponents/catria/collectable_sleepy.png
opponents/catria/collectable_triAtk.png 3 additions, 0 deletions

opponents/catria/collectable_triAtk.png
opponents/catria/collectable_whiteWings.png 3 additions, 0 deletions

opponents/catria/collectable_whiteWings.png
opponents/catria/collectibles.xml 24 additions, 0 deletions

opponents/catria/collectibles.xml
opponents/catria/markers.xml 7 additions, 0 deletions

opponents/catria/markers.xml
opponents/catria/meta.xml 4 additions, 1 deletion

opponents/catria/meta.xml

with 400 additions and 87 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment