Compare commits

base: macniel:cb8536918cc6e44e5cc9c11539b73a97f7e4a2ce

Branches Tags

macniel:main

macniel:feature/applicationv2

macniel:feature/attribute-rolls

macniel:feature/group-table

macniel:feature/wounds

macniel:feature/meta

macniel:feature/spells

macniel:feature/basic-combat

macniel:feature/data-binding

macniel:0.7.0-rc

macniel:0.6.1

macniel:0.6.0

macniel:Reviewed-by-Tanja-0

macniel:0.5.1-rc1

macniel:0.5.0-rc2

macniel:0.5.0-rc1

macniel:0.4.1-rc1

macniel:0.4.0-rc4

macniel:0.4.0-rc3

macniel:0.4.0-rc2

macniel:0.4.0-rc1

macniel:0.3.3

macniel:0.3.2

macniel:0.3.1

macniel:0.3

macniel:0.2.5

macniel:0.1.10-import-test

macniel:0.1.9

macniel:0.1.8

macniel:0.1.7

macniel:0.1.5

macniel:0.1.0

macniel:0.0.1

macniel:0.0.1-snapshot

..

compare: macniel:2eb2e8f9b58bb83abc55444edace960af3f1ea8c

Branches Tags

macniel:main

macniel:feature/applicationv2

macniel:feature/attribute-rolls

macniel:feature/group-table

macniel:feature/wounds

macniel:feature/meta

macniel:feature/spells

macniel:feature/basic-combat

macniel:feature/data-binding

macniel:0.7.0-rc

macniel:0.6.1

macniel:0.6.0

macniel:Reviewed-by-Tanja-0

macniel:0.5.1-rc1

macniel:0.5.0-rc2

macniel:0.5.0-rc1

macniel:0.4.1-rc1

macniel:0.4.0-rc4

macniel:0.4.0-rc3

macniel:0.4.0-rc2

macniel:0.4.0-rc1

macniel:0.3.3

macniel:0.3.2

macniel:0.3.1

macniel:0.3

macniel:0.2.5

macniel:0.1.10-import-test

macniel:0.1.9

macniel:0.1.8

macniel:0.1.7

macniel:0.1.5

macniel:0.1.0

macniel:0.0.1

macniel:0.0.1-snapshot

No commits in common. "cb8536918cc6e44e5cc9c11539b73a97f7e4a2ce" and "2eb2e8f9b58bb83abc55444edace960af3f1ea8c" have entirely different histories.

cb8536918c ... 2eb2e8f9b5

674 changed files with 505 additions and 7301 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Expand all files Collapse all files

BIN

src/assets/armory/armory.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 13 KiB

BIN

src/assets/armory/armory_ase.ase

View File

Binary file not shown.

BIN

src/assets/armory/armory_cover.jpg

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 340 KiB

BIN

src/assets/armory/breastplate.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 647 B

BIN

src/assets/armory/chainmail_alt.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 642 B

BIN

src/assets/armory/chainmail_boots.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 582 B

BIN

src/assets/armory/chainmail_coif.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 607 B

BIN

src/assets/armory/chainmail_gloves.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 596 B

BIN

src/assets/armory/chainmail_jacket.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 740 B

BIN

src/assets/armory/chainmail_pants.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 662 B

BIN

src/assets/armory/cloak.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 503 B

BIN

src/assets/armory/close_helmet.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 563 B

BIN

src/assets/armory/cloth_gloves.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 511 B

BIN

src/assets/armory/cloth_hood.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 551 B

BIN

src/assets/armory/cloth_pants.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 508 B

BIN

src/assets/armory/cloth_robe.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 590 B

BIN

src/assets/armory/cloth_shoes.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 484 B

BIN

src/assets/armory/copper_ring.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 440 B

BIN

src/assets/armory/gauntlets.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 568 B

BIN

src/assets/armory/gold_ring.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 504 B

BIN

src/assets/armory/greaves.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 645 B

BIN

src/assets/armory/horned_helmet.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 534 B

BIN

src/assets/armory/iron_bracers.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 669 B

BIN

src/assets/armory/iron_buckler.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 482 B

BIN

src/assets/armory/iron_ring.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 480 B

BIN

src/assets/armory/kite_shield.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 562 B

BIN

src/assets/armory/leather_boots.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 584 B

BIN

src/assets/armory/leather_bracers.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 554 B

BIN

src/assets/armory/leather_cap.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 472 B

BIN

src/assets/armory/leather_gloves.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 517 B

BIN

src/assets/armory/leather_jacket.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 561 B

BIN

src/assets/armory/leather_jacket_alt.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 570 B

BIN

src/assets/armory/leather_pants.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 563 B

BIN

src/assets/armory/metal_buckler.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 627 B

BIN

src/assets/armory/platemail.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 601 B

BIN

src/assets/armory/platemail_helmet.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 579 B

BIN

src/assets/armory/platemail_pants.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 555 B

BIN

src/assets/armory/quilted_armor.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 548 B

BIN

src/assets/armory/silver_ring.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 487 B

BIN

src/assets/armory/studded_boots.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 579 B

BIN

src/assets/armory/studded_gloves.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 541 B

BIN

src/assets/armory/studded_helmet.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 521 B

BIN

src/assets/armory/studded_jacket.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 596 B

BIN

src/assets/armory/studded_jacket_alt.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 664 B

BIN

src/assets/armory/studded_pants.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 567 B

BIN

src/assets/armory/tattered_shirt.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 571 B

BIN

src/assets/armory/tile046.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 523 B

BIN

src/assets/armory/tile047.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 507 B

BIN

src/assets/armory/tile048.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 531 B

BIN

src/assets/armory/tile049.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 538 B

BIN

src/assets/armory/tower_shield.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 600 B

BIN

src/assets/armory/wood_kite_shield.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 630 B

BIN

src/assets/armory/wood_kite_shield_alt.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 613 B

BIN

src/assets/armory/wooden_buckler.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 509 B

BIN

src/assets/arsenal/arrow1.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 472 B

BIN

src/assets/arsenal/arrow1border.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 495 B

BIN

src/assets/arsenal/arrow2.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 485 B

BIN

src/assets/arsenal/arrow2border.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 504 B

BIN

src/assets/arsenal/arrow3.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 584 B

BIN

src/assets/arsenal/arrow3border.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 561 B

BIN

src/assets/arsenal/axe1.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 602 B

BIN

src/assets/arsenal/axe1border.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 564 B

BIN

src/assets/arsenal/axe2.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 531 B

BIN

src/assets/arsenal/axe2border.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 517 B

BIN

src/assets/arsenal/axe3.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 607 B

BIN

src/assets/arsenal/axe3border.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 548 B

BIN

src/assets/arsenal/axe4.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 528 B

BIN

src/assets/arsenal/axe4border.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 512 B

BIN

src/assets/arsenal/axe5.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 424 B

BIN

src/assets/arsenal/axe5border.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 627 B

BIN

src/assets/arsenal/bow1.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 509 B

BIN

src/assets/arsenal/bow1border.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 499 B

BIN

src/assets/arsenal/bow2.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 508 B

BIN

src/assets/arsenal/bow2border.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 508 B

BIN

src/assets/arsenal/bow3.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 513 B

BIN

src/assets/arsenal/bow3border.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 514 B

BIN

src/assets/arsenal/bow4.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 580 B

BIN

src/assets/arsenal/bow4border.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 551 B

BIN

src/assets/arsenal/chakram.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 605 B

BIN

src/assets/arsenal/chakramborder.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 583 B

BIN

src/assets/arsenal/club1.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 475 B

BIN

src/assets/arsenal/clubborder.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 485 B

BIN

src/assets/arsenal/crossbow1.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 582 B

BIN

src/assets/arsenal/crossbow1border.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 570 B

BIN

src/assets/arsenal/crossbow2.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 657 B

BIN

src/assets/arsenal/crossbow2border.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 597 B

BIN

src/assets/arsenal/crossbow3.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 666 B

BIN

src/assets/arsenal/crossbow3border.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 602 B

BIN

src/assets/arsenal/dagger1.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 558 B

BIN

src/assets/arsenal/dagger1border.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 542 B

BIN

src/assets/arsenal/dagger2.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 527 B

BIN

src/assets/arsenal/dagger2border.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 533 B

BIN

src/assets/arsenal/dagger3.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 520 B

BIN

src/assets/arsenal/dagger3border.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 535 B

BIN

src/assets/arsenal/dagger4.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 503 B

BIN

src/assets/arsenal/dagger4border.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 519 B

BIN

src/assets/arsenal/dagger5.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 568 B

BIN

src/assets/arsenal/dagger5border.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 572 B

BIN

src/assets/arsenal/flail.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 659 B

BIN

src/assets/arsenal/flailborder.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 602 B

Some files were not shown because too many files have changed in this diff Show More