Commit Graph

20314 Commits

Author SHA1 Message Date
Gallaecio 63cbcf2eb5 reduce excessive capitalization in game options
Title case is meant for titles, headers, entity names, classes, keys,
and button captions (see
https://trac.wildfiregames.com/wiki/EnglishStyleGuide#Capitalization ).
In the game options about every entry (two exceptions) in the lists is
capitalized, which is both unnecessary and excessive. This patch removes
title case from the listed items, reserving it for the section headers.

Before: {F1154299}
After: {F1154298}

Patch By: Nescio
Reviewed By: Gallaecio
Differential Revision: https://code.wildfiregames.com/D2437
This was SVN commit r23368.
2020-01-11 12:08:28 +00:00
Gallaecio 58b116fb4a main menu item tooltip corrections.
Minor corrections to several tooltips in the pre-game main menu.

Patch By: Nescio
Reviewed By: Gallaecio
Differential Revision: https://code.wildfiregames.com/D2428
This was SVN commit r23367.
2020-01-11 12:00:14 +00:00
Gallaecio 9b9410c923 [gui] building → structure
This patch corrects occurrences of “building” into “structure”.
Whilst “constructing a building” is proper English, it is important to
refer to one and the same thing with a single term, to avoid potential
misunderstandings (see
https://trac.wildfiregames.com/wiki/EnglishStyleGuide ), thence
“building a structure”, because the unit action is “build” and the
entity is a “structure” (see `simulation/templates/`).

Patch By: Nescio
Reviewed By: Gallaecio
Differential Revision: https://code.wildfiregames.com/D2429
This was SVN commit r23366.
2020-01-11 10:58:43 +00:00
vladislavbelov bbcd9b34cc Removes obsolete sys_cursor. Refs D2557.
sys_cursor was introduced in 7e1bcd5159 and partially in 5299dcad86.
Usage of sys_cursor was completely removed in 9a2d0f803e. At the moment
we use SDL and GL cursors.

Patch By: linkmauve
Comments By: Stan
This was SVN commit r23364.
2020-01-10 23:45:40 +00:00
vladislavbelov 604ec667f3 Removes possible copying of CStr in CTerrainTextureEntry and adds const where possible.
The copy returning was introduced in 7577d224a6.

This was SVN commit r23363.
2020-01-10 22:36:22 +00:00
vladislavbelov 39986f80e1 Adds const to PathfinderPassability where possible.
This was SVN commit r23362.
2020-01-10 20:37:59 +00:00
vladislavbelov c3ded34cf7 Improves performance of Atlas terrain elevation by updating the only changed terrain.
Reviewed By: Itms
Comments By: Stan
Differential Revision: https://code.wildfiregames.com/D2557
This was SVN commit r23361.
2020-01-10 19:54:35 +00:00
elexis 7567f56c71 Fix wrong Single-player main menu item tooltip and some indentation from adf448db4d, as reported by Freagarach, apply 3968760129/D2312 to that string.
This was SVN commit r23360.
2020-01-10 19:17:46 +00:00
Angen d12e5a9df0 Do not allow to override formation animation variants chosen when walking and define remaining combat variants
Fixing oversight from e7ab2c9b3f. Switching to columnar formation,
adding or removing formation members does not reset animation variant
passed by last order.

Also adding remaining combat variants for formationwalk.

Differential Revision: https://code.wildfiregames.com/D2556
This was SVN commit r23359.
2020-01-10 10:03:15 +00:00
Angen 900573e01c Fix missing phalanx animations
Fix missing phalanx animations following a8f7668bc6 because not
correctly added in e4f38b4b5d required because of 7cf6244110.

Differential Revision: https://code.wildfiregames.com/D2555
This was SVN commit r23358.
2020-01-10 09:33:24 +00:00
Angen ae341353d8 Fix units not reentering FORMATIONMEMBER.IDLE when no orders left
In 4ca448a686 : Make sure that formation members that end up in
INDIVIDUAL.IDLE go back to FORMATION.IDLE for sanity and for better
housekeeping

Differential Revision: https://code.wildfiregames.com/D2558
This was SVN commit r23357.
2020-01-10 09:31:22 +00:00
Alexandermb 34db988888 Remove front step from melee attacking animations making them more natural.
The front step or the quick "close-up" the infantry does while attacking
was a guide i've used while animating following the old attacking
animations, however this doesn't feel natural before and neither does
now. This animations follows the same attacking animation whitout
getting closer to attack in order to keep the visual mesh in the root of
the actor or the selection circle.

This avoid unnecesary clipping when attacking buildings.

This was SVN commit r23355.
2020-01-10 00:40:28 +00:00
Alexandermb f6f84d657f Adjust female mesh:
Reduced shoulders height to make them look more femenine.
Adjusted Female_Dress mesh UV for have a proper Texture alingment in the
lower dress.

This was SVN commit r23354.
2020-01-10 00:26:52 +00:00
Angen bd58e3ba1d Set last carried resource after promotion/transformation
Set last carried resource when transforming gatherer as that information
is needed to set correct animation variant.

Missing since 7499b23991 (was still relevant in that time for
"RETURNRESOURCE.APPROACHING")

Differential revision: https://code.wildfiregames.com/D2471
This was SVN commit r23353.
2020-01-09 21:21:38 +00:00
Angen e7ab2c9b3f Support order defined animation variants for formation
Allows to pass variant name when moving units to formation used by
UnitAi when formation is moving. That variant will be passed as
parameter of order FormationWalk so formationmember can set requested
variant.

This passed variant will be ignored if formation defines own variant
based on position of member.

When none of above is true, that means nor formation nor order defines
variant, member will fallback to default variant in order to show
carried resources if has some what makes it more consistant with
animation variants used in individual state.

Differential Revision: https://code.wildfiregames.com/D2550
This was SVN commit r23352.
2020-01-09 20:53:13 +00:00
Stan 2a363df67d Standardize fortress actor names. EOL to native.
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2553
This was SVN commit r23351.
2020-01-09 13:37:16 +00:00
Stan 2f3d862dae Update material settings to match basic_trans_parallax_spec.xml
This was SVN commit r23350.
2020-01-09 11:53:23 +00:00
Stan 5d2dd16126 Optimize some shields and shield props by not using basic_trans saving in some cases a few hundreds of polygons.
This was SVN commit r23349.
2020-01-09 10:50:51 +00:00
Stan 840375818e Optimize weapons meshes by not using basic_trans when not necessary.
This was SVN commit r23348.
2020-01-09 09:46:58 +00:00
Stan bc43a1a66e moved generic parent template
moved (four) specific structures
corrected ai file(s) accordingly
corrected appropiate map files (five scenarios and one skirmish)
moved one sound
moved an icon
moved the remaining art files for consistency.

Based on a patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2543
This was SVN commit r23347.
2020-01-09 08:56:29 +00:00
Angen ed54ad3486 Do not face point after movement for formation walk
After formation member ends walking, he tries to face target point.
However that eliminates rotation set by SetInPosition from formation
component. Partly fixed in 9d0b4db973 with setting correct rotation in
idle state, but one could still notice that there is glitch when unit
does quick turn to target point and then back. However that solution
would be still required if logic in SetInPosition would not be changed
to always set correct rotation. Another alternative would be to unset
unit at position with every walking order but that would have the same
effect and this is just more performance friendly to not splice member
from position every time.

Notice that information from inPosition is currently not used, so that
change in it is not braking anything.

This was SVN commit r23346.
2020-01-08 21:37:19 +00:00
Angen 46ea62f717 Remove formation speed multipliers introduced in 06e01ef944 based on 56b8fe31fd
This was SVN commit r23345.
2020-01-08 17:07:14 +00:00
Stan 9cd6ebed41 Fix space in seleucid temple pediment. This is against the art naming conventions, and it breaks Phabricator
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2544
This was SVN commit r23344.
2020-01-07 20:45:04 +00:00
Alexandermb d52e995deb Fix camel blanket issue while gathering meat.
Reported by @Stan

This was SVN commit r23343.
2020-01-07 20:38:14 +00:00
elexis 4a719e92aa Fix maps with StartingTechnologies (Carthaginian Demo map) following 8de5c26540/D1024, refs #4589, D2483.
Remove invalid and default gamesettings from Sahyadri Buttes (5) map
from 0286bd2245, same as 1f65e3df66, 7cf83f19fd.

This was SVN commit r23342.
2020-01-07 14:41:13 +00:00
elexis 626822e2ce Fix aiconfig dialog errors in multiplayer mode following b120404141, refs #3911 when reducing playercount and following 86c151ebaa/D1684 when unassigning the AI, reported by smiley and Freagarach.
Differential Revision: https://code.wildfiregames.com/D2538
This was SVN commit r23341.
2020-01-07 13:30:09 +00:00
Stan 385377820b athen_gymnasion.xml → athen_gymnasium.xml
Add some special maps for the old hellenes/gymnasium.xml actor.
Comments by: @Angen
Based on a patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2208
This was SVN commit r23340.
2020-01-07 10:14:00 +00:00
Stan 3b6e933c2b Correct sword prop for six units
Change the weapon of gaul infantry swordmen to (Celtic) csword, because
all other Celtic swordsmen (cavalry, champions, heroes, ptol
mercenaries) use it already and the spatha is a Roman cavalry sword;
Change the weapon of athen cavalry swordsmen to falcata
(kopis/makhaira), a chopping sword, because ancient sources (e.g.
Xenophon) emphasize cavalry used that, not a xiphos (similar to gladius
or akinakes), a short stabbing sword, unsuitable for horsemen.
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2033
This was SVN commit r23339.
2020-01-06 21:23:37 +00:00
Stan a4ad73430e Improve generic and specific names of healers.
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2155
This was SVN commit r23338.
2020-01-06 20:45:34 +00:00
Stan 154987ede9 gui/credits/*.json white space corrections
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2516
This was SVN commit r23337.
2020-01-06 14:40:13 +00:00
Stan f1bd2a40e0 Add Genava55 to the credits as discussed here https://wildfiregames.com/forum/index.php?/topic/25184-task-current-issues-with-celtic-units-and-guideline-for-the-next/page/6/&tab=comments#comment-390751.
This was SVN commit r23336.
2020-01-06 11:20:41 +00:00
vladislavbelov 8e48e1b17e Adds optional fixed shadows without swimming effect
Fixed shadows have fixed rendering distance. Also they don't have a
swimming (blinking) effect on camera movement/rotation.

Comments By: Stan
Differential Revision: https://code.wildfiregames.com/D2465
This was SVN commit r23333.
2020-01-05 22:44:39 +00:00
wackyserious e7caa135e0 Texture Update: New Iberian Unit Textures
Thread:
https://wildfiregames.com/forum/index.php?/topic/27446-committed-iberian-unit-textures/&tab=comments#comment-390689

Reviewed by: Lordgood, Alexandermb, Sundiata and Lion.kanzen
This was SVN commit r23332.
2020-01-05 15:00:02 +00:00
vladislavbelov a8f241da5d Adds snapping to edges for buildings
Allows to place buildings a bit faster and more perfectly aligned. Also
it helps to find a nearest placeable position in some cases.

Reviewed By: elexis
Comments By: Stan, wraitii
Differential Revision: https://code.wildfiregames.com/D2079
This was SVN commit r23330.
2020-01-05 01:08:05 +00:00
elexis cf7635f57b Remove JSInterface_Lobby IsRankedGame function duplicitous with g_GameAttributes.settings.RatingEnabled && !g_IsReplay, refs #3550, D2483.
This was SVN commit r23329.
2020-01-04 17:10:12 +00:00
elexis b9dc24d5ec Fix cart_tower_bolt, ptol_tower_bolt civs broken since d4db7d2e0b.
This was SVN commit r23328.
2020-01-04 16:02:17 +00:00
wackyserious e2ac957ddc Texture Update: Linothorax variants (Thespian, Italian and Greek)
Also tweaked some Carthaginian actor files.

Thread:
​https://wildfiregames.com/forum/index.php?/topic/22184-task-greek-unit-texture-general-thread/page/10/&tab=comments#comment-390422

Reviewed by: Art Department, Sundiata and other community members.
This was SVN commit r23327.
2020-01-04 12:03:23 +00:00
Angen 8bf7ab3c8d Fix texture name in carthaginian infantry_swordsman_e
Introduced in 8cf5a9eac4.

Differential Revision: https://code.wildfiregames.com/D2527
Reviewed by: Stan
This was SVN commit r23326.
2020-01-03 14:19:16 +00:00
elexis df109bd246 Fix XmppClient upon registration or entering wrong password following 2cccd9825d/D2412.
Differential Revision: https://code.wildfiregames.com/D2482
Tested on: clang 9.0.1, Jenkins/VS2015, Jenkins/gcc6

This was SVN commit r23323.
2020-01-02 22:14:14 +00:00
Angen 616a6db6b3 Fix style, Cc and slightly refactor ProductionQueue
Fix redeclarations of variables
Fix variable shadowing
Remove duplicated cmpPlayer
Move querying of the same components out of loop
Change if (foo.length > 0)  to if (foo.length)
Change if (foo == 0) to if(!foo)
Fix remaining var -> let
Remove white space from empty object { } to {}
Restyle more complicated objects

Differential Revision: https://code.wildfiregames.com/D2470
Comments by: elexis, Stan, nani
This was SVN commit r23322.
2020-01-02 20:29:07 +00:00
vladislavbelov 8abc7c051b Include Pyrogenesis.h and os_path.h where needed
These two headers were missing in various places, preventing build in
some cases.

Patch By: linkmauve
Tested By: Freagarach
Differential Revision: https://code.wildfiregames.com/D2481
This was SVN commit r23321.
2020-01-02 18:07:40 +00:00
elexis f96f0ec78e Throw JS exceptions instead of C++ breakpoints if lobby JS code calls a JSInterface_Lobby function under an invalid circumstance.
Differential Revision: https://code.wildfiregames.com/D2526
Tested on: clang 9.0.1, Jenkins/gcc6, Jenkins/VS2015, Jenkins/macOS

This was SVN commit r23319.
2020-01-01 21:49:13 +00:00
LordGood e4bb7f7fb7 Forgot the new tag
This was SVN commit r23318.
2020-01-01 10:50:35 +00:00
LordGood 0286bd2245 Sahyadri Buttes map and wind sway added to areca palm
This was SVN commit r23317.
2020-01-01 10:47:10 +00:00
wackyserious 64ea9868b8 Texture Update: Athenian Marines, Hellenic Thureophoroi and Theban Sacred Band
Thread:
https://wildfiregames.com/forum/index.php?/topic/22184-task-greek-unit-texture-general-thread/page/10/&tab=comments#comment-390422

Reviewed by: Lordgood and Lion.kanzen and several community members.
This was SVN commit r23315.
2020-01-01 02:08:17 +00:00
Angen 5ad75fa580 Precompiled logic update [Windows build]
Nuke HAVE_PCH and use only one macro for PCH logic.
This macro is enabled (=1) or disabled (=0) based on --without-pch and
no_pch parameters in premake5
Visual studio does not more override this logic

Differential Revision: https://code.wildfiregames.com/D1380
Reviewed by: @Itms
This was SVN commit r23314.
2019-12-31 13:58:48 +00:00
elexis 1f65e3df66 Remove default civs and invalid gamesettings from Obedska Bog and Obedska Bog Night as in 7cf83f19fd following d3ce9b05b2, de5d5f39c4.
Fix chicken trapped in Iberian starting walls.
Fix lineednings.

This was SVN commit r23310.
2019-12-29 19:29:07 +00:00
Stan 821935cb7d Remove some unused files noticed by @Vladislav and the checkrefs.pl script with --unused-files
This was SVN commit r23309.
2019-12-29 18:32:30 +00:00
Stan 14318bf206 Rename a png file pretending to be a DDS file. Add EOL Native property to the XML file.
Noticed by: @Itms
This was SVN commit r23308.
2019-12-29 18:24:41 +00:00
Alexandermb 1e6a888c11 Add missing attack_capture variants on some heros as conversed with @faterbushido
This was SVN commit r23307.
2019-12-29 16:37:36 +00:00