1
0
forked from mirrors/0ad
Commit Graph

20000 Commits

Author SHA1 Message Date
wraitii 74897ebc2d Move palisades from other/ to structures/
Following D1881 which introduced a common parent, palisade templates can
be moved:
 - other/palisades_rocks_* to structures/palisades_*
 - other/palisades_*_spike* to structures/palisades_spike*

Map scripts were updated accordingly.

Patch By: Nescio
Reviewed By: wraitii
Refs #4770

Differential Revision: https://code.wildfiregames.com/D2234
This was SVN commit r22982.
2019-09-23 07:48:00 +00:00
wraitii d69da4c948 Fix undefined resource in PetraAI diplomacy manager after D1846/077c4f2576.
Patch By: Freagarach
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D2319
This was SVN commit r22980.
2019-09-23 06:46:40 +00:00
wraitii 92ad6a61fa Fix OOS introduced by pathfinder threading preparation diff d592bf9cb6
Following d592bf9cb6, paths were computed at the end of turn N, and then
messages were sent at the beginning of turn N+1. However, the path
requests were removed at the end of turn N and so weren't serialised,
and neither were computed paths. This meant rejoiners would OOS when the
game was serialised with pending path results.

To fix this in preparation for threading, the architecture needs to
change slightly so that requests are kept and serialised correctly, and
rejoiners can compute the paths after deserialisation, in order to send
the messages at the beginning of turn N+1.

Fixes #5604

Reported By: elexis
Differential Revision: https://code.wildfiregames.com/D2317
This was SVN commit r22979.
2019-09-23 06:38:16 +00:00
LordGood 83b7dac3f4 Split ptolemaic house actors into old and new files
This was SVN commit r22977.
2019-09-23 00:58:02 +00:00
elexis b9d413852b Cleanup GUI includes, whitespace, map iterators, nullptr.
Remove TODO comment about m_Children deletion from e21ebb37f5, refs
e05f939fab / D2311.

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

This was SVN commit r22976.
2019-09-22 23:28:25 +00:00
elexis e67f364887 Warn if the derived class and the base class have the same AddSetting call instead of silently ignoring it.
Enabled by f69261d37b (refs d412b2010b / D2314, 7bb0f2ea69 / D2318).
Helps structuring the GUI so that AddSetting and GetSetting are in the
same file, which defragments code and may allow for future optimizations
(setting values as class members for Draw calls), refs D2313.

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

This was SVN commit r22975.
2019-09-22 22:49:20 +00:00
Alexandermb cc494ec5df Celtic iron Sheath
This was SVN commit r22973.
2019-09-22 15:24:01 +00:00
Alexandermb 979150283d Enable greaves for some greek cavalry.
This was SVN commit r22972.
2019-09-22 15:23:18 +00:00
wraitii 987b36d53c Do not send Reflection and Refraction matrices to shader when not needed
Patch By: Angen
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D1954
This was SVN commit r22971.
2019-09-22 14:56:22 +00:00
wraitii 077c4f2576 Adds a "properties"-property to resources and let mods be able to prevent resources from being bartered, traded and/or tributed.
Patch By: Freagarach
Comments By: elexis, Stan`, Nescio
Reviewed By: wraitii, Angen
Fixes #4370

Differential Revision: https://code.wildfiregames.com/D1846
This was SVN commit r22970.
2019-09-22 14:53:47 +00:00
elexis 7bb0f2ea69 Defragment IGUIButtonBehavior Settings.
Moves the AddSetting sound calls from CButton and CCheckbox to
IGUIButtonBehavior, since the latter is the only class to use them.
Moves ChooseColor from IGUIButtonBehavior to CButton, since that's the
only class to use it and the only class registering the dependent
Settings following b1422137e5 (refs d412b2010b / D2314)

Initialize m_PressedRight in the constructor to prevent undefined
behavior in possible future code following 0d204037b6, refs #1028.
Remove unused soundPath variable following 0e26503cc6 / D2209.

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

This was SVN commit r22969.
2019-09-22 14:53:27 +00:00
bb e771ff40ea Use arrow functions in AI filters
Comments By: elexis, wraitii
Differential Revision: https://code.wildfiregames.com/D1883
This was SVN commit r22968.
2019-09-22 14:01:49 +00:00
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 f69261d37b Remove AddSetting<CStrW>("tooltip") and AddSetting<CStr>("tooltip_style") calls redundant with the ones in the IGUIObject base constructor.
If all redundant calls are removed, the code will be able to warn about
them.

Tested on: clang 8.0.1

This was SVN commit r22958.
2019-09-21 16:13:18 +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
vladislavbelov aa72791b69 Fixes compilation errors about missed include and unused argument introduced in c17e7ee92f.
Patch By: elexis
Reported By: elexis
This was SVN commit r22950.
2019-09-20 19:44:58 +00:00
elexis 734d21464b Fix missing JSAutoRequest before JS_ReportError in various commits.
Differential Revision: https://code.wildfiregames.com/D2256
Tested on: clang 8.0.1, Jenkins

This was SVN commit r22949.
2019-09-20 19:18:07 +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
elexis e05f939fab Delete empty IGUIObject::Destroy function and MEGA TODO from 5122b0f906, e21ebb37f5.
None of the GUI object types implemented in the past two decades owns
children, only the CGUI page.

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

This was SVN commit r22943.
2019-09-20 15:25:13 +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
elexis 1bc6d778bb Delete GUI.h umbrella include following 8d0cb1b954.
Differential Revision: https://code.wildfiregames.com/D2304
Tested on: clang 8.0.1., VS2015, Jenkins
Comments By: Vladislav, Angen, Stan
Tested by: Angen
This was SVN commit r22941.
2019-09-20 13:11:18 +00:00
vladislavbelov 8f7729bfdb Fixes values of clip planes in PostProcManager.
Reviewed By: wraitii
Commented By: elexis
Differential Revision: https://code.wildfiregames.com/D2196
This was SVN commit r22940.
2019-09-20 07:54:44 +00:00
vladislavbelov c17e7ee92f Adds a helper function to pick entities with a given component and a given filter on screen.
Reviewed By: wraitii
Commented By: Stan, elexis
Differential Revision: https://code.wildfiregames.com/D2207
This was SVN commit r22939.
2019-09-20 07:45:55 +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
elexis a936cc618a Move CGUIDummyObject class used for empty GUI objects to a separate file, and put the according CGUI page base object on the stack.
Differential Revision: https://code.wildfiregames.com/D2206
Tested on: clang 8.0.1., Jenkins

This was SVN commit r22931.
2019-09-18 20:51:45 +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
vladislavbelov 7985ea4b8e Removes usages of duplication of Clamp function in simulation and atlas. Refs D1763.
This was SVN commit r22927.
2019-09-18 15:02:36 +00:00
vladislavbelov f1de8eb4ba Removes usages of duplication of Clamp function in gui, ps and renderer. Refs D1763.
This was SVN commit r22926.
2019-09-18 14:44:31 +00:00
vladislavbelov 050f1dc8df Removes usages of duplication of Clamp function in graphics. Refs D1763.
This was SVN commit r22925.
2019-09-18 08:34:36 +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