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

Jump to bottom

Field Manual - Add Framework #9320

Merged
merged 48 commits into from
Oct 11, 2023
Merged

Field Manual - Add Framework #9320

merged 48 commits into from
Oct 11, 2023

Conversation

hypoxia125
Copy link
Contributor

@hypoxia125 hypoxia125 commented Aug 12, 2023 •
edited by Mike-MF
Loading

-- Created framework for addition of the Field Manual --

Created %PBOPREFIX%
Created CfgHintCategories.hpp
Created CfgHints.hpp
Created config.cpp
Created script_component.hpp

Will continue to add parts in additional PR - small incriments
closes #3416

Field Manual Framework
c7feb0d 
Created barebones framework for addition of the Field Manual
Mike-MF
Mike-MF previously requested changes Aug 12, 2023
View reviewed changes
addons/fieldmanual/config.cpp Outdated Show resolved Hide resolved
addons/fieldmanual/config.cpp Outdated Show resolved Hide resolved
Hypoxic and others added 7 commits August 11, 2023 21:25
Created Stringtable.xml
fa2a8be 
Created Stringtable.xml

Created a few strings... more to come
@hypoxia125 @Mike-MF
Update addons/fieldmanual/config.cpp
2d2fa57 
Moved opening brace

Co-authored-by: Mike-MF <TyroneMF@hotmail.com>
@hypoxia125 @Mike-MF
Update addons/fieldmanual/config.cpp
d0dafd9 
new lines at end of file

Co-authored-by: Mike-MF <TyroneMF@hotmail.com>
update stringtable.xml
29f54bf 
Added arguments to ACE_Field_Rations_Base
Added strings for descriptions of subclasses
Merge branch 'master' of https://github.com/hypoxia125/ACE3
3abc1e0
update stringtable.xml
0e455b9 
Added medical item documentation
Added field ration documentation
Update stringtable.xml
20d4e92 
Added fortify tool documentation
@hypoxia125 hypoxia125 changed the title WIP: FieldManual - Add {Framework} WIP: FieldManual - Add Framework Aug 12, 2023
Hypoxic added 2 commits August 11, 2023 22:51
updated stringtable.xml and cfgHints.hpp
18e7b3a 
Added item documentation
Cleaned up other strings
Added additional arguments and made them universal
updated/reordered contents. added images
914d36d 
Reordered CfgHints.hpp
Added Range Tables string
Reordered stringtable
Added images for inline use
@hypoxia125 hypoxia125 mentioned this pull request Aug 12, 2023
Closed
changed indentation style
2facec1 
changed indentation style to guidelines
added empty line to the end of each file
hypoxia125 and others added 2 commits August 12, 2023 17:44
@hypoxia125 @PabstMirror
Update addons/fieldmanual/CfgHints.hpp
0fcc916 
remove redundant includes

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
@hypoxia125 @PabstMirror
Update addons/fieldmanual/CfgHintCategories.hpp
2f0f8c5 
remove redundant includes

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
@PabstMirror PabstMirror added this to the Ongoing milestone Aug 12, 2023
@PabstMirror PabstMirror added the kind/feature Release Notes: **ADDED:** label Aug 12, 2023
hypoxia125 added 2 commits August 16, 2023 11:26
Update stringtable.xml
5f2fe0b 
added explosives string - no image yet
Update stringtable.xml
2007a67 
added dead man's switch - no image as of yet
jonpas
jonpas previously requested changes Aug 16, 2023
View reviewed changes
addons/fieldmanual/script_component.hpp Outdated Show resolved Hide resolved
addons/fieldmanual/script_component.hpp Outdated Show resolved Hide resolved
addons/fieldmanual/stringtable.xml Outdated Show resolved Hide resolved
@jonpas jonpas changed the title WIP: FieldManual - Add Framework WIP: Field Manual - Add Framework Aug 16, 2023
@jonpas jonpas changed the title WIP: Field Manual - Add Framework WIP: Add Field Manual framework Aug 16, 2023
hypoxia125 and others added 2 commits August 17, 2023 09:50
@hypoxia125 @jonpas
Update addons/fieldmanual/script_component.hpp
5900e29 
Co-authored-by: jonpas <jonpas33@gmail.com>
@hypoxia125 @jonpas
Update addons/fieldmanual/script_component.hpp
c629d68 
Co-authored-by: jonpas <jonpas33@gmail.com>
Update stringtable.xml
e357566 
changed structures for spray paint to surfaces
hypoxia125
hypoxia125 commented Sep 6, 2023
View reviewed changes
Copy link
Contributor Author

@hypoxia125 hypoxia125 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs a workflow rerun. failed, unknown cause

LinkIsGrim
LinkIsGrim reviewed Sep 6, 2023
View reviewed changes
addons/fieldmanual/stringtable.xml Outdated Show resolved Hide resolved
addons/fieldmanual/stringtable.xml Outdated Show resolved Hide resolved
addons/fieldmanual/stringtable.xml Outdated Show resolved Hide resolved
addons/fieldmanual/stringtable.xml Outdated Show resolved Hide resolved
addons/fieldmanual/stringtable.xml Outdated Show resolved Hide resolved
addons/fieldmanual/stringtable.xml Outdated Show resolved Hide resolved
addons/fieldmanual/stringtable.xml Outdated Show resolved Hide resolved
addons/fieldmanual/stringtable.xml Outdated Show resolved Hide resolved
@hypoxia125 @LinkIsGrim
Apply suggestions from code review
7f10859 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
@PabstMirror PabstMirror modified the milestones: Ongoing, 3.16.0 Sep 7, 2023
@LinkIsGrim LinkIsGrim dismissed stale reviews from Mike-MF and TheCandianVendingMachine September 8, 2023 03:22

Handled

@LinkIsGrim
Copy link
Contributor

Per internal discussion it might be best to leave this to 3.16.1?

@jonpas jonpas modified the milestones: 3.16.0, 3.16.1 Sep 12, 2023
@hypoxia125
Copy link
Contributor Author

How do you guys feel about me throwing the string tables into AI for translation then using a PR for each language? Just to get something in. Someone that is fluent can always fix it after.

@PabstMirror
Copy link
Contributor

47afa1f
will grab item names from cfgWeapons
reduces the number of duplicated translations and will also show [N/A] - x if addon missing

veteran29
veteran29 approved these changes Oct 6, 2023
View reviewed changes
Copy link
Member

@veteran29 veteran29 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code LGTM, stringtables... tl;dr

@Drofseh
Copy link
Contributor

Drofseh commented Oct 6, 2023

How do you guys feel about me throwing the string tables into AI for translation then using a PR for each language? Just to get something in. Someone that is fluent can always fix it after.

If you use machine translation to do the strings they won't show up as missing for the people doing translation. This means they won't be able to find any mistakes until they actually encounter them in game or go through the stringtables string by string. This makes it more difficult for the translator.

@PabstMirror PabstMirror modified the milestones: 3.16.1, 3.16.0 Oct 11, 2023
@PabstMirror PabstMirror merged commit 1764823 into acemod:master Oct 11, 2023
5 checks passed
@LinkIsGrim LinkIsGrim mentioned this pull request Oct 12, 2023
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Drofseh Drofseh Drofseh left review comments

@veteran29 veteran29 veteran29 approved these changes

@PabstMirror PabstMirror PabstMirror approved these changes

@LinkIsGrim LinkIsGrim LinkIsGrim approved these changes

@Mike-MF Mike-MF Awaiting requested review from Mike-MF

@jonpas jonpas Awaiting requested review from jonpas

@TheCandianVendingMachine TheCandianVendingMachine Awaiting requested review from TheCandianVendingMachine

Assignees
No one assigned
Labels
kind/feature Release Notes: **ADDED:**
Projects
None yet
Milestone
3.16.0
Development

Successfully merging this pull request may close these issues.

Get most important ACE3 featuers into in game Field Manual
8 participants
@hypoxia125 @LinkIsGrim @PabstMirror @veteran29 @Drofseh @TheCandianVendingMachine @jonpas @Mike-MF