Commit graph

34 commits

Author SHA1 Message Date
drfrag
919f9b403b - Remove the IgnoreTitlePatches flag. 2019-10-25 16:37:45 +02:00
Christoph Oelckers
2b51e8d5dd - allow the language table to supersede the title patches, if appropriate
For the Doom IWADs the provided font looks almost identical to the characters used on the title patches. So, for any level name that got replaced in some language, it will now check if the retrieved name comes from the default table, and if not, ignore the title patch and print the name with the specified font.

This also required removing the 'en' label from the default table,  because with this present, the text would always be picked from 'en' instead of 'default'. Since 'en' and 'default' had the same contents, in any English locale the 'default' table was never hit, so this won't make any difference for the texts being chosen.

Last but not least, wminfo has been made a local variable in G_DoCompleted. There were two places where this was accessed from outside the summary screen or its setup code, and both were incorrect.

# Conflicts:
#	src/g_hub.cpp
#	src/g_level.cpp
#	src/gamedata/g_mapinfo.h
#	src/gi.h
#	src/p_setup.cpp
#	src/stringtable.cpp
#	src/stringtable.h
#	wadsrc/static/zscript/ui/statscreen/statscreen.zs
#	wadsrc_extra/static/iwadinfo.txt

# Conflicts:
#	src/gi.h
#	wadsrc_extra/static/iwadinfo.txt
2019-08-06 17:13:21 +02:00
drfrag
f84ad33134 - Moved a graphic and changed its format to 32 bit PNG. 2019-07-18 17:48:45 +02:00
Christoph Oelckers
6999c89cbb - moved several IWAD dependent files into the game_support resource
* sprite offset definitions, which are IWAD dependent
* Freedoom's decal overrides
* conversation ID definitions for the Strife teasers
* the fallback BigFont now can also be loaded by IWADs which declare themselves as GAME_Heretic or GAME_Hexen.

# Conflicts:
#	src/gamedata/fonts/v_font.cpp
2019-07-18 14:28:40 +02:00
Christoph Oelckers
1d8f735a27 - renamed zd_extra.pk3 to game_support.pk3
# Conflicts:
#	src/version.h
2019-07-18 14:28:35 +02:00
Christoph Oelckers
7757798d22 - moved iwadinfo.txt to zd_extra.pk3.
This was done for two reasons:

1. It forces loading of zd_extra.pk3 for the stock IWADs, eliminating a certain kind of user error.
2. It removes the stock IWAD definitions for custom games that distribute the engine along with their data, so that it doesn't pick up on Steam and GOG installations and shows an inappropriate IWAD picker.
2019-07-18 13:53:20 +02:00
drfrag
f9759dc894 - Some missing strings. 2019-07-18 13:08:15 +02:00
drfrag
075269c031 - Forgot to move the now unused new skill graphic. 2019-06-05 01:31:23 +02:00
Christoph Oelckers
4bcdd1565a - added Doom and Strife BigFont characters.
This isn't tested!
2019-05-27 02:15:46 +02:00
Christoph Oelckers
32c24038b0 - reworked font loader to make adding multi-lump fonts easier.
A multi-lump font can be created by putting all characters into a subdirectory of fonts/ with the intended name. Each character needs to be named by its character index as hex number.
So far this is only active for the predefined small fonts

# Conflicts:
#	src/v_font.cpp
2019-05-26 21:17:16 +02:00
Matthew The Glutton
7fb7d2e242 Move player crouch sprites. 2019-05-02 17:10:18 +02:00
Christoph Oelckers
b1b5c851c9 - exported all Hexen map names and intermission texts to the language table.
As IWAD content this is in zd_extra.pk3.

# Conflicts:
#	src/gamedata/g_mapinfo.h
#	src/intermission/intermission_parse.cpp

# Conflicts:
#	src/intermission/intermission_parse.cpp
2019-04-28 11:56:36 +02:00
Christoph Oelckers
014dd1d842 - removed $ from string label. 2019-04-28 11:53:32 +02:00
Christoph Oelckers
8b7fa658be - use proper casing for the game texts so that they can also work with a complete font. 2019-04-28 11:53:29 +02:00
Christoph Oelckers
dc47fb807b - removed the special exception for those weird "No..." messages and moved the only one that isn't garbage to the language lump. 2019-04-28 11:53:26 +02:00
Christoph Oelckers
3dffaa3ab7 - exported the character names of Strife's dialogues. 2019-04-28 11:46:59 +02:00
Christoph Oelckers
7540ab01a5 - exported Strife's log texts to the string table.
This is dpne as a two-stage approach. TXT_LOGTEXTxxx will always take precedence over the log lumps, and TXT_ILOGxxx will only replace the original IWAD content.
This is so that PWADs replacing these lumps don't get overridden by the default texts.
2019-04-28 11:46:56 +02:00
Christoph Oelckers
1382d79ab1 - exported all texts from Strife's dialogues to the string table.
Now all this content can be localized. However, since this is actual game content it was placed in a secondary file in zd_extra.pk3, so that it won't affect the GPL-compatible status of the main one.

# Conflicts:
#	src/p_conversation.cpp
2019-04-27 13:47:44 +02:00
Nemrtvi
842a7cbbc9 Improved Strife’s BIGFONT file 2019-04-27 12:43:57 +02:00
drfrag666
37b89faeb4 - Missed a graphic. 2018-06-23 08:56:47 +02:00
Christoph Oelckers
f346709937 - new rocket smoke sprites by Talon1024.
The old ones which are from Heretic have been removed as a consequence.
2018-01-28 08:37:56 +01:00
Christoph Oelckers
94720f8a96 - replaced DBIGFONT and SBIGFONT in gzdoom.pk3 with the one from Ultimate Simplicity, which comes with permission to reuse.
The original copyrighted fonts have been moved to the 'extra' PK3.
2018-01-20 11:33:06 +01:00
SashaTheRed
4a71493a54
Fixed sprite offsets 2018-01-02 14:09:57 +01:00
SashaTheRed
a280cbc62c
Add sprite support for French and Portugese languages 2018-01-02 13:56:37 +01:00
Christoph Oelckers
714259d715 - removed the ugly grenades from the extra .pk3, now that the main file contains a much nicer and unproblematic replacement. 2017-10-23 20:51:00 +02:00
Rachael Alexanderson
832c8f6754 - added new Ice Shards, and removed the zd_extra version 2017-10-23 03:39:44 -04:00
nashmuhandes
10429d4421 Removed all copyright-infringing dog sprites and provided a free replacement. 2017-09-30 20:09:53 +02:00
Christoph Oelckers
72e1e869f6 - removed the original dog sounds as they are questionable in terms of copyright and there's no reason to prefer them over their replacements. 2017-09-30 15:23:44 +02:00
Christoph Oelckers
e5660e759a - moved amrka0.png to main gzdoom.pk3 as it poses no copyright issues. 2017-09-30 08:21:20 +02:00
Christoph Oelckers
b022f6dd81 - removed unkna0 from wadsrc_extra. 2017-09-30 08:16:07 +02:00
Christoph Oelckers
c22c93dd51 - the pistol icon was a contribution from the forum and also does not need replacement. 2017-09-30 08:09:27 +02:00
Christoph Oelckers
22b1997846 - Restored the original dssecret sound for the main gzdoom.pk3 as there are no copyright issues with it and the replacement was just ridiculous. 2017-09-30 08:07:45 +02:00
Christoph Oelckers
21f089c148 - removed redundant content from wadsrc_extra, i.e. all files which were identical with the ones in wadsrc. 2017-09-30 08:02:37 +02:00
Rachael Alexanderson
6044c46d39 - rename wadsrc_optionalassets wadsrc_extra 2017-09-09 05:54:07 -04:00