Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
658829e
Refactor defeat logic
Hdt80bro Nov 11, 2025
4bdda77
Cleanup
Hdt80bro Nov 11, 2025
d731d69
Refactor some more
Hdt80bro Nov 11, 2025
567f301
Let recall transfer unfinished units
Hdt80bro Nov 11, 2025
7828780
Merge branch 'develop' into simplify-defeat-backend
Hdt80bro Nov 30, 2025
64646c2
Process feedback and more
Hdt80bro Nov 30, 2025
d41ed34
Do another pass
Hdt80bro Nov 30, 2025
02c13a6
Appease the rabbit
Hdt80bro Dec 1, 2025
912c995
Fix "undefined global" warnings
lL1l1 Dec 16, 2025
cd9775c
Fix undefined field warning
lL1l1 Dec 16, 2025
7e19835
Add timestamps to victory condition debug logging
lL1l1 Dec 16, 2025
0ca972f
debug logging
lL1l1 Dec 16, 2025
9058c02
Increase grace period from 10 to 12 seconds
lL1l1 Dec 16, 2025
581a551
Revert "debug logging"
lL1l1 Dec 16, 2025
f6da380
Revert "Add timestamps to victory condition debug logging"
lL1l1 Dec 16, 2025
c68307a
improve UpdateUnitCap variable names
lL1l1 Dec 16, 2025
0b59cd0
Remove unnecessary comment in UpdateUnitCap
lL1l1 Dec 16, 2025
5113b8b
Update partialShareCategory comment
lL1l1 Dec 16, 2025
036a020
Remove unused CommanderSafeTime upvalue
lL1l1 Dec 16, 2025
926add5
change name of ThreadSuspendUntilUnitsDead
lL1l1 Dec 16, 2025
cc8ed1c
de-duplicate SimUtils import in aibrain
lL1l1 Dec 16, 2025
e121cc5
change `GetArmyBrain()` to `ArmyBrains[]`
lL1l1 Dec 17, 2025
ab18902
Fix victory condition not using DelayBeforeGameEnds
lL1l1 Dec 20, 2025
eee2cf1
Add time unit to EndGameGracePeriod comment
lL1l1 Dec 20, 2025
077974f
Shorten game end by 2 seconds
lL1l1 Dec 20, 2025
f0d1c83
Merge branch 'develop' into simplify-defeat-backend
lL1l1 Dec 20, 2025
18ddac7
Remove duplicated functions
lL1l1 Dec 20, 2025
6b9ba0b
Fix `EndGame` comment
lL1l1 Dec 20, 2025
06e78c7
Remove last GetArmyBrain
lL1l1 Dec 20, 2025
b692446
Use table.empty check instead of nil check for GiveUnitsToPlayer
lL1l1 Dec 20, 2025
f760bea
Create fix.6985.md
lL1l1 Dec 20, 2025
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: 1 addition & 1 deletion engine/Sim.lua
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ end

--- Gets the current game time in ticks.
--- The game time is the simulation time, that stops when the game is paused.
---@return number
---@return integer
function GetGameTick()
end

Expand Down
2 changes: 1 addition & 1 deletion lua/SimSync.lua
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ function FloatingEntityText(entityId, text)
end

function StartCountdown(entityId, duration)
cdDuration = duration or 5
local cdDuration = duration or 5
if not entityId then
WARN('Trying to start countdown text with no entityId.')
return false
Expand Down
Loading