Commit Graph

13182 Commits

Author SHA1 Message Date
wraitii db4637f73a Fix issue with D274/e16c4c4800 - modifications are a list of effects, not a single effect
D274 introduced a silent change that modifications would only have one
effect per value-path, which was an unnoticed regression.

Detected following the comments from SonarQube reported here:
e16c4c4800#inline-4214

Comments By: elexis
Differential Revision: https://code.wildfiregames.com/D2315
This was SVN commit r22967.
2019-09-22 12:05:04 +00:00
elexis 31a2dd294e Fix top panel being hidden during pause mode following 702cdbf0c7 / D2292 reported by Freagarach, ValihrAnt, Krinkle et al.
Remove the false misleading default.cfg z value that is always
overwritten by CGUI::Xeromyces_ReadObject, both introduced in
e21ebb37f5.
Remove multiline property since its redundant with the default C++
boolean, making the default style more agnostic of final GUI Object
classes.

Close advanced locale dialog correctly upon cancel following 86c151ebaa
/ D1684.
Don't switch the background image when closing the credits dialog
following bcf2c75513, refs #3744.

This was SVN commit r22966.
2019-09-22 10:51:08 +00:00
wraitii 2678d5e52e Fix broken paths in d1bcce55db
The commit moved files but did not apply the changes.
Further, this sets eol-style native to these files.

Reported By: Angen
Differential Revision: https://code.wildfiregames.com/D2316
This was SVN commit r22965.
2019-09-22 10:11:11 +00:00
wraitii 026ce76e3f Update the fast-actions cheat and AI bonuses to use the modifiers manager
This deletes custom-code and shows how to use this system component for
triggers.

Differential Revision: https://code.wildfiregames.com/D1011
This was SVN commit r22964.
2019-09-22 07:46:29 +00:00
wraitii d1bcce55db Improve js glue code in D1839/61e3f1ec0d (hotkey state fix) and deal with rebase leftovers.
The code could be improved by using more modern code.

Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D2295
This was SVN commit r22963.
2019-09-22 07:38:13 +00:00
Alexandermb d96ac8ea24 Gladius sheath.
Fix a typo Transvesal > Transversal

This was SVN commit r22961.
2019-09-21 23:06:37 +00:00
elexis fb65515550 Fix missing replay menu function following loadgame and savegame unification bdc6a7d3fd / D2290.
Refs d64b95b28c, ad1a4d6121

Differential Revision: https://code.wildfiregames.com/D2309
String reviewed by: Nescio
This was SVN commit r22960.
2019-09-21 21:04:15 +00:00
Alexandermb 8fdfbb7cfd Transversal Crested gallic centurion helmet.
Requested by @Wowgetoffyourcelphone

This was SVN commit r22959.
2019-09-21 20:49:12 +00:00
elexis 702cdbf0c7 Remove GUI object setting values z="0", size="0 0 100% 100%", hidden="false" in XML page specifications that are redundant with the default style values.
Remove question by brian in single_details_area.xml from b66d1716e7
which is answered by "because the style set it".
Delete BuildNameText style, because it specifies ghost="true" in both
style and sole object using the style.
Don't touch progressbar and structree styles, because there is more to
clean.

Differential Revision: https://code.wildfiregames.com/D2292
This was SVN commit r22957.
2019-09-21 15:54:25 +00:00
elexis 869a9548a9 Delete duplicate global default style following 1e6614918b.
Excerpt from D2292.

This was SVN commit r22956.
2019-09-21 15:23:05 +00:00
Alexandermb a9d477b269 Replace old illyrian helmet on seleucid infantry archer.
Mentioned by @Stan

This was SVN commit r22955.
2019-09-21 15:09:59 +00:00
Alexandermb cf1c13b986 Replace illyrian helmet on athenian cavalry swordsman with the new one.
Remove a duplicated illyrian crested helmet of the old variant.

This was SVN commit r22954.
2019-09-21 14:56:43 +00:00
elexis d412b2010b Delete unused CCheckbox text setting remains following b1422137e5, refs 0f807c643a.
Differential Revision: https://code.wildfiregames.com/D2314
Tested on: clang 8.0.1., Jenkins

This was SVN commit r22952.
2019-09-21 03:11:18 +00:00
Alexandermb 47eb30056f Latest Fix
This was SVN commit r22948.
2019-09-20 16:13:47 +00:00
Alexandermb b56083071a Fix issues mentioned by @stan in this thread: https://wildfiregames.com/forum/index.php?/topic/25179-committed-hellenic-helmets/page/15/&tab=comments#comment-385394
This was SVN commit r22947.
2019-09-20 16:06:26 +00:00
Alexandermb 262056df42 Replace straw helmet
This was SVN commit r22946.
2019-09-20 15:37:40 +00:00
Alexandermb cc839ec521 Enable greaves on carthaginian champions.
This was SVN commit r22945.
2019-09-20 15:32:05 +00:00
Alexandermb bd66089319 Add updated carthaginian infantry pikeman champion shield.
This was SVN commit r22944.
2019-09-20 15:27:27 +00:00
Alexandermb d90dffab1f Fix latest issues of the old helmets files merge.
This was SVN commit r22942.
2019-09-20 15:13:54 +00:00
Alexandermb 76f82bbcac Replace hero_infantry_swordsman_marcellus.xml helmet with champion montefortino.
Replace mesh on hele_boeotian_g.xml to hele_boeotian_b.

This was SVN commit r22937.
2019-09-20 02:51:28 +00:00
Alexandermb 60049abcab Fix thracian_cap_01 missing on cavalry_javelinist_b_r.xml
This was SVN commit r22936.
2019-09-20 02:22:14 +00:00
Alexandermb f03a18f72e Improved peytrals for persian and seleucid cavalry.
3 New peytrals:

Pers with bronze and iron.
Pers winged bronze for cavalry javelinist.
Seleucid with bronze.

This was SVN commit r22935.
2019-09-19 22:26:33 +00:00
Alexandermb fec02fa2e3 Replace illyrian helmet on macedonian infantry with the new one.
replace mesh from hele_boeotian.xml.

This was SVN commit r22934.
2019-09-19 22:06:33 +00:00
Alexandermb 35dcdb263f Cleanup of helmets folder.
Merged all the old helmets files including meshes, textures and actors
to another sub folder called "old"

Added a better visual rome gallic helmet as replacement of the one i've
did before.

Replaced thracian helmet on spartan pikeman.

Replaced pers neckguard with one animated working like a cape.

Added the new persian conical helmet.

Added another pilos helmet for the persian cavalry.

Added another crest for the persian pilos helmet.

This was SVN commit r22933.
2019-09-19 21:53:07 +00:00
Alexandermb b88e7d8368 Following dd2a75b630 fix latest issues mentioned by @Stan in the hellenic helmets thread.
Removing some crest's done by me and replacing old crest's on iron
corinthian helmets.

Thread:
https://wildfiregames.com/forum/index.php?/topic/25179-committed-hellenic-helmets/page/15/&tab=comments#comment-385266

This was SVN commit r22930.
2019-09-18 19:57:34 +00:00
wraitii 4fd3f071a5 Fix SetGarrisoned() call when transforming an entity
Before cc1ea7cca0, the promotion code would carry the UnitAI
IsGarrisoned flag, which the Transform helper incorrectly didn't do.
However, this was missed when merging the two code paths.

This fixes an issue for example when units are promoted while atop
walls.

Reported By: faction02
Patch By: Freagarach
Differential Revision: https://code.wildfiregames.com/D2303
This was SVN commit r22929.
2019-09-18 19:07:16 +00:00
elexis bdc6a7d3fd Unify loadgame and savegame dialog following e0ea53a8ee, refs #2030.
This way the save dialog gains the sortable list and details section
feature from 10b49f9c18 / D246 by removing a folder of code, refs #4413.
Fixes a style warning about the old dialog using a style for an 'olist'
type for a 'list' type, refs be963ec9b7 / D2232.

Subsequently move the gui/common/ helper file to the page code, meaning
it's not loaded for every GUI page needlessly anymore.
Fix map preview aspect ratio.
Use object-oriented code for the moved savegame code, refs #5387, but
conserve the rest of the code to limit the changes for auditability.

Differential Revision: https://code.wildfiregames.com/D2290
Tested on: Jenkins

This was SVN commit r22923.
2019-09-18 02:33:43 +00:00
elexis 003d588d13 Happy savegame hack removal following e0ea53a8ee, refs #2030.
Simply pass the JS value to the Save functions instead of letting those
obtain the data later from the topmost GUI page.
The JS hack incidence appears to be unused since 4b1297b328.

Differential Revision: https://code.wildfiregames.com/D2302
Tested on: clang 8.0.1, Jenkins

This was SVN commit r22922.
2019-09-18 00:17:56 +00:00
elexis 41475093b0 Fix struc tree / civ info hotkeys following rebase error in adf448db4d / D2240 and don't trigger global hotkey handlers upon release following f192d4a2fa / D2260.
Differential Revision: https://code.wildfiregames.com/D2273
Tested on: clang 8.0.1., Jenkins
Tested by: Nescio
This was SVN commit r22920.
2019-09-17 22:42:50 +00:00
Alexandermb 7dcaf478d8 Update the corinthian helmet portrait with the ones done by @wowgetoffyourcelphone using @alexandermb new corinthian helmet render.
This was SVN commit r22915.
2019-09-16 17:40:11 +00:00
Alexandermb 9e6250660c Following dd2a75b630 Assign the new helmets and clean the unused files.
This was SVN commit r22914.
2019-09-16 17:38:19 +00:00
Alexandermb dd2a75b630 Several adjustments to the helmets and addition of new ones.
Fixed:

Replaced the Phrygian b helmet with b1 following the name schema of the
rest as well as adding 2 variants more of the same.

Added:

Add bronze specular for the bronze helmets.
Added Phrygian B12
Added Thracian B8 and B9
Added Celt Monte Bibele
Added Illyrian Helmets (B1; B2; B3)
Added new face mask's

Reworked:

Reworked Corinthian Helmet B1 and B2 with a more historically accurate
one.
Reworked the helmet's Crest's adding a better visual ones.
Reworked Phryian Face Mask's with better visual ones.

Renamed:

Renamed Apulo roman helmet to Apulo Itallic.
Renamed Phryian b to b1.
Renamed Thracian b to b1.

This was SVN commit r22913.
2019-09-16 17:11:03 +00:00
wraitii 14fff267a1 Make health correctly recalculate its cached values when the entity changes owner.
Following e16c4c4800, the ModifierManager no longer sends
ValueModificationMessages when an entity changes owner to/from
INVALID_ENTITY. This happens in particular when the entity is renamed.

For now, components must check on their own in OwnershipChanged.

Reported By: Freagarach
Patch By: Angen
Reviewed By: wraitii
Fixes #5588

Differential Revision: https://code.wildfiregames.com/D2286
This was SVN commit r22912.
2019-09-16 17:07:50 +00:00
wraitii 61e3f1ec0d Fix hotkey events synching with hotkey state.
This is a semi-revert of 78bc56f33e and a correct fix for #3194.

The core issue is that the GUI handler must come behore the hotkey
handler, otherwise typing in boxes can set off hotkeys, and the hotkey
handler is repsonsible for updating the hotkey state.
Thus the GUI handler never has an up-to-date hotkey state, since that's
done later. 78bc56f33e fixed that by calling HotkeyInputHandler
manually, but that was still broken in some (unused) cases and was hacky
(indeed, it even looked hacky as noted by elexis).

The simplest fix is to split the 'hotkey creator' handler from the
'hotkey state change' handler, and run the 'hotkey state change handler'
before any other handler. Thus the gui handler remains in front of the
'hotkey creator' handler, but it has a correct hotkey state at any time.

Differential Revision: https://code.wildfiregames.com/D1839
This was SVN commit r22909.
2019-09-15 12:16:28 +00:00
Gallaecio 5faf540980 -ise → -ize
Summary: This patch corrects two occurrences of -ise into -ize in the
quotes, because US spelling.

Test Plan: Ought to be unproblematic.

Reviewers: Gallaecio

Reviewed By: Gallaecio
Subscribers: Itms, Stan, Freagarach, O8 JS GUI

Differential Revision: https://code.wildfiregames.com/D2246
This was SVN commit r22907.
2019-09-15 11:52:59 +00:00
Gallaecio 740ba4cb78 standardize gather technology tooltips
Summary:
This patch standardizes the tooltips of gather technologies, per
https://trac.wildfiregames.com/wiki/EnglishStyleGuide#Stats
Flavour text strings are moved from the "tooltip" to the "description"
entry.

Test Plan: Check for mistakes and omissions.

Reviewers: Gallaecio

Reviewed By: Gallaecio
Subscribers: Freagarach

Differential Revision: https://code.wildfiregames.com/D2253
This was SVN commit r22906.
2019-09-15 11:51:59 +00:00
Gallaecio 5cc49c2326 standardized hero aura descriptions
Summary:
This patch rephrases the aura descriptions of hero auras to an uniform
standard, to ensure descriptions follow the actual modifications:
[player] [class] [change] [attributes], e.g. "Spearmen +1 capture attack
strength, +25% melee attack damage." instead of "+25% attack and +1
capture for spear soldiers."

See also D1720, D1806, D1807.

The `formation` and `garrison` type aura descriptions are ugly;
improvement suggestions are welcome.

Test Plan: Check for mistakes and omissions.

Reviewers: Gallaecio, Freagarach

Reviewed By: Gallaecio, Freagarach
Subscribers: Freagarach, elexis, Vulcan

Differential Revision: https://code.wildfiregames.com/D1808
This was SVN commit r22905.
2019-09-15 11:48:59 +00:00
Gallaecio 795f453eb7 manual/intro.txt corrections
Summary:
Another follow-up to D1719 and D1744. This one does the following:
* [font="sans-14"] (default) at the end of the line that used a
different font, rather than at the beginning of the next line (no net
change, but looks better in the file)
* two spaces for indentation of hotkeys (looks better in game)
* ` – ` (space en-dash space) instead of `: ` (colon space) to separate
hotkey and description, for better visibility and consistency.
* `6400px by 4800px` → `6400×4800 pixels`
* removed Alt+W entry (superseded by Alt+Shift+W above)
* inserted Esc entry under save game for completeness
* rephrased several descriptions

Before: {F1014718}
After: {F1014719}

Test Plan: Launch the game and open the manual.

Reviewers: O7 Catchall, Gallaecio, elexis, Itms

Reviewed By: Gallaecio
Subscribers: Freagarach, O8 JS GUI, Stan, elexis

Differential Revision: https://code.wildfiregames.com/D2110
This was SVN commit r22904.
2019-09-15 11:44:48 +00:00
wraitii 2333b1814e GUI support for Status Effects and extend their functionality to all attack effects following 16b452cf91
This fixes status effects following 16b452cf91 where the GiveStatus name
change broke them.

This lets status effects deal all types of damage, capture, or inflict
other status effects, like any attack.
This further adds some basic GUI spport to status effects, by showing up
to 5 icons in the top-right of the portrait, and including status
effects in the tooltips.

Status effects can specify a custom icon.

Differential Revision: https://code.wildfiregames.com/D2218
This was SVN commit r22901.
2019-09-15 09:24:52 +00:00
Stan 8f3277cb99 Add new improved berry bushes based on the old grapes actor.
Discussed with: @elexis
Refs: 4981cdedad
Thread:
https://wildfiregames.com/forum/index.php?/topic/17326-your-screenshots/page/23/

This was SVN commit r22889.
2019-09-11 12:51:16 +00:00
elexis 28aa7c20e4 Fix lobby playerlist rebuild following presence update message removal in 6bf74902a7/D2265.
Update the list when the data it is built from changes, not only for
presence changes.

Differential Revision: https://code.wildfiregames.com/D2283
Tested on: clang 8.0.1, Jenkins

This was SVN commit r22888.
2019-09-11 11:51:34 +00:00
Stan 4b0b545fa9 Use the pyrogenesis logo instead of the 0 A.D. logo for the modmod when there is no mod selected because 0 A.D. Empires ascendant is just a mod of Pyrogenesis
Fixes #4782

refs: a89bcf837b f46d721630, 27d99765bb

This was SVN commit r22884.
2019-09-10 13:51:50 +00:00
Stan 68705aa4b2 Fix the walk/feeding animation of the gazelle.
Assign the basic_trans material.
Reported by: @Freagarach
This was SVN commit r22883.
2019-09-10 07:54:16 +00:00
LordGood d59472fd42 ptolemy houses, Enrique's pines
This was SVN commit r22881.
2019-09-09 23:21:28 +00:00
elexis 92fc34c87c Pass XmppClient CertificateErrorToString independent of ConnectionErrorToString to JS using D2264 / 9023f4bebb, refs #4482.
This also allows making the enum to string functions static, refs D2271.

Differential Revision: https://code.wildfiregames.com/D2274
Tested on: clang 8.0.1, Jenkins

This was SVN commit r22880.
2019-09-09 21:26:58 +00:00
elexis d7e08a848a Beautify civinfo page with bullet points.
Differential Revision: https://code.wildfiregames.com/D2221
Patch By: Nescio
Comments By: Freagarach
This was SVN commit r22876.
2019-09-09 18:40:42 +00:00
Alexandermb 452c376fc0 Delete old roman helmet prop actor from roman infantry swordsman elite.
This was SVN commit r22872.
2019-09-08 12:50:49 +00:00
Stan efd77bd83d Fix a missing stoa template in the Miletus scenario following 97ee3211d4
This was SVN commit r22871.
2019-09-08 12:39:05 +00:00
Stan 1b8dcec53d Fix ptol temple's (from 7943d82bfe) rubble size and foundation size using the closest matching rubble and foundation. Rubble is currently not using correct units and is close to the size of the 5x9 foundation. The temple is a bit bigger than that one but we don't currently have anything bigger.
Reported by: @Nescio
This was SVN commit r22870.
2019-09-08 09:44:33 +00:00
LordGood 06fe767ffe fixed garrison flag on ptolemaic temple
This was SVN commit r22869.
2019-09-08 00:26:57 +00:00