Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

core
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

fa30e730

Commit fa30e730 authored 4 years ago by Malin Freeborn

Downloads
- Plain Diff

Merge branch 'dev' into mp

parents 769d7519 a9ad9c12

Loading

Changes 16

Show whitespace changes

Inline Side-by-side

Showing

Makefile 1 addition, 1 deletion

Makefile
README.md 3 additions, 3 deletions

README.md
cc.tex 74 additions, 15 deletions

cc.tex
combat.tex 58 additions, 23 deletions

combat.tex
config/monsters.sty 3 additions, 2 deletions

config/monsters.sty
gm.tex 27 additions, 5 deletions

gm.tex
gods.tex 12 additions, 2 deletions

gods.tex
intro.tex 9 additions, 3 deletions

intro.tex
knacks.tex 14 additions, 5 deletions

knacks.tex
main.tex 4 additions, 1 deletion

main.tex
races.tex 60 additions, 24 deletions

races.tex
rules.tex 50 additions, 18 deletions

rules.tex
spheres.tex 16 additions, 7 deletions

spheres.tex
stories.tex 39 additions, 14 deletions

stories.tex
story/11-ram.tex 1 addition, 1 deletion

story/11-ram.tex
story/16-stories.tex 2 additions, 2 deletions

story/16-stories.tex

with 373 additions and 126 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