Commit graph

36 commits

Author SHA1 Message Date
Subhraman Sarkar
95c62173a3
Bengali logo for Wesnoth (#8513)
* wesnoth logo localized to bengali

* update copyright
2024-03-07 18:26:50 +05:30
doofus-01
2eeccd98d8
skeletal rider and alternative bear portraits (#8453)
* skeletal rider portrait

* alternative bear portrait
2024-02-25 08:40:47 -08:00
pentarctagon
bbd7f6aabc Update copyrights file
also explicitly specify encoding
2024-02-24 11:43:14 -06:00
Charles Dang
e8e082edc5 Copyright update for 8ea8b6c7c3 2024-02-23 17:00:53 -05:00
Toom
925dd0d3a4
Add a composite hero/leader ellipse, closes #8011 closes #6258 (#8375) 2024-02-10 14:29:32 -06:00
pentarctagon
9b004bcb9f use correct name 2024-02-08 09:22:19 -06:00
P. J. McDermott
1f1a68e94e Check for and fix copyrights.csv rows with wrong numbers of fields
This should prevent accidental uses of commas in fields without quotes.
It would have caught the previous issue of str.join() not quoting fields
that contain commas.  For now though, it found a different issue: three
rows added in commit c631345314 had duplicated MD5 fields.
2024-02-07 11:12:55 +01:00
P. J. McDermott
5a048ad303 Fix how update_copyrights writes fields with commas
str.join() isn't smart enough to quote CSV fields when necessary, so
a field containing field separators (commas) would get parsed by the
second update_copyrights run as multiple fields.  Upon finding some rows
containing an extra field, the csv.reader() object then added an extra
blank field to each of all the other rows.

Use csv.writer() instead of str.join() to write proper CSV output.

This commit also undoes the removal of commas from fields that was
necessary in commit 676c1fa2b9.
2024-02-07 11:12:55 +01:00
pentarctagon
676c1fa2b9 copyrights update 2024-02-04 10:56:03 -06:00
P. J. McDermott
4c87a4be74 Fix license on LordBob's portraits, and check licenses
Commit 97c8feb8ca (pull #7903) specified for 58 of LordBob's portraits
a license of "GNU GPL v2+;CC BY-SA 4.0".  I don't know if the semicolon
is supposed to mean "and" or "or".

"And" (e.g. a GNU GPL v2+ file with CC BY-SA 4.0 modifications) isn't
legally possible.  "Or" appears incorrect, because LordBob [licensed][1]
his portraits under "the GNU GPL" and I can't find any evidence of him
also licensing them under CC BY-SA 4.0.

Also make update_copyrights check for possibly invalid licenses like
"GNU GPL v2+;CC BY-SA 4.0".

[1]: https://forums.wesnoth.org/viewtopic.php?p=329342#p329342
2024-01-30 21:20:10 -06:00
P. J. McDermott
efad8a0f74 Fix and check copyrights.csv "Needs Update" field
Commit 97c8feb8ca (pull #7903) included a comma in the "Notes" field
of four files, which instead of being enclosed in quotes, overflowed
into the "Needs Update" field.  So if those files are updated,
update_copyrights would clobber part of the notes.

Commit 1ecd4f4d59 (pull #8195) updated the "Date" field but didn't
clear "Needs Update" after update_copyrights set "Needs Update" and
"MD5" for data/core/images/units/monsters/raven/harbinger.png.

Make update_copyrights check for and warn about "Needs Update" instead
of clobbering it.  This should trigger CI failures if someone forgets
to update a row or accidentally puts into the "Needs Update" field
important information that shouldn't be clobbered on future updates.
2024-01-30 21:20:10 -06:00
doofus-01
1ecd4f4d59
1.18 - various minor monster updates (#8195)
* various minor monster sprite updates

* small fixes to wolf portraits, jumping spider portraits

* NE anims for jumping spider

* adding zombie fish, zombie bug
2024-01-15 12:25:38 -08:00
doofus-01
937d5cbd9e
1.18 Peasant animations (#8194)
* add peasant death anim

* N/S directional peasant attack frames

* update copyrights
2024-01-07 12:10:57 -08:00
doofus-01
508c627543
1.18 - Revise new skeleton sprites (#8156)
* replace skeleton rider, bone knight, and death squire sprites

* update squire to use axe

* fix death knight attack icon

* sprite palette cleanup
2023-12-31 08:33:12 -08:00
doofus-01
963029dd7c
1.18 - graphics for elder falcon (#8165)
* portrait for elder falcon

* elder falcon attack anims

* fix a couple typos in Falcon attack anim

* elder falcon defense anims

* update copyrights.csv (twice, as per the new policy)
2023-12-29 05:44:15 -08:00
Steve Cotton
e07acf71dc Check that copyrights.csv is sorted by filename
When the tool finds new or changed files, it puts them at the top of
the output .csv file for easy editing. However, this means that those
lines move when update_copyrights is run again. It also means that any
two PRs touching images are likely to have merge conflicts, as they'll
change line 2 of copyrights.csv.

Make the CI fail unless the file has been sorted again after editing.
2023-12-28 13:01:11 +01:00
doofus-01
46b992ee67 update copyrights.csv 2023-12-26 18:26:27 -08:00
doofus-01
9cf76e4d72 update copyrights.csv 2023-12-23 04:08:55 -08:00
doofus-01
9f55aa33b9 update copyrights.csv (and correct soldier ant portrait info) 2023-12-17 19:10:52 -08:00
Steve Cotton
c631345314 Update the copyright info for the Finnish help images
Move the previous addition of the UtBS blowgun into sort-by-filename order.

Correct copyright of orb-two-color.png, as it was based on orb.png.
2023-12-16 15:51:43 +01:00
pentarctagon
7c219ab9a4 fixup 2023-12-10 22:08:49 -06:00
pentarctagon
1c814e47d5 copyrights update 2023-12-10 22:07:17 -06:00
doofus-01
c5c92c2afd
1.18 - Sprite updates to Ravens and Ants (#8089)
* fix raven SE sprite wings

* revisions to fire ant sprites to make more distinct from each other

* fix flame positioning

* minor soldier ant sprite update

* add IPF arg to MISSILE_FRAME_FIRE_BREATH for use in fire ants

* update copyrights.csv
2023-12-10 18:28:08 -08:00
doofus-01
b046d93350
touchup wall-rough-chasm to fix #8001 (#8022) 2023-11-04 15:10:02 -07:00
doofus-01
f5fce3437b
touchup to direwolf defense frames (#8017)
* touch-up to direwolf defense frames fixes #8003 

* copyrights.csv
2023-11-04 08:28:37 -07:00
doofus-01
50a21a2c6c
1.18 - Some loyalist animation updates (#7999)
* some Swordsman anim updates

* simple breeze anim for Cavalier

* breeze anim for paladin

* dragoon xbow anim

* fixes #7257

* update copyrights.csv
2023-10-29 17:45:09 -07:00
doofus-01
9fffd88242
Various terrain fixes and additions (#7972)
* fix Xor/Xo* south corner transition

* old/ruined wood floor borders

* better Xoc/Xo* south-facing corner

* wooden windows (Xom^Exw)

* fix missed Ior->Iwo transition rule

* fix Isa/U* transition rule

* update copyrights.csv
2023-10-22 11:42:25 -07:00
pentarctagon
779af76eb4 copyrights fixup. 2023-10-10 12:20:23 -05:00
Dalas121
ae79a2a561
EI Barrow Wight fix, licensing update - attempt #2 (#7940) 2023-10-10 09:03:38 -05:00
pentarctagon
000ba55eb1 copyrights update. 2023-10-09 11:54:44 -05:00
pentarctagon
a9a356a9f5 copyrights update. 2023-10-06 23:53:19 -05:00
pentarctagon
b46f9c7acc update_copyrights - improve performance a lot 2023-10-02 19:43:24 -05:00
pentarctagon
9b9064c2a1 update copyrights 2023-10-01 15:54:18 -05:00
Jonathan-Kelly
17af596663 Update copyrights.csv with WoF data licenses 2023-09-30 21:11:52 -05:00
pentarctagon
e2bde1bb2c update a couple rows 2023-09-26 11:12:01 -05:00
pentarctagon
97c8feb8ca add image copyright tracking 2023-09-25 11:47:07 -05:00