abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
19,804 Commits 2 Branches 28 Tags 13 GiB
3f9f1e379c
Commit Graph

19804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stan
3f9f1e379c Fix the last checkrefs.pl warning. 
This was SVN commit r22745.
 2019-08-21 13:48:09 +00:00
elexis
d4d5187c9d Use variadic template for RecurseObject from c2a71e41bf and move it from GUIutil to IGUIObject. 
Unifies the four copies of the function while making it more versatile.
Supersede the hardcoded GUIRR enum and CheckIfRestricted function with a
flexible member function pointer.
Replace the custom IGUIObject iterator with a casually iterable
GetChildren getter, so that it is more obvious what it iterates on.
Implement TODO from e21ebb37f5, i.e. RecurseObject not iterating over
the base object.

Differential Revision: https://code.wildfiregames.com/D2204
Tested on: gcc 9.1.0, clang 8.0.1, VS2015

This was SVN commit r22744.
 2019-08-21 13:22:25 +00:00
Alexandermb
0a29e04f1c Fix some warnings and adjust some 1 animation from having sheath throught the leg. 
Assign helmet properly to philip_r.

Assing falcata sheath to iberian_infantry

This was SVN commit r22743.
 2019-08-21 13:19:32 +00:00
Stan
ff1191f538 Fix most of the warnings. 
The last one needs a png file see
https://wildfiregames.com/forum/index.php?/topic/26720-task-aspis-remake/page/3/&tab=comments#comment-383062

Add two incorrectly deleted animations in the new folder in 9ef5e274c7
Make the erroring variants use the animations added in 3f0dcc6353 and
cf1e1b463c instead of the 'new' folder.
Make the fisherman use the death animation.
Use the c variant of an animation instead of the d one that does not
exist.

This was SVN commit r22742.
 2019-08-21 11:46:12 +00:00
elexis
e1014aad3b Use CGUI& instead of CGUI* so that the 50+ users stop wondering whether or not that is null and can't even be mistaken to add redundant null checks preemptively. 
Remove the remaining of such checks after d3e56f0f57 removed 21 of them
already.
2c47fbd66a initialized the pointer at construction time rather than at
random conditional events later.

Differential Revision: https://code.wildfiregames.com/D2205
Comments By: Vladislav, wraitii
Tested on: gcc 9.1.0, clang 8.0.1

This was SVN commit r22741.
 2019-08-21 10:12:33 +00:00
Stan
632f687ab6 Animations re-export "Infantry-Siege-Operators-Onager" 
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 r22740.
 2019-08-21 08:29:22 +00:00
vladislavbelov
486691b49a Moves and cleanups includes and public/private section of PostprocManager. 
Reviewed By: elexis
This was SVN commit r22738.
 2019-08-20 21:15:15 +00:00
vladislavbelov
3285f43394 Fixes bug with disabled fog on water. The usage of USE_FOG was introduced in 2c8b78ddaa and removed in 01a8138780. 
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D2198
This was SVN commit r22737.
 2019-08-20 21:03:46 +00:00
Alexandermb
63f3428363 Fix 1 animationn 
Following  a56c81a79c

front_left_walk.dae Exported all scene instead of the animation and the
mesh.

Note: Committed as two because HTTP Request timeout won't let me

This was SVN commit r22736.
 2019-08-20 20:39:45 +00:00
Alexandermb
d381f62113 Remove front_left_walk.dae from formations/testudo for commit the new one. 
Request timeout HTTP 408 issue.

This was SVN commit r22735.
 2019-08-20 20:10:26 +00:00
Alexandermb
4c1a3d9b3f Fix 1 animation. 
Following  a56c81a79c

idle_ready_shield.dae Last frame not sync with first frame.

This was SVN commit r22734.
 2019-08-20 20:03:26 +00:00
Alexandermb
df4458e031 Fix of concern raised following the latest commits 2. 
Following a56c81a79c

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 r22733.
 2019-08-20 19:57:10 +00:00
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
Stan
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
elexis
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
Stan
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
Stan
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
Stan
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
Stan
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
Stan
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
Stan
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
Stan
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
Stan
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
Stan
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
Stan
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
Stan
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
Stan
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
Stan
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
Stan
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
Stan
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
Stan
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
Stan
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
Stan
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
Stan
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
Stan
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
Stan
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
elexis
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
elexis
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
elexis
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
elexis
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