Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

T

TMW Clientdata
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

4c1ce2e8

Commit 4c1ce2e8 authored 6 years ago by Micksha

Downloads
- Plain Diff

Merge branch 'mobs' into 'master'

Add beehive to 008-1-1 and various gems to 008-3-0 (for testing)

See merge request evol/clientdata!74

parents 90a5603d 730794f3

Loading

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

graphics/sprites/monsters/beehive.xml 22 additions, 0 deletions

graphics/sprites/monsters/beehive.xml
graphics/sprites/npcs/sprite/koga.png 0 additions, 0 deletions

graphics/sprites/npcs/sprite/koga.png
graphics/sprites/npcs/xml/koga.xml 3 additions, 3 deletions

graphics/sprites/npcs/xml/koga.xml
maps/008-1-1.tmx 32 additions, 8 deletions

maps/008-1-1.tmx
maps/008-3-0.tmx 60 additions, 11 deletions

maps/008-3-0.tmx
monsters.xml 3 additions, 0 deletions

monsters.xml

with 120 additions and 22 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