Skip to content

Commit

Permalink
update releasedescr
Browse files Browse the repository at this point in the history
  • Loading branch information
FynnTW committed Feb 13, 2024
1 parent c096fa8 commit eed6d4b
Show file tree
Hide file tree
Showing 5 changed files with 147 additions and 12 deletions.
86 changes: 78 additions & 8 deletions M2TWEOP DataFiles/youneuoy_Data/plugins/lua/LuaImGuiDocs.lua
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ ImGuiWindowFlags = {
UnsavedDocument = nil,

---@type integer
ImGuiWindowFlags_NoNav = nil,
NoNav = nil,

---@type integer
ImGuiWindowFlags_NoDecoration = nil,
NoDecoration = nil,

---@type integer
ImGuiWindowFlags_NoInputs = nil,
NoInputs = nil,

}

Expand Down Expand Up @@ -2152,8 +2152,8 @@ function ImGui.SetNextItemWidth(width) end
function ImGui.CalcItemWidth() end

--- Push word-wrapping position for Text commands. < 0.0f: no wrapping; 0.0f: wrap to end of window (or column); > 0.0f: wrap at 'wrapLocalPosX' position in window local space
---@return number wrapLocalPosX optional
function ImGui.PushTextWrapPos() end
---@param wrapLocalPosX number? optional
function ImGui.PushTextWrapPos(wrapLocalPosX) end

--- Pop Text Wrap Pos
function ImGui.PopTextWrapPos() end
Expand Down Expand Up @@ -2209,6 +2209,39 @@ function ImGui.EndGroup() end
---@return number posY
function ImGui.GetCursorPos() end

--[[
GENERATED CODE | READ-ONLY
You can directly copy from here, or from File > Export to clipboard
--]]

--[[
GENERATED CODE | READ-ONLY
You can directly copy from here, or from File > Export to clipboard
--]]

---@type boolean
isWindowOpen = true
ImGui.SetNextWindowSize(1160,707)
--[[!! You might want to use these ^^ values in the OS window instead, and add the ImGuiWindowFlags.NoTitleBar flag in the ImGui window !!--]]

if (ImGui.Begin("window_name", isWindowOpen))
then

end
ImGui.End();


--[[
Reminder: some widgets may have the same label "##" (if you didn't change it), and can lead to undesired ID collisions.
More info: https://github.com/ocornut/imgui/blob/master/docs/FAQ.md#q-about-the-id-stack-system
--]]


--[[
Reminder: some widgets may have the same label "##" (if you didn't change it), and can lead to undesired ID collisions.
More info: https://github.com/ocornut/imgui/blob/master/docs/FAQ.md#q-about-the-id-stack-system
--]]

--- Some functions are using window-relative coordinates, such as: GetCursorPos, GetCursorStartPos, GetContentRegionMax, GetWindowContentRegion* etc.
---@return number posX
function ImGui.GetCursorPosX() end
Expand Down Expand Up @@ -2363,10 +2396,11 @@ function ImGui.Bullet() end
function ImGui.SeparatorText(text) end

--- Image button.
---@param label string
---@param texture any
---@param sizeX number
---@param sizeY number
function ImGui.ImageButton(texture, sizeX, sizeY) end
function ImGui.ImageButton(label, texture, sizeX, sizeY) end

--- Image.
---@param texture any
Expand Down Expand Up @@ -3610,7 +3644,7 @@ ImFontAtlas = {
--- Access the IO structure (mouse/keyboard/gamepad inputs, time, various configuration options/flags).
---@param filename string
---@param sizePixels number
---@return ImGuiIO io
---@return ImFont font
function ImFontAtlas.AddFontFromFileTTF(filename, sizePixels) end

---Basic ImGuiIO table
Expand Down Expand Up @@ -3721,4 +3755,40 @@ ImGuiTableSortSpecs = {
SpecsDirty = nil,

}

local IsWindowOpen = true
ImGui.SetNextWindowPos(503.0, 61.0)
ImGui.SetNextWindowSize(682.0, 711.0)
ImGui.Begin("myWindow", IsWindowOpen, 37)
ImGui.PushStyleColor(ImGuiCol.Text, 0.000, 0.000, 0.000, 1.000)
ImGui.PushStyleColor(ImGuiCol.Button, 0.259, 0.980, 0.280, 1.000)
ImGui.SetCursorPos(68.2, 284.4);
ImGui.BeginChild("Child_0", 532.0, 383.9, 0, 0)
ImGui.SetCursorPos(54.6, 28.4);
ImGui.BeginChild("Child_1", 422.1, 213.3, 0, 0)
ImGui.PushStyleVar(ImGuiStyleVar.FrameRounding, 50.000)
ImGui.PushStyleVar(ImGuiStyleVar.FrameBorderSize, 2.000)
ImGui.PushStyleColor(ImGuiCol.BorderShadow, 0.000, 0.000, 0.000, 1.000)
ImGui.PushStyleColor(ImGuiCol.Button, 0.259, 0.588, 0.980, 1.000)
ImGui.SetCursorPos(136.4, 142.2);
if ImGui.Button("Button", 132.5, 56.9) then

end
ImGui.PopStyleVar(2)
ImGui.PopStyleColor(2)
ImGui.EndChild()
ImGui.SetCursorPos(136.4, 284.4);
if ImGui.Button("Button", 108.6, 56.9) then

end
ImGui.PushStyleColor(ImGuiCol.Button, 0.696, 0.780, 0.494, 1.000)
ImGui.SetCursorPos(313.7, 284.4);
if ImGui.Button("Button", 108.4, 56.9) then

end
ImGui.PopStyleColor(1)
ImGui.EndChild()
ImGui.PopStyleColor(2)
ImGui.SetCursorPos(68.2, 42.7);
ImGui.BeginChild("Child_2", 532.0, 213.3, 0, 0)
ImGui.EndChild()
ImGui.End()
62 changes: 62 additions & 0 deletions buildEOPFast.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# .\buildEOP.ps1 -modFolder "E:\Steam\steamapps\common\Medieval II Total War\mods\Tsardoms-2.2"
param(
$modFolder,
$shouldZip = 'False'
)

# BUILD EOP Script
$currentLoc=(get-location).path

function CopyFilesToFolder ($fromFolder, $toFolder) {
Write-Host "`n`nCopying all files from '$fromFolder' to '$toFolder' ... `n" -ForegroundColor Yellow

$childItems = Get-ChildItem $fromFolder
$childItems | ForEach-Object {
Copy-Item -Path $_.FullName -Destination $toFolder -Recurse -Force
}
}

Write-Host "`n`n======== 0) Pre Cleanup ========`n" -ForegroundColor Magenta

Set-Location -Path $currentLoc
Remove-item ./logs -recurse -erroraction 'silentlycontinue'
new-item ./logs -itemtype directory -erroraction 'silentlycontinue'

# 1) Build M2TWEOP-library
Write-Host "`n`n======== 1) Build M2TWEOP-library ========`n" -ForegroundColor Magenta

msbuild "M2TWEOP Code\M2TWEOP library.sln"/p:Configuration=Release /p:Platform=x86 /t:"M2TWEOP library" /fileLogger /fileLoggerParameters:LogFile=logs\library.log /NoWarn:ALL -m
msbuild "M2TWEOP Code\M2TWEOP library.sln"/p:Configuration=Release /p:Platform=x86 /t:"M2TWEOP GUI" /fileLogger /fileLoggerParameters:LogFile=logs\gui.log /NoWarn:ALL -m

# 2) Build M2TWEOP-LuaPlugin
Write-Host "`n`n======== 2) Build M2TWEOP-LuaPlugin ========`n" -ForegroundColor Magenta
msbuild "M2TWEOP-luaPlugin\luaPlugin.sln"/p:Configuration=Release /p:Platform=x86 /t:"luaPlugin" /fileLogger /fileLoggerParameters:LogFile=logs\luaPlugin.log /NoWarn:ALL -m

# 3) Build Documentation
Write-Host "`n`n======== 3) Build M2TWEOP-Documentation ========`n" -ForegroundColor Magenta

cd "documentationGenerator"
&".\generateDocs.ps1" -Wait -NoNewWindow | Write-Verbose

# 4) Copy built files
Write-Host "`n`n======== 4) Copy all created files ========`n" -ForegroundColor Magenta

Set-Location -Path $currentLoc
Remove-item ./generateTest -recurse -erroraction 'silentlycontinue'
new-item ./generateTest -itemtype directory -erroraction 'silentlycontinue'
new-item ./generateTest/youneuoy_Data -itemtype directory -erroraction 'silentlycontinue'

Copy-Item -Path "M2TWEOP DataFiles/youneuoy_Data/plugins/lua/LuaDocs.lua*" -Destination "./generateTest/youneuoy_Data/plugins/lua" -recurse
Copy-Item -Path "M2TWEOP DataFiles/youneuoy_Data/plugins/lua/LuaImGuiDocs.lua*" -Destination "./generateTest/youneuoy_Data/plugins/lua" -recurse

Copy-Item -Path "M2TWEOP-luaPlugin\Release\luaPlugin.dll" -Destination "./generateTest/youneuoy_Data/plugins"
Copy-Item -Path "M2TWEOP Code\Release\M2TWEOP GUI.exe" -Destination "./generateTest"
Copy-Item -Path "M2TWEOP Code\Release\M2TWEOPLibrary.dll" -Destination "./generateTest"

if ($modFolder) {
Write-Host "`n`n======== 6) Copy to mod folder ========`n" -ForegroundColor Magenta
CopyFilesToFolder "./M2TWEOPGenerated" $modFolder
}

# 7) Done
Write-Host "`n`n======== Success! EOP Built Successfully! ========`n" -ForegroundColor Magenta
11 changes: 7 additions & 4 deletions documentationGenerator/releaseInfo/releaseDescription.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,25 @@

### **Library**
- Fixed crashing on startup in some mods - *Fynn*
- Fixed some issues with `CombatVsReligion` attributes.
- **Note:** Do not use religions > 10 in CombatVsReligion attributes! - *Fynn*
- Fixed a vanilla game bug costing some performance in battle - *Fynn*
- Fixed `CombatVsReligion` attribute going out of range with religions over 10 (The bonus is always 0 now if the religion index > 9).
- **Note:** Do not use religions > 10 in getting CombatVsReligion attributes from named character struct! - *Fynn*
- Reinstated some lost fixes including getting building by name on disk version. - *Fynn*

### **Lua Plugin**
- Removed default `CTRL+1` and `CTRL+2` binds for the Console/Developer Mode.
- These are now bindable in Lua, see `M2TWEOP.toggleConsole()` (Bound to `CTRL + ~` by default) and `M2TWEOP.toggleDeveloperMode()` (Bound to `ALT + ~` by default)
- Added `M2TWEOP.setEquipmentCosts()`. Allows you to set the siege points required to make different siege equipment. *Fynn*
- Fixed `battleObjective:getType()` to properly return the right type *Fynn*
- Added `battleBuildings` field to `battleResidence` struct - *Fynn*
- Added CombatVsFaction and CombatvsReligion arrays to namedCharacter - *Fynn*
- Added regionID to character and resource - *Fynn*
- Expanded and fixed siege struct a bit - *Fynn*

### **ImGUI**
- Updated to the latest version of the ImGUI library - *Fynn*
- This version bump will likely have some very small breaking changes but also includes a bunch of bugixes, performance enhancements and new features! Please consult the docs and report any bugs you find.
- Previous Version: [1.86.0](https://github.com/ocornut/imgui/releases/tag/v1.86)
- Current Version: [1.90.2](https://github.com/ocornut/imgui/releases/tag/v1.90.2)
- Added a bunch of new keys available to be used within ImGUI - *Fynn*


### **Documentation**
Expand Down
Binary file added generateTest/M2TWEOP GUI.exe
Binary file not shown.
Binary file added generateTest/M2TWEOPLibrary.dll
Binary file not shown.

0 comments on commit eed6d4b

Please sign in to comment.