Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jak3 pc subtitles #3812

Merged
merged 22 commits into from
Jan 5, 2025
Merged

jak3 pc subtitles #3812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f4e627a
ashelin
Aloqas Nov 12, 2024
20acacc
bb, cit, cityv
Aloqas Nov 13, 2024
4bc6398
damas, cit grunts
Aloqas Nov 14, 2024
157113f
citi, samos
Aloqas Nov 14, 2024
bf21a47
jak
Aloqas Nov 14, 2024
cf1a9fa
dax001 - dax500
Aloqas Nov 15, 2024
d0f8877
keira
Aloqas Nov 15, 2024
80245cc
k-bb
Aloqas Nov 16, 2024
d3a7cf9
torn, misc fixes
Aloqas Nov 17, 2024
edb5aad
oracle yap
Aloqas Nov 17, 2024
09ab6c1
klev, resc, t-bb, tess
Aloqas Nov 21, 2024
cbbffd9
guards, jinx, misc fixes
Aloqas Nov 21, 2024
aa151f7
ds, erol
Aloqas Nov 22, 2024
2f06c73
vin, model viewer lines
Aloqas Dec 4, 2024
1833e90
extra spaces
Aloqas Dec 13, 2024
55c29d9
new speakers
Aloqas Dec 14, 2024
b2df594
Add more subtitles
blahpy Dec 26, 2024
d992ff4
Add more subtitles
blahpy Dec 26, 2024
208a2e5
Merge pull request #2 from blahpy/jak3-en-subtitles
Aloqas Dec 26, 2024
658f48c
fixes
Aloqas Dec 26, 2024
ecdfc6a
fixes
Aloqas Dec 27, 2024
e96186b
fixes
Aloqas Dec 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions common/serialization/subtitles/subtitles_v2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ const std::unordered_map<std::string, u16> jak3_speaker_name_to_enum_val = {
{"martinsen", 42},
{"phillips", 43},
{"yates", 44},
{"ottsel-voice-before-outro", 45},
{"ottsel-voice", 46},
};

GameSubtitlePackage read_json_files_v2(const GameSubtitleDefinitionFile& file_info) {
Expand Down
Loading
Loading