4
Fork 0

Merge remote-tracking branch 'origin/development' into development

english-generic-dialogue
overdev 3 years ago
commit 0b384bf178
  1. BIN
      E - Update.bsa
  2. BIN
      Enderal - Forgotten Stories.esm
  3. 122
      Enderal - Forgotten Stories.esm.xml
  4. 2
      Enderal - Forgotten Stories.ini
  5. 8
      README.md
  6. BIN
      _build/7za.exe
  7. BIN
      _build/bsarch.exe
  8. BIN
      _build/build.cmd
  9. 115
      _build/loose_files.txt
  10. 0
      scripts/Game.pex
  11. 0
      source/fs.dll/.gitignore
  12. 0
      source/fs.dll/common/IArchive.cpp
  13. 0
      source/fs.dll/common/IArchive.h
  14. 0
      source/fs.dll/common/IBufferStream.cpp
  15. 0
      source/fs.dll/common/IBufferStream.h
  16. 0
      source/fs.dll/common/IConsole.cpp
  17. 0
      source/fs.dll/common/IConsole.h
  18. 0
      source/fs.dll/common/ICriticalSection.h
  19. 0
      source/fs.dll/common/IDataStream.cpp
  20. 0
      source/fs.dll/common/IDataStream.h
  21. 0
      source/fs.dll/common/IDatabase.cpp
  22. 0
      source/fs.dll/common/IDatabase.h
  23. 0
      source/fs.dll/common/IDatabase.inc
  24. 0
      source/fs.dll/common/IDebugLog.cpp
  25. 0
      source/fs.dll/common/IDebugLog.h
  26. 0
      source/fs.dll/common/IDirectoryIterator.cpp
  27. 0
      source/fs.dll/common/IDirectoryIterator.h
  28. 0
      source/fs.dll/common/IDynamicCreate.cpp
  29. 0
      source/fs.dll/common/IDynamicCreate.h
  30. 0
      source/fs.dll/common/IErrors.cpp
  31. 0
      source/fs.dll/common/IErrors.h
  32. 0
      source/fs.dll/common/IEvent.cpp
  33. 0
      source/fs.dll/common/IEvent.h
  34. 0
      source/fs.dll/common/IFIFO.cpp
  35. 0
      source/fs.dll/common/IFIFO.h
  36. 0
      source/fs.dll/common/IFileStream.cpp
  37. 0
      source/fs.dll/common/IFileStream.h
  38. 0
      source/fs.dll/common/IInterlockedLong.cpp
  39. 0
      source/fs.dll/common/IInterlockedLong.h
  40. 0
      source/fs.dll/common/ILinkedList.h
  41. 0
      source/fs.dll/common/IMemPool.cpp
  42. 0
      source/fs.dll/common/IMemPool.h
  43. 0
      source/fs.dll/common/IMutex.cpp
  44. 0
      source/fs.dll/common/IMutex.h
  45. 0
      source/fs.dll/common/IPipeClient.cpp
  46. 0
      source/fs.dll/common/IPipeClient.h
  47. 0
      source/fs.dll/common/IPipeServer.cpp
  48. 0
      source/fs.dll/common/IPipeServer.h
  49. 0
      source/fs.dll/common/IPrefix.cpp
  50. 0
      source/fs.dll/common/IPrefix.h
  51. 0
      source/fs.dll/common/IRangeMap.cpp
  52. 0
      source/fs.dll/common/IRangeMap.h
  53. 0
      source/fs.dll/common/IReadWriteLock.cpp
  54. 0
      source/fs.dll/common/IReadWriteLock.h
  55. 0
      source/fs.dll/common/ISegmentStream.cpp
  56. 0
      source/fs.dll/common/ISegmentStream.h
  57. 0
      source/fs.dll/common/ISingleton.cpp
  58. 0
      source/fs.dll/common/ISingleton.h
  59. 0
      source/fs.dll/common/ITextParser.cpp
  60. 0
      source/fs.dll/common/ITextParser.h
  61. 0
      source/fs.dll/common/IThread.cpp
  62. 0
      source/fs.dll/common/IThread.h
  63. 0
      source/fs.dll/common/ITimer.cpp
  64. 0
      source/fs.dll/common/ITimer.h
  65. 0
      source/fs.dll/common/ITypes.cpp
  66. 0
      source/fs.dll/common/ITypes.h
  67. 0
      source/fs.dll/common/common.vcproj
  68. 0
      source/fs.dll/common/common.vcxproj
  69. 0
      source/fs.dll/common/common.vcxproj.filters
  70. 0
      source/fs.dll/common/common_license.txt
  71. 0
      source/fs.dll/common/common_vc11.sln
  72. 0
      source/fs.dll/common/common_vc11.vcxproj
  73. 0
      source/fs.dll/common/common_vc11.vcxproj.filters
  74. 0
      source/fs.dll/common/common_vc11.vssscc
  75. 0
      source/fs.dll/common/common_vc12.vcproj
  76. 0
      source/fs.dll/common/common_vc12.vcxproj
  77. 0
      source/fs.dll/common/common_vc12.vcxproj.filters
  78. 0
      source/fs.dll/common/common_vc14.sln
  79. 0
      source/fs.dll/common/common_vc14.vcxproj
  80. 0
      source/fs.dll/common/common_vc14.vcxproj.filters
  81. 0
      source/fs.dll/common/common_vc14.vcxproj.user
  82. 0
      source/fs.dll/common/common_vc14.vssscc
  83. 0
      source/fs.dll/common/common_vc9.vcproj
  84. 0
      source/fs.dll/common/common_vc9.vcxproj
  85. 0
      source/fs.dll/common/common_vc9.vcxproj.filters
  86. 0
      source/fs.dll/forgotten_stories_skse_plugin.sln
  87. 0
      source/fs.dll/fs/Achievements.cpp
  88. 0
      source/fs.dll/fs/Achievements.h
  89. 0
      source/fs.dll/fs/CreatePotion.cpp
  90. 0
      source/fs.dll/fs/CreatePotion.h
  91. 0
      source/fs.dll/fs/PhasmalistInventoryFunctions.cpp
  92. 0
      source/fs.dll/fs/PhasmalistInventoryFunctions.h
  93. 0
      source/fs.dll/fs/exports.def
  94. 0
      source/fs.dll/fs/fs.vcxproj
  95. 0
      source/fs.dll/fs/fs.vcxproj.user
  96. 0
      source/fs.dll/fs/main.cpp
  97. 0
      source/fs.dll/skse64/skse64.sln
  98. 0
      source/fs.dll/skse64/skse64/BSModelDB.cpp
  99. 0
      source/fs.dll/skse64/skse64/BSModelDB.h
  100. 0
      source/fs.dll/skse64/skse64/Colors.cpp
  101. Some files were not shown because too many files have changed in this diff Show More

BIN
E - Update.bsa (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

@ -2,7 +2,7 @@
<plugin version="0.7.4">
<TES4 flags="0x00000081" id="00000000" day="0" month="0" lastUserID="0" currentUserID="0" version="44" unknown="0x0000">
<HEDR>
<struct version="1.70000005" numRecords="43586" nextObjectID="000133e1" />
<struct version="1.70000005" numRecords="43590" nextObjectID="000133e1" />
</HEDR>
<CNAM>Niseam</CNAM>
<SNAM>Enderal: Forgotten Stories (Special Edition) 2.0.9</SNAM>
@ -120815,6 +120815,35 @@
<struct value="650" weight="0.100000001" />
</DATA>
</MISC>
<MISC flags="0x00000000" id="00043283" day="0" month="0" lastUserID="0" currentUserID="0" version="44" unknown="0x0000">
<EDID>_00E_Placeable_Furniture_AlchemyTabletopNEW</EDID>
<VMAD version="5" format="2">
<script name="_00E_Playerhousing_FurnitureItem" status="0">
<property name="master" type="1" status="1">
<object formID="00043270" alias="65535" unused="0x0000" />
</property>
<property name="_FURNITURE_toCreate" type="1" status="1">
<object formID="00043282" alias="65535" unused="0x0000" />
</property>
</script>
</VMAD>
<OBND>
<struct min="0,0,0" max="0,0,0" />
</OBND>
<FULL>10385</FULL>
<MODL>enderal\playerhousing\furniture\alchemyworkstation_placeable.nif</MODL>
<MODT count="2">
<unknown3></unknown3>
<unknown5></unknown5>
<unknown4 />
</MODT>
<YNAM>0003e609</YNAM>
<KSIZ>1</KSIZ>
<KWDA>000914e9</KWDA>
<DATA>
<struct value="60" weight="0" />
</DATA>
</MISC>
<MISC flags="0x00000000" id="0004328b" day="0" month="0" lastUserID="0" currentUserID="0" version="44" unknown="0x0003">
<EDID>_00E_CraftingPlan_Housing_Furn_AlchemyTabletop</EDID>
<OBND>
@ -120857,6 +120886,35 @@
<struct value="25" weight="0.100000001" />
</DATA>
</MISC>
<MISC flags="0x00000000" id="00043291" day="0" month="0" lastUserID="0" currentUserID="0" version="44" unknown="0x0000">
<EDID>_00E_Placeable_Furniture_TanningRackNEW</EDID>
<VMAD version="5" format="2">
<script name="_00E_Playerhousing_FurnitureItem" status="0">
<property name="master" type="1" status="1">
<object formID="00043270" alias="65535" unused="0x0000" />
</property>
<property name="_FURNITURE_toCreate" type="1" status="1">
<object formID="00043290" alias="65535" unused="0x0000" />
</property>
</script>
</VMAD>
<OBND>
<struct min="0,0,0" max="0,0,0" />
</OBND>
<FULL>10386</FULL>
<MODL>enderal\playerhousing\furniture\tanningrackmarker_placeable.nif</MODL>
<MODT count="2">
<unknown3></unknown3>
<unknown5></unknown5>
<unknown4 />
</MODT>
<YNAM>0003e609</YNAM>
<KSIZ>1</KSIZ>
<KWDA>000914e9</KWDA>
<DATA>
<struct value="60" weight="0" />
</DATA>
</MISC>
<MISC flags="0x00000000" id="00043293" day="0" month="0" lastUserID="0" currentUserID="0" version="44" unknown="0x0003">
<EDID>_00E_CraftingPlan_Housing_Furn_TanningRack</EDID>
<OBND>
@ -120878,6 +120936,35 @@
<struct value="25" weight="0.100000001" />
</DATA>
</MISC>
<MISC flags="0x00000000" id="00043296" day="0" month="0" lastUserID="0" currentUserID="0" version="44" unknown="0x0000">
<EDID>_00E_Placeable_Furniture_AnvilNEW</EDID>
<VMAD version="5" format="2">
<script name="_00E_Playerhousing_FurnitureItem" status="0">
<property name="master" type="1" status="1">
<object formID="00043270" alias="65535" unused="0x0000" />
</property>
<property name="_FURNITURE_toCreate" type="1" status="1">
<object formID="00043295" alias="65535" unused="0x0000" />
</property>
</script>
</VMAD>
<OBND>
<struct min="0,0,0" max="0,0,0" />
</OBND>
<FULL>10387</FULL>
<MODL>enderal\playerhousing\furniture\blacksmithanvil_placeable.nif</MODL>
<MODT count="2">
<unknown3></unknown3>
<unknown5></unknown5>
<unknown4 />
</MODT>
<YNAM>0003e609</YNAM>
<KSIZ>1</KSIZ>
<KWDA>000914e9</KWDA>
<DATA>
<struct value="60" weight="0" />
</DATA>
</MISC>
<MISC flags="0x00000000" id="00043297" day="0" month="0" lastUserID="0" currentUserID="0" version="44" unknown="0x0003">
<EDID>_00E_CraftingPlan_Housing_Furn_Anvil</EDID>
<OBND>
@ -120980,6 +121067,35 @@
<struct value="15" weight="0.100000001" />
</DATA>
</MISC>
<MISC flags="0x00000000" id="000460a1" day="0" month="0" lastUserID="0" currentUserID="0" version="44" unknown="0x0000">
<EDID>_00E_Placeable_Furniture_SharpeningWheelNEW</EDID>
<VMAD version="5" format="2">
<script name="_00E_Playerhousing_FurnitureItem" status="0">
<property name="master" type="1" status="1">
<object formID="00043270" alias="65535" unused="0x0000" />
</property>
<property name="_FURNITURE_toCreate" type="1" status="1">
<object formID="000460a2" alias="65535" unused="0x0000" />
</property>
</script>
</VMAD>
<OBND>
<struct min="0,0,0" max="0,0,0" />
</OBND>
<FULL>10388</FULL>
<MODL>enderal\playerhousing\furniture\blacksmithsharpeningwheelanimating_placeable.nif</MODL>
<MODT count="2">
<unknown3></unknown3>
<unknown5></unknown5>
<unknown4 />
</MODT>
<YNAM>0003e609</YNAM>
<KSIZ>1</KSIZ>
<KWDA>000914e9</KWDA>
<DATA>
<struct value="60" weight="0" />
</DATA>
</MISC>
<MISC flags="0x00000000" id="000460a4" day="0" month="0" lastUserID="0" currentUserID="0" version="44" unknown="0x0002">
<EDID>_00E_CraftingPlan_Housing_Furn_SharpeningWheel</EDID>
<OBND>
@ -128839,8 +128955,8 @@
<OBND>
<struct min="0,0,0" max="0,0,0" />
</OBND>
<FULL>7483</FULL>
<MODL>Furniture\SmallCookingPotNoHandle.nif</MODL>
<FULL>10389</FULL>
<MODL>enderal\playerhousing\furniture\smallcookingpotnohandle_placeable.nif</MODL>
<MODT count="2">
<unknown3></unknown3>
<unknown5></unknown5>

@ -6,7 +6,7 @@ sLanguage=ENGLISH
[Archive]
bInvalidateOlderFiles=1
sResourceArchiveList=Skyrim - Misc.bsa, Skyrim - Shaders.bsa, Skyrim - Interface.bsa, Skyrim - Animations.bsa, Skyrim - Meshes0.bsa, Skyrim - Meshes1.bsa, Skyrim - Sounds.bsa, Skyrim - Textures0.bsa, Skyrim - Textures1.bsa, Skyrim - Textures2.bsa, Skyrim - Textures3.bsa, Skyrim - Textures4.bsa, Skyrim - Textures5.bsa, Skyrim - Textures6.bsa, Skyrim - Textures7.bsa
sResourceArchiveList2=Skyrim - Textures8.bsa, Skyrim - Patch.bsa, Unofficial Skyrim Special Edition Patch.bsa, Unofficial Skyrim Special Edition Patch - Textures.bsa, E - Meshes.bsa, E - Scripts.bsa, E - Sounds.bsa, E - Textures1.bsa, E - Textures2.bsa, E - Textures3.bsa, E - SE.bsa, E - Update.bsa, L - Textures.bsa, L - Voices.bsa
sResourceArchiveList2=Skyrim - Textures8.bsa, Skyrim - Patch.bsa, E - Meshes.bsa, E - Textures1.bsa, E - Textures2.bsa, E - Textures3.bsa, E - Sounds.bsa, L - Voices.bsa, E - Misc.bsa, E - Update.bsa, L - Textures.bsa
[SaveGame]
; This should be removed in Steam version to allow its configuration via the launcher.

@ -41,4 +41,10 @@ Completed merges (with all ESPs merged in and removed) should be forwarded from
All localizations in the `enderal-l10n` repository must be updated to match `master`.
Releases are built with a custom script (coming soon).
## Releasing
To create a complete English build:
- Switch to the `master` branch.
- Run `_build\build.cmd` to pack assets into BSA archives and copy necessary files to `DISK:\Enderal SE Build`. File `loose_files.txt` contains names of files, which will be also copied as loose files.
- Manually copy `E - Sounds.bsa`, `L - Voices.bsa`, and the `Video` directory to `DISK:\Enderal SE Build`.
`enderal-l10n` will have its own script, copying additional localizations to the build directory.

BIN
_build/7za.exe (Stored with Git LFS)

Binary file not shown.

BIN
_build/bsarch.exe (Stored with Git LFS)

Binary file not shown.

BIN
_build/build.cmd (Stored with Git LFS)

Binary file not shown.

@ -0,0 +1,115 @@
credits.txt
Enderal - Forgotten Stories.esm
Enderal - Forgotten Stories.ini
Interface\controls\pc\controlmap.txt
Interface\credits.txt
Interface\dialoguemenu.swf
Interface\exported\hudmenu.gfx
Interface\exported\widgets\skyui\followerpanel.swf
Interface\fontconfig.txt
Interface\fonts_en2.swf
Interface\quest_journal.swf
Interface\skyui\icons_category_psychosteve.swf
Interface\startmenu.swf
Interface\statssheetmenu.swf
Interface\translate_chinese.txt
Interface\translate_english.txt
Interface\translate_french.txt
Interface\translate_german.txt
Interface\translate_italian.txt
Interface\translate_japanese.txt
Interface\translate_korean.txt
Interface\translate_russian.txt
Interface\translate_spanish.txt
Interface\translations\buriedtreasure_chinese.txt
Interface\translations\buriedtreasure_french.txt
Interface\translations\buriedtreasure_italian.txt
Interface\translations\buriedtreasure_japanese.txt
Interface\translations\buriedtreasure_korean.txt
Interface\translations\skyui_se_chinese.txt
Interface\translations\skyui_se_japanese.txt
Interface\translations\skyui_se_korean.txt
Interface\translations\taverngames_chinese.txt
Interface\translations\taverngames_french.txt
Interface\translations\taverngames_german.txt
Interface\translations\taverngames_italian.txt
Interface\translations\taverngames_japanese.txt
Interface\translations\taverngames_russian.txt
Interface\translations\taverngames_spanish.txt
Interface\translations\uiextensions_chinese.txt
Interface\translations\uiextensions_french.txt
Interface\translations\uiextensions_german.txt
Interface\translations\uiextensions_italian.txt
Interface\translations\uiextensions_japanese.txt
Interface\translations\uiextensions_korean.txt
meshes\terrain\Vyn\vyn.32.-5.9.btr
Scripts\Game.pex
Scripts\SKI_FavoritesManager.pex
SKSE\Plugins\FlatMapMarkersSSE.json
SKSE\Plugins\fs.dll
SKSE\Plugins\version-1-5-97-0.bin
SKSE\SKSE.ini
Skyrim.esm
Strings\enderal - forgotten stories_chinese.dlstrings
Strings\enderal - forgotten stories_chinese.ilstrings
Strings\enderal - forgotten stories_chinese.strings
Strings\enderal - forgotten stories_english.dlstrings
Strings\enderal - forgotten stories_english.ilstrings
Strings\enderal - forgotten stories_english.strings
Strings\enderal - forgotten stories_french.dlstrings
Strings\enderal - forgotten stories_french.ilstrings
Strings\enderal - forgotten stories_french.strings
Strings\enderal - forgotten stories_german.dlstrings
Strings\enderal - forgotten stories_german.ilstrings
Strings\enderal - forgotten stories_german.strings
Strings\enderal - forgotten stories_italian.dlstrings
Strings\enderal - forgotten stories_italian.ilstrings
Strings\enderal - forgotten stories_italian.strings
Strings\enderal - forgotten stories_japanese.dlstrings
Strings\enderal - forgotten stories_japanese.ilstrings
Strings\enderal - forgotten stories_japanese.strings
Strings\enderal - forgotten stories_korean.dlstrings
Strings\enderal - forgotten stories_korean.ilstrings
Strings\enderal - forgotten stories_korean.strings
Strings\enderal - forgotten stories_russian.dlstrings
Strings\enderal - forgotten stories_russian.ilstrings
Strings\enderal - forgotten stories_russian.strings
Strings\enderal - forgotten stories_spanish.dlstrings
Strings\enderal - forgotten stories_spanish.ilstrings
Strings\enderal - forgotten stories_spanish.strings
Strings\skyrim_chinese.dlstrings
Strings\skyrim_chinese.ilstrings
Strings\skyrim_chinese.strings
Strings\skyrim_english.dlstrings
Strings\skyrim_english.ilstrings
Strings\skyrim_english.strings
Strings\skyrim_french.dlstrings
Strings\skyrim_french.ilstrings
Strings\skyrim_french.strings
Strings\skyrim_german.dlstrings
Strings\skyrim_german.ilstrings
Strings\skyrim_german.strings
Strings\skyrim_italian.dlstrings
Strings\skyrim_italian.ilstrings
Strings\skyrim_italian.strings
Strings\skyrim_japanese.dlstrings
Strings\skyrim_japanese.ilstrings
Strings\skyrim_japanese.strings
Strings\skyrim_korean.dlstrings
Strings\skyrim_korean.ilstrings
Strings\skyrim_korean.strings
Strings\skyrim_russian.dlstrings
Strings\skyrim_russian.ilstrings
Strings\skyrim_russian.strings
Strings\skyrim_spanish.dlstrings
Strings\skyrim_spanish.ilstrings
Strings\skyrim_spanish.strings
Update.esm
Dawnguard.esm
Dragonborn.esm
HearthFires.esm
E - Update.bsa
Video\Enderal_Credits.bik
Video\EnderalIntro.bik
Video\MQ17BlackGuardian.bik
Video\MQP03NearDeathExperience.bik

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save