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

affd9148

Commit affd9148 authored 1 year ago by Andrest07

Downloads
- Plain Diff

Merge branch 'Combat-Extended' into dev

parents f39aaa4f d1cb3ccb

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

game/04-Variables/variables-versionUpdate.twee 9 additions, 18 deletions

game/04-Variables/variables-versionUpdate.twee
game/base-combat/actions-hands.twee 6 additions, 0 deletions

game/base-combat/actions-hands.twee
game/base-combat/actions-text.twee 56 additions, 0 deletions

game/base-combat/actions-text.twee
game/base-combat/effects.twee 82 additions, 0 deletions

game/base-combat/effects.twee
game/base-combat/widgets.twee 11 additions, 2 deletions

game/base-combat/widgets.twee
game/base-system/overlays/statistics.twee 4 additions, 0 deletions

game/base-system/overlays/statistics.twee
game/base-system/settings.twee 5 additions, 5 deletions

game/base-system/settings.twee

with 173 additions and 25 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