Difference between revisions of "Version control"

325 bytes added ,  14:41, 21 November 2020
no edit summary
imported>Thingy Person
imported>Thingy Person
Line 96: Line 96:


Save the change and load Skyrim.esm in the CK. You'll get a good number of errors about strings and such, ignore them and press Yes to All. Now it's possible to Check Out forms that belong to Skyrim.esm. Merge any changed Skyrim.esm forms from your ESP into your own ESM, then exit the Creation Kit and revert the flag change.
Save the change and load Skyrim.esm in the CK. You'll get a good number of errors about strings and such, ignore them and press Yes to All. Now it's possible to Check Out forms that belong to Skyrim.esm. Merge any changed Skyrim.esm forms from your ESP into your own ESM, then exit the Creation Kit and revert the flag change.
====Merging navmeshes====
In order to merge Navmesh forms (NAVM), the NavMeshInfoMap (NAVI) in Skyrim.esm must be checked out. Checking it out is an arduous process, but it generally only has to be done once on your setup and then it will remain checked out, even across merges, sessions and bit array regenerations.
* Apply the aforementioned hex edit to Skyrim.esm.
* Once in the version control dialog, click "All" and wait several minutes while a list of every loaded form is generated.
* Sort by "Type", then find the NAVI form manually in the list.
* Select it and check out. Then wait several more minutes while the list refreshes.
* Go back to viewing Altered, then check out/check in all forms as usual.


==Perforce Integration==
==Perforce Integration==
Line 190: Line 198:
<source lang="html4strict">Checkout Warning: <Form> is a different version than it was when it was loaded. Check out prevented.</source>
<source lang="html4strict">Checkout Warning: <Form> is a different version than it was when it was loaded. Check out prevented.</source>
You need to regenerate the bit array (see above). You may have done a merge earlier and haven't regenerated the bit array since.
You need to regenerate the bit array (see above). You may have done a merge earlier and haven't regenerated the bit array since.
==Notes==
* In order to merge Navmesh forms (NAVM), the NavMeshInfoMap (NAVI) in Skyrim.esm must also be merged. This means applying the aforementioned hex edit to Skyrim.esm. Once in the version control dialog, you must find and select the NAVI form from Skyrim.esm for checkout, then again for checkin. One way to do is is to show all records, sort by form type, then find it manually.


==See Also==
==See Also==