1
0
forked from 0ad/0ad
Commit Graph

24118 Commits

Author SHA1 Message Date
7c8c9fd59b [GUI] Remove Roman numerals from bot names
To avoid the appearance of two Roman numerals at the end of bot names
(e.g. "Artaxshasha II II -> here "Artaxshasha II" was the name itself
and the second "II" was added when the name was chosen for the second
time), remove the addition of Roman numerals entirely.

Instead, if possible, a new name is chosen for each bot. If not, the
suffix "(n)" is added counting the duplicates and warning is displayed.
AINames are added to the Iberians, Gauls, and Mauryas bringing their
totel to at least 8 each in order avoid any duplicates in regular
8-player games.

Credit to Norse_Harold for changing the condition for reusing names to
not use a hardcoded assumption about the maximum number of player slots

Patch by @Vantha
Accepted by @phosit, @wowgetoffyourcellphone

Differential Revision: https://code.wildfiregames.com/D5256
This was SVN commit r28082.
2024-05-09 18:31:33 +00:00
99cb6b03c5 [Gameplay] Increase capture points for Temple of Amun
Patch by: @real_tabasco_sauce
Differential Revision: https://code.wildfiregames.com/D5264
This was SVN commit r28081.
2024-05-09 18:12:44 +00:00
36626ac623 [Art] Fix the shields on the Roman Siege Ship
Reported to me by @Stan'

This was SVN commit r28080.
2024-05-09 17:57:10 +00:00
14ac8fd6e7 [Art] Add a special rubble actor for the Rice Paddy
Reported by: @Gurken_Khan on the forum
This was SVN commit r28079.
2024-05-09 16:37:33 +00:00
086e95d39c Don't move elements in the bottom panel of the game setup
Also fix the tooltip overlaping with the warning.

Differential Revision: https://code.wildfiregames.com/D5260
This was SVN commit r28078.
2024-05-09 11:11:35 +00:00
a16a3f82a1 Delete FSM.cpp forgotten in 3a5ad160f7
This was SVN commit r28075.
2024-05-05 06:04:22 +00:00
3a5ad160f7 Make CFsm a template
The context doesn't have to be converted to `void*` and back.


Differential Revision: https://code.wildfiregames.com/D5253
This was SVN commit r28074.
2024-05-04 16:13:02 +00:00
53f9faa4e0 [Gameplay Ships] Update tooltip for fire ship, reduce ignition time
Patch by: @real_tabasco_sauce
Differential Revision: https://code.wildfiregames.com/D5251
This was SVN commit r28072.
2024-04-30 23:37:01 +00:00
ba04cf3bd1 Use templates instead of macros to restrict access to the VFS
Subscribers: @sera, @Stan, @wraitii, @vladislavbelov

Differential Revision: https://code.wildfiregames.com/D5195
This was SVN commit r28066.
2024-04-13 17:12:47 +00:00
dd54414fe5 Improve batch training time tech description
In the Han CC I changed `0.8 * 0.75` to `0.8 - 0.2` so it could also be
described the same way.

Accepted By: @Freagarach
Comments By: @sera, @Stan
Trac Tickets: #6755

Differential Revision: https://code.wildfiregames.com/D5031
This was SVN commit r28065.
2024-04-12 18:39:17 +00:00
74afb17aa4 Split the Shutdown function
Comments By: @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D5148
This was SVN commit r28056.
2024-03-24 12:45:27 +00:00
a4f91e43ae Default many of CFsm's special functions and remove virtual specifires
Differential Revision: https://code.wildfiregames.com/D5249
This was SVN commit r28053.
2024-03-21 17:43:34 +00:00
78652aa92c Use std::function instead of inhereting from CNetFileReceiveTask
The user doesn't have to fiddle with `std::shared_ptr`.
And two (more unrelated) things: use `std::unordered_map`, use a
`std::find_if` in the callback.

Comments By: @vladislavbelov, @Stan
Differential Revision: https://code.wildfiregames.com/D5239
This was SVN commit r28048.
2024-03-09 14:31:43 +00:00
6b31999b64 Don't use std::shared_ptr<ScriptContext> in the CSimulation2
Since 1bccfef6fb the `CSimulation2` uses the `std::shared_ptr` only in
the constructor and stores a `ScriptContext&` (inside it's members).
That's a bit dangerous: A caller might think `CSimulation2` takes
ownership of the `ScriptContext`.
With this commit the caller has to pass an `ScriptContext&` to the
constructor.

Comments By: @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D5223
This was SVN commit r28046.
2024-03-08 17:15:25 +00:00
1b3e8a0218 Fix wrong default in "scaleByMapArea"
Noticed and patch proposed by @Feldfeld in 480228f964
Doesn't have any consequences as the function is only called via
"scaleByMapAreaAbsolute" in the codebase.

accepted by @Feldfeld @marder

Differential revision: https://code.wildfiregames.com/D5248
This was SVN commit r28042.
2024-02-28 06:44:09 +00:00
1eb11b39bf Remove the StateSet from FSM
The `StateSet` is only used to check if a state is valid. That's useless
since it wouldn't be found in the `TransitionMap` - With the same
outcome.

Accepted By: @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D5236
This was SVN commit r28039.
2024-02-25 14:05:23 +00:00
04ce68f42e rmgen: var -> let -> const
One should always use the variable declaration with the least possible
scope.
This patch cleans up many (but not all) of the `var` in rmgen and
replaces them with `let` or `const`.
The same is done for `let` -> `const`.

comments by: @sera @Stan
Differential revision: https://code.wildfiregames.com/D5214
This was SVN commit r28036.
2024-02-17 11:13:52 +00:00
e9bc76040d Accounts maxAnisotropy for Vulkan samplers.
This was SVN commit r28034.
2024-02-16 18:46:44 +00:00
483da49759 More generic hash function for FSM
The hash function introduced in 6faf704731 doesn't work on 32 bit
systems. This one should.

Accepted By: @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D5237
This was SVN commit r28033.
2024-02-16 17:31:40 +00:00
c1d7ac6182 [Art] Materials | Adjust normal affect on a couple terrain materials. The previous numbers were way too extreme.
This was SVN commit r28030.
2024-02-12 07:11:44 +00:00
7e433b5053 [Art] [Fix] Add 'garrisoned' prop points to the 3 Carthaginian ethnic Embassy structures.
Reported by: @Gurken_Khan
Thread:
https://wildfiregames.com/forum/topic/107313-alpha-27-pre-releaserelease-candidate-build-testing/?do=findComment&comment=564191

This was SVN commit r28029.
2024-02-12 07:09:50 +00:00
789cfb8cf5 [Fix] Add "pair" property forgotten in some techs.
Without the "pair" attribute API3..GameState.prototype.canResearch
doesn't check if the other tech is already researched (or is being
researched).

Patch by: @phosit
Accepted by: @wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D5238
This was SVN commit r28026.
2024-02-05 06:14:29 +00:00
62db78beec [PetraAI] - Fix resources (dead animals) coming in the defense army.
When a wild animal was in a defenseArmy and it was killed, its resource
got into the army as well. This caused a call to GetUnitAIOrder data
which was undefined for the resource.
Fixed by checking for UnitAI-ness and also for attack-ability whilst at
it.

Reported by @seregadushka at the forums:
https://wildfiregames.com/forum/topic/110098-petra-error-winter-is-coming5/.

Investigated and MWE by @Norse_Harold.
Fixes #6899

This was SVN commit r28025.
2024-02-02 12:40:52 +00:00
ca0f8d9bce [Art] Improve the look of the new Roman Antesignanus unit, based on descriptions posted on the forum.
This was SVN commit r28023.
2024-02-02 05:32:27 +00:00
7fd0365f8e [Art] A bunch of minor actor and texture improvements that would too inconsequential to have their own commits.
This was SVN commit r28022.
2024-02-02 03:43:48 +00:00
aee9c54b04 [Gameplay][fix] Use a promotion approach for Roman reforms special tech
Patch by: @real_tabasco_sauce
Accepted by: @borg-, @Riesi, @wowgetoffyourcellphone
Comments by: @phosit, @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D5206
Fixes #6888

This was SVN commit r28021.
2024-02-02 02:44:30 +00:00
6faf704731 Split the FSM-transitions and put them in an unordered_map
Comments By: @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D5225
This was SVN commit r28020.
2024-01-29 18:44:14 +00:00
15dca2c0c9 [GUI] Improve and Combine in-game HUD panel textures into a texture sheet
Patch by: @wowgetoffyourcellphone
Comments by: @Stan @vladislavbelov @sera
Accepted by: @real_tabasco_sauce

Differential Revision: https://code.wildfiregames.com/D5231
This was SVN commit r28016.
2024-01-22 05:59:23 +00:00
9c6f2e592e Don't check memory allocation made using new
Refs: #5288

Patch By: @animus
Accepted By: @phosit
Comments By: @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D5234
This was SVN commit r28014.
2024-01-21 14:29:30 +00:00
aeeeb2c8d9 Makes pipeline state dirty on Vulkan only when VertexInputLayout was changed.
This was SVN commit r28011.
2024-01-17 19:55:28 +00:00
e3f46bb809 Adds compute shaders support and scaling with FSR.
Fixes #6842

Comments By: phosit, Stan
Differential Revision: https://code.wildfiregames.com/D5218
This was SVN commit r28010.
2024-01-17 19:40:27 +00:00
f9f798158a [Mixins] Change the metal cost effect from multiply to add. Multiply didn't work correctly with Pirate Scout Ships.
This was SVN commit r28006.
2024-01-07 23:10:44 +00:00
d753fe9fca Missed this file in previous commit.
This was SVN commit r28005.
2024-01-07 20:33:44 +00:00
6913d8f167 [Fix] Ramming Ships do not deal double damage against Siege Ships
This was SVN commit r28004.
2024-01-07 08:09:30 +00:00
ec416a9ada [Art | Templates] Improve the look of the Persian civic center with Lamassu statues.
Also add: A lamassu stone ruin object and a Persian Shrine capturable
map object.

Modeling by: @stan'
This was SVN commit r28003.
2024-01-06 22:08:46 +00:00
f3f1ac6d6c [Templates] Add a new mixin for Pirate ships.
This was SVN commit r28002.
2024-01-06 18:11:40 +00:00
c76b8bed2b [GUI] Add a new loading tooltip for Shrines.
This was SVN commit r28001.
2024-01-06 17:58:21 +00:00
c28782a163 Checkref fixes for the Naval commit
This was SVN commit r27998.
2024-01-05 05:27:20 +00:00
3914b61068 [Fix] Oversight in d51b4687e9
Reported by: @stan'
This was SVN commit r27997.
2024-01-04 18:01:00 +00:00
d51b4687e9 [Gameplay] Complete Naval Overhaul (UnitAI and Warship Classes)
Warships now use the Unit AI instead of the Building AI. This allows
players to specifically target fire onto desired targets.
Warship combat now revamped with completely new Warship classes, which
soft counter each other, and new behavior for Fire Ships. With an
all-new ship tech tree at the Dock.
Commit includes fixing maps to switch from the old to the new ship
templates. Also includes revamped Cycladic Archipelago skirmish maps and
some other special surprises. And improved/additional ship UI portraits.

New Warship classes:

Scout Ship
Arrow Ship
Ramming Ship
Siege Ship

Forum discussion:
https://wildfiregames.com/forum/topic/104332-naval-overhaul-alpha-27/#comment-539713

Patch by: @wowgetoffyourcellphone
Accepted by: @real_tabasco_sauce
Comments and suggestions by: @borg-, @phosit (more comments and
discussion at the forum link)

Differential Revision: https://code.wildfiregames.com/D5213
Refs #4000 for a sound issue for actors without an attack animation.

This was SVN commit r27996.
2024-01-04 06:18:50 +00:00
b9da1cd823 Add files that are missing in 28e3b3fd62
This was SVN commit r27994.
2023-12-30 13:01:10 +00:00
28e3b3fd62 [Maps] Add water level support to Flood
In addition to the existing "Shallow" water level two water levels are
added:
- Deep: Only ships can reach other islands
- Rising: The water level changes from Shallow to Deep to a level where
the home islands are flooded.

Accepted By: @real_tabasco_sauce
Comments By: @marder, @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D5139
This was SVN commit r27992.
2023-12-28 20:22:48 +00:00
ba61b93f94 [Art] Improved fish portrait
This was SVN commit r27991.
2023-12-26 20:03:24 +00:00
2c4a230ad5 [Gameplay] Move Persian Immortals to the Barracks, make them cheaper, weaker. Now they can be massed more easily, but not be OP.
Patch by: @real_tabasco_sauce
Comments from: @borg-
Accepted by: @wowgetoffyourcellphone

Differential Revision: https://code.wildfiregames.com/D5202
This was SVN commit r27990.
2023-12-26 04:15:40 +00:00
c4e082bf9b Make QuitConfirmationReplay extend QuitConfirmation
Comments By: @Freagarach
Fixes: #6894

Differential Revision: https://code.wildfiregames.com/D5224
This was SVN commit r27989.
2023-12-23 09:36:36 +00:00
05356bb9fc Remove the FSM EventMap
Comments By: @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D5089
This was SVN commit r27987.
2023-12-20 20:44:06 +00:00
6dfe29959f [Art] Tech portrait. A goat.
This was SVN commit r27985.
2023-12-17 22:46:36 +00:00
890cad2339 Use the threadpool for texture conversion
Original Patch By: @Stan
Comments By: @vladislavbelov, @wraitii, @Silier, @sera
Differential Revision: https://code.wildfiregames.com/D4425
This was SVN commit r27984.
2023-12-17 09:43:54 +00:00
ea96002363 [Art] Two new tech portraits for Naval techs
This was SVN commit r27983.
2023-12-15 17:20:43 +00:00
d7001de399 Fix build with libxml2 v2.12.1
libxml2 v2.12.1 includes less header indirectly. Also `xmlError*` has to
be changed to `const xmlError*`.

Original Patch By: Riesi
Accepted By: @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D5219
This was SVN commit r27980.
2023-12-13 19:42:00 +00:00