1
0
forked from 0ad/0ad
Commit Graph

19992 Commits

Author SHA1 Message Date
Alexandermb
a56c81a79c Fix of concern raised following the latest commits.
Emergency commit of what is fixed already because an ongoing blackout in
my country.

Thread:
https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/10/

This was SVN commit r22732.
2019-08-20 19:22:16 +00:00
3962a050f5 Rename gastraphetes template corrects the <Identity> node:
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2202
This was SVN commit r22731.
2019-08-20 18:38:25 +00:00
Alexandermb
baa9ac4a50 Assignation of Shields (Aspis and Peltast) and Greaves for the infantry + Several adjustments
following the next committs:

1 - Animations re-export 9ef5e274c7
2 - Aspis Remake c0b562f79b
3 - Greaves ff8fadcd22
4 - Peltast Remake 5ae660300e
5 - Special formations 95a9ecf99e
6 - Preparation of infantry textures for the use of Greaves ebf907534a

This was SVN commit r22730.
2019-08-20 16:23:17 +00:00
Alexandermb
35a1b6759a Peltast Variants.
Forgot to committ variants in 5ae660300e.

Following the fixes of #4460

Thread:
https://wildfiregames.com/forum/index.php?/topic/26817-task-peltast-shields/page/2/

This was SVN commit r22729.
2019-08-20 16:08:21 +00:00
Alexandermb
ebf907534a Preparation of infantry textures for the use of Greaves.
Following ff8fadcd22

Note: .dds textures won't be modified since they lost player color when
saving again.

This was SVN commit r22728.
2019-08-20 15:53:16 +00:00
Alexandermb
671b22569d Aspis Miscellaneous fix.
Fix warning raised by a double variant and an unrelated persian
cavalry_spearman_b_m.xml actor file.

Following c0b562f79b

Thread:
https://wildfiregames.com/forum/index.php?/topic/26720-task-aspis-remake/page/2/

This was SVN commit r22727.
2019-08-20 15:41:10 +00:00
Alexandermb
4371f8cea5 Animations re-export "Remove unused animations from Cavalry/Rider Folder"
Patch by: @Alexandermb
Thread:
​https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340
Refs #4460

This was SVN commit r22726.
2019-08-20 15:38:38 +00:00
Alexandermb
95a9ecf99e Special formations
Following the fixes of #4460

Thread:
https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/10/#comments

This was SVN commit r22725.
2019-08-20 15:34:23 +00:00
Alexandermb
5ae660300e Peltast Remake.
Update of peltast textures and mesh with better geometry and higher
resolution textures.

Following the fixes of #4460

Thread:
https://wildfiregames.com/forum/index.php?/topic/26817-task-peltast-shields/page/2/

This was SVN commit r22724.
2019-08-20 15:33:09 +00:00
Alexandermb
c0b562f79b Aspis Remake.
Update of aspis textures and mesh with better geometry and higher
resolution textures.

Following the fixes of #4460

Thread:
https://wildfiregames.com/forum/index.php?/topic/26720-task-aspis-remake/page/2/

This was SVN commit r22723.
2019-08-20 14:22:28 +00:00
Alexandermb
ff8fadcd22 Greaves
Replace the greaves from textures and add meshes for have normal map and
specularity.

Textures will be replaced in another committ


Thread:
https://wildfiregames.com/forum/index.php?/topic/26774-task-greaves/page/2/#comments

This was SVN commit r22722.
2019-08-20 13:47:58 +00:00
Alexandermb
9ef5e274c7 Animations re-export "Remove animations from New/ Folder"
Patch by: @Alexandermb
Thread:
​https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340
Refs #4460

This was SVN commit r22721.
2019-08-20 12:21:56 +00:00
e82d0867b2 Erase unused variable following 77b81d8761, clean two stray includes from c19f3608a5.
Confess a wrong word in a comment in c9c82d9daf and a typo in a comment
in 9985fcf5bd.

Differential Revision: https://code.wildfiregames.com/D2203
This was SVN commit r22720.
2019-08-20 10:51:29 +00:00
23e742f13c Correct Persian specific names
Patch by: @Nescio
Reviewed by: @Stan
Differential Revision: https://code.wildfiregames.com/D1935
This was SVN commit r22719.
2019-08-20 09:28:02 +00:00
e4f38b4b5d Animations re-export "Variant Update"
Patch by: @Alexandermb, Native EOL, XML headers, Indentation by @Stan
Thread:
​https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340
Refs #4460

This was SVN commit r22718.
2019-08-20 09:10:38 +00:00
fad30c0ba5 Animations re-export "Infantry-Javelinist"
Patch by: @Alexandermb, Native EOL by @Stan
Thread:
​https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340
Refs #4460

This was SVN commit r22717.
2019-08-20 09:07:43 +00:00
3d5671e377 Animations re-export "Infantry-Knife"
Patch by: @Alexandermb, Native EOL by @Stan
Thread:
​https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340
Refs #4460

This was SVN commit r22716.
2019-08-20 09:07:25 +00:00
cf1e1b463c Animations re-export "Infantry-Pikeman"
Patch by: @Alexandermb, Native EOL by @Stan
Thread:
​https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340
Refs #4460

This was SVN commit r22715.
2019-08-20 09:07:03 +00:00
e5282d14d4 Animations re-export "Infantry-SiegeOperators"
Patch by: @Alexandermb, Native EOL by @Stan
Thread:
​https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340
Refs #4460

This was SVN commit r22714.
2019-08-20 09:06:43 +00:00
861a2694e4 Animations re-export "Infantry-Slinger"
Patch by: @Alexandermb, Native EOL by @Stan
Thread:
​https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340
Refs #4460

This was SVN commit r22713.
2019-08-20 09:06:21 +00:00
ca64e6b6b0 Animations re-export "Infantry-Spearman"
Patch by: @Alexandermb, Native EOL by @Stan
Thread:
​https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340
Refs #4460

This was SVN commit r22712.
2019-08-20 09:06:01 +00:00
82de03fe0e Animations re-export "Infantry-Swordsman"
Patch by: @Alexandermb, Native EOL by @Stan
Thread:
​https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340
Refs #4460

This was SVN commit r22711.
2019-08-20 09:05:09 +00:00
3f0dcc6353 Animations re-export "Infantry-Hoplite"
Patch by: @Alexandermb, Native EOL by @Stan
Thread:
​https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340
Refs #4460

This was SVN commit r22710.
2019-08-20 09:04:04 +00:00
1bcd24545e Animations re-export "Infantry-Gastaphrete"
Patch by: @Alexandermb, Native EOL by @Stan
Thread:
​https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340
Refs #4460

This was SVN commit r22709.
2019-08-20 09:03:37 +00:00
0af0c80c84 Animations re-export "Infantry-Archer"
Patch by: @Alexandermb, Native EOL by @Stan
Thread:
​https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340
Refs #4460

This was SVN commit r22708.
2019-08-20 09:03:05 +00:00
bae9546246 Animations re-export "Infantry-Base"
Patch by: @Alexandermb, Native EOL by @Stan
Thread:
​https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340
Refs #4460

This was SVN commit r22707.
2019-08-20 09:02:24 +00:00
550057d5dd Animations re-export "Formation-Testudo"
Patch by: @Alexandermb, Native EOL by @Stan
Thread:
​https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340
Refs #4460

This was SVN commit r22706.
2019-08-20 09:00:22 +00:00
0b4846b2ff Animations re-export "Formation-Syntagma"
Patch by: @Alexandermb, Native EOL by @Stan
Thread:
​https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340
Refs #4460

This was SVN commit r22705.
2019-08-20 08:59:51 +00:00
24278387fc Animations re-export "Formation-AntiCavalry"
Patch by: @Alexandermb, Native EOL by @Stan
Thread:
​https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340
Refs #4460

This was SVN commit r22704.
2019-08-20 08:59:09 +00:00
0fc348648f Animations re-export "Gatherer"
Patch by: @Alexandermb, Native EOL by @Stan
Thread:
​https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340
Refs #4460

This was SVN commit r22703.
2019-08-20 08:57:35 +00:00
9cdf2abf35 Animations re-export "Rider"
Patch by: @Alexandermb, Native EOL by @Stan
Thread:
​https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340
Refs #4460

This was SVN commit r22702.
2019-08-20 08:56:25 +00:00
5f5fd12d86 Animations re-export "Fisherman"
Patch by: @Alexandermb, Native EOL by @Stan
Thread:
​https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340
Refs #4460

This was SVN commit r22701.
2019-08-20 08:55:32 +00:00
ca901415c7 Animations re-export "Citizen"
Patch by: @Alexandermb, Native EOL by @Stan
Thread:
​https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340
Refs #4460

This was SVN commit r22700.
2019-08-20 08:55:05 +00:00
b6d96546fc Animations re-export "Chariot"
Patch by: @Alexandermb, Native EOL by @Stan
Thread:
​https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340
Refs #4460

This was SVN commit r22699.
2019-08-20 08:54:29 +00:00
8b6eee672b Move GUI string parsing specializations to a separate file and remove __ParseString proxy.
Differential Revision: https://code.wildfiregames.com/D2194
This was SVN commit r22696.
2019-08-19 19:43:13 +00:00
77b81d8761 Remove IsBoolTrue helper function from c399dc277e.
This property is defined as a boolean for every IGUIObject.
If GUIObjects were empowered to make up their own hidden property, then
they should also be empowered to use custom boolean hidden properties
that don't trigger ResetStates.

This was SVN commit r22695.
2019-08-19 18:36:35 +00:00
d403d750f0 Stop copying color every draw call for every GUI object using colors.
Avoid color copies for rendering Draw calls in
GUIRenderer::UpdateDrawCallCache, CButton::Draw, CChart::DrawAxes,
CDropDown::Draw, CList::DrawList, COList::DrawList, refs #1984,
8f4f8e240f, 3028551b91, a905fbbc98.
Avoid color copies during XML loading in CGUI::Xeromyces_ReadImage,
CGUI::Xeromyces_ReadEffects, COList::HandleAdditionalChildren.
Add CGUI::HasPreDefinedColor and mark m_PreDefinedColors,
CGUI::GetPreDefinedColor, IGUIButtonBehavior::ChooseColor() as const for
consistency with the other "databases", refs 3028551b91.
Mark CGUIColor as NONCOPYABLE to add compiler errors if there is an
unexplicit copy, refs 3028551b91.
Explicit ugly copy in CGUI::Xeromyces_ReadColor and
CGUIColor::ParseString.
Deregister copying <CGUIColor>GetSetting functions, refs 8f4f8e240f.
Uses the const ref GetSetting from 3dfa23cd25.

This was SVN commit r22694.
2019-08-19 12:53:58 +00:00
3dfa23cd25 Use a new GetSetting returning a reference instead of GetSettingPointer when the setting is known to exist.
Differential Revision: https://code.wildfiregames.com/D2192
This was SVN commit r22693.
2019-08-19 10:32:29 +00:00
5cfef19a06 Simplify the translations maintenance script.
- Removed bashisms
- Removed the call to SVN update which is usually done beforehand in CI
- Removed the git alternative which is never used
- Fixed the call to poediff which seems to fail with latest poediff

Tested on Jenkins since the revamp.
Reviewed By: Gallaecio
Differential Revision: https://code.wildfiregames.com/D2078
This was SVN commit r22690.
2019-08-18 18:13:04 +00:00
9985fcf5bd Move GUI<>::FallBackSprite and GUI<>::FallBackColor to CGUIColor::operator|| and CGUISpriteInstance::operator||.
Leaves only setting management in GUIutil.h.

Differential Revision: https://code.wildfiregames.com/D2185
This was SVN commit r22689.
2019-08-18 15:17:49 +00:00
4e55808cf9 Scipio Aeminialus → Scipio Aemilianus
Reported by xtother90 at Transifex

This was SVN commit r22688.
2019-08-18 13:44:57 +00:00
e0c739c8d9 Standardized catafalque aura descriptions
Differential Revision: D1807
This was SVN commit r22687.
2019-08-18 13:25:54 +00:00
491fe12f85 Capitalize classes in team bonus descriptions
Differential Revision: D2179
This was SVN commit r22686.
2019-08-18 13:12:59 +00:00
4bdea62915 Upgrade into a %(name)s → Upgrade to %(name)s
Differential Revision: D2165
This was SVN commit r22685.
2019-08-18 13:03:31 +00:00
Alexandermb
a33857537d Animations re-export "Cavalry Javelinist Rider Animations"
Thread:
https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/7/&tab=comments#comment-382340

Comment: An animation re-export of all unit meshes and armatures for fix
3 duplicated vertex groups in all files from the initial infantry
update.

This was SVN commit r22683.
2019-08-17 12:59:57 +00:00
c9c82d9daf Use shared_ptr to avoid copying and deleting SGUIImageEffects, 2.5x faster in a benchmark, refs ba0ebd6644.
Differential Revision: https://code.wildfiregames.com/D2184
Refs 3028551b91/D2163
Tested on: gcc 9, Jenkins

This was SVN commit r22682.
2019-08-17 11:52:57 +00:00
742f361b2d Improve performance of ScriptInterface::CreateObject from b4626359f5 / D2080 by creating the JSAutoRequest struct only once instead of once per property.
Differential Revision: https://code.wildfiregames.com/D2127
Comments By: Vladislav
This was SVN commit r22680.
2019-08-17 03:30:07 +00:00
ba56191dc2 Move CGUI::GenerateText to CGUIText constructor, CGUI::DrawText to CGUIText::Draw, SGenerateTextImage from CGUI to CGUIText.
Makes GUI text construction 30x faster for empty strings, otherwise less
than 1% faster.
Split the constructor into smaller helper functions to reduce nesting
and improve readability.
Change m_GeneratedTexts from pointer to reference, so that one doesn't
have to keep track to delete it correctly in several places, without
having to resort to copy or move assignments but constructing in place.
Mark CGUIText as NONCOPYABLE and MOVABLE which is already implicitly the
case due to the CGUISpriteInstance members, refs 0a7d0ecdde/D2133,
D2163/3028551b91.

Differential Revision: https://code.wildfiregames.com/D2168
Prepared by the GUIText.h file split in 838889ab12 / D2167.
Comments By: Vladislav
Tested on: gcc 9, clang 8, VS2015, Jenkins
Inlining tested using: clang -Rpass=inline and gcc -Winline

This was SVN commit r22679.
2019-08-17 01:32:11 +00:00
24f97d9fd5 Fix unreported glooxwrapper leaks following 61261d14fc, refs #2305.
Fixes an occurring leak indicated by the reported clang unused variable
compiler warning, refs #5294, #5550,
by adding the missing glooxwrapper::Jingle::Session::Session destructor
.

Fix two leaks that would have occurred if the according code had been
used:
Delete unused glooxwrapper::Jingle::ICEUDP::ICEUDP instead of adding the
missing destructor.
Delete unused glooxwrapper::Jingle::Content::Content instead of adding
the missing destructor.

Explain why glooxwrapper::Client::registerStanzaExtension doesn't leak
the new StanzaExtensionWrapper.
Explain why glooxwrapper::Jingle::Session::sessionInitiate doesn't leak
the new gloox::Jingle::Content, nor the new gloox::Jingle::ICEUDP.
Explain why glooxwrapper::SessionManager::registerPlugins doesn't leak
the new gloox::Jingle::Content and new gloox::Jingle::ICEUDP.
Explain why glooxwrapper::SessionManager::createSession doesn't leak the
gloox::Jingle::Session.

I will not leak memory in the glooxwrapper.
I will not leak memory in the glooxwrapper.
I will not leak memory in the glooxwrapper.

Use references in the StunClient and glooxwrapper to anticipate any
confusion as to whose obligation it is to delete variables when they are
passed around across several files.
Use static_cast and reinterpret_cast instead of C-style casts in the
StunClient.

Differential Revision: https://code.wildfiregames.com/D2094
Refs D2093 for the reported leaks.
Reviewed By: Josh
Comments By: fcxSanya, Vladislav for D2094, and echotangoecho, leper in
61261d14fc

This was SVN commit r22678.
2019-08-17 00:12:19 +00:00
Alexandermb
06c1bca952 Fix issue with two wrong path and name following c2e9e2263a
Noted by @minohaka

This was SVN commit r22677.
2019-08-16 21:58:25 +00:00