Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Degrees of Lewdity Plus
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

83503d05

Commit 83503d05 authored 5 years ago by Vrelnir

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Combat NPC Individual Knockout Cleanup and Various Bugfix

See merge request !217

parents 4d35eb13 deb5260c

No related branches found

No related tags found

No related merge requests found

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

game/base-combat/beast.twee 8 additions, 33 deletions

game/base-combat/beast.twee
game/base-combat/npc-damage.twee 2 additions, 16 deletions

game/base-combat/npc-damage.twee
game/base-combat/npc-generation.twee 220 additions, 1159 deletions

game/base-combat/npc-generation.twee
game/base-debug/debug.twee 1 addition, 1 deletion

game/base-debug/debug.twee
game/base-debug/test encounters.twee 82 additions, 0 deletions

game/base-debug/test encounters.twee
game/base-system/text.twee 17 additions, 91 deletions

game/base-system/text.twee
game/overworld-town/loc-brothel/main.twee 0 additions, 10 deletions

game/overworld-town/loc-brothel/main.twee
game/overworld-town/special-leighton/main.twee 1 addition, 1 deletion

game/overworld-town/special-leighton/main.twee

with 331 additions and 1311 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