1
0
forked from mirrors/0ad
Commit Graph

20291 Commits

Author SHA1 Message Date
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
Alexandermb 2bf3bef76e Fix trader variants as well as replace saddle prop point with rider.
Thread:
https://wildfiregames.com/forum/index.php?/topic/27415-error-message-appears!/&tab=comments#comment-390385

This was SVN commit r23306.
2019-12-29 16:34:13 +00:00
Itms cc7071c691 Upgrade NVTT to version 2.1.1, fixes #4549.
Windows binaries built with toolset v140_xp.
Tested under Windows, Linux and macOS.
Includes a patch for building on musl Linux, contributed by voroskoi,
containing code by leper.
Use the opportunity to set native line endings in the NVTT bundle.

The NVTT DLL was the last one built with VS 2010, refs #5379, #5527.

Differential Revision: https://code.wildfiregames.com/D2475
This was SVN commit r23305.
2019-12-29 11:21:33 +00:00
Itms fcac07213f Update libsodium to 1.0.18, built on Windows with toolset v140_xp.
Also fixes the download address in the macOS libraries script.

Tested on Windows and macOS.

This was SVN commit r23302.
2019-12-28 18:12:43 +00:00
Alexandermb 8b560d2380 Some walking with tool's animations.
Thread:
https://wildfiregames.com/forum/index.php?/topic/26012-committed-animations/page/32/&tab=comments#comment-390317

This was SVN commit r23301.
2019-12-28 14:58:30 +00:00
Angen 792e51b3dd [UnitAI] Fix return value on "enter" according to FSM logic
When entity is in "enter" phase of state and it was called SetNextState,
code have to return true in order to abort current state to work
properly ( else return false ).

Differential Revision: https://code.wildfiregames.com/D1943
This was SVN commit r23300.
2019-12-28 13:43:18 +00:00
Alexandermb d7bf234ad7 Fix some wrong folders with latest two committs.
This was SVN commit r23299.
2019-12-28 13:16:07 +00:00
Angen 67514fb9ce Automatically cancel packing or unpacking based on given order
Cancel packing when next command requires unpacked state and cancel
unpacking when next command requires packed state.

Fixing unit refusing to move because keeps unpacking to attack targets
in range.

Partially Fixes: #4015, #5328
Differential Revision: https://code.wildfiregames.com/D1520
Patch by: @causative
Comments by: elexis, Freagarach, Stan
This was SVN commit r23298.
2019-12-28 11:40:24 +00:00
Angen 3051c90955 Inform player that second market is too close to setup trade route
Display tooltip with disabled action and icon to player with
information, that markets are too close to setup trade route.

Differential Revision: https://code.wildfiregames.com/D2285
Reviewed by: @Freagarach
Comments by: elexis, Stan, Imarok, nani
This was SVN commit r23297.
2019-12-28 11:15:05 +00:00
Alexandermb acf524790c Camel update.
Overal enhancement of the camel mesh and animations.

New animations for the camel riders allowing for more camel cavalry unit
types (Swordsman, Spearman, Javelinist, Archer, Lancer. Shield and No
Shield Variants).

New death animation.

New idle animations.

Better motion for the running, walking, trotting animation.

New melee attacking animations for the camel.

Improvement of the rein for a more performance friendly actor.

This was SVN commit r23296.
2019-12-28 03:49:18 +00:00
Alexandermb 4c96e5e23b Replace mace oxybeles visual actor with the new one.
Replace "athenians" folder to "hellenes" in
siege_heavy_artillery_packed.xml

This was SVN commit r23295.
2019-12-28 02:52:48 +00:00
Alexandermb 3b422ede91 Upload missing variants from 8cf5a9eac4
Reported by @Stan

This was SVN commit r23294.
2019-12-28 02:51:04 +00:00
Angen a8f7668bc6 Add missing phalanx animation for carthaginian spearmen
Differentail Revision: https://code.wildfiregames.com/D2514
Reviewed by: @Stan
This was SVN commit r23293.
2019-12-27 20:24:02 +00:00
Stan 503f0f280b Add missing group tag in b8690f7c54
This was SVN commit r23292.
2019-12-27 16:24:04 +00:00
Stan 886b750fe9 Remove 462 polygons (4126 > 3664) on the Persian fishing ship by not using basic_trans.xml.
This was SVN commit r23291.
2019-12-27 16:14:46 +00:00
Stan b8690f7c54 Cleanup field actors. Remove basic_trans to default instead, and don't load more textures than needed.
This was SVN commit r23290.
2019-12-27 16:04:48 +00:00
Angen c9c8a47018 [AI] Small cleanup in defenseManager
Make comments to start with capital letter and ends with dot.
Remove not needed continue call.
Merge if condition

Differential Revision: https://code.wildfiregames.com/D2001
Reviewed by: @Stan
This was SVN commit r23289.
2019-12-27 14:03:32 +00:00
Angen 072f48651b Add disabled cursor icon for trade route
Needed for D2285
Created by @Stan

This was SVN commit r23288.
2019-12-27 10:37:27 +00:00
Alexandermb 8cf5a9eac4 Siege Artillery rework.
Thread:
https://wildfiregames.com/forum/index.php?/topic/27286-task-siege-artillery-rework/#comments

Visual improvement of siege artillery stone/bolt throwers such as:

Lithobolos.
Oxybeles.
Scorpio.
Polybolos.
Ballista.

New models, New animations, New actors.

This was SVN commit r23285.
2019-12-27 01:02:49 +00:00
LordGood d3ce9b05b2 Night version of Obedska bog, with stan's new fireflies
This was SVN commit r23284.
2019-12-26 21:47:00 +00:00
Angen b1a78ce285 Treat min range in the same manner as max range when computing goal
Problem description:
When unit gets command to move to the range exactly X units from some
point/entity, what means minRange == maxRange, that triggers computing
goal when distance < minRange with result distance(goal, target) >
maxRange, because minRange computation uses clearance even when is
treating target as circle.

Solution:
Do not use clearance when treating target as circle, so computation when
distance < minimum range is done in same way as computation when
distance > maximum range and so computed goal has correct position.

Reported on forum:
https://wildfiregames.com/forum/index.php?/topic/27384-strange-landing-on-the-island-and-unable-to-attack/
Differential Revision: https://code.wildfiregames.com/D2512
Tested by: gameboy
This was SVN commit r23283.
2019-12-26 21:03:15 +00:00
LordGood de5d5f39c4 New Skirmish map Obedska Bog.
This was SVN commit r23282.
2019-12-26 12:30:13 +00:00
Stan d8785cd477 Reorders the exceptions in the following files for consistency [EDIT]:
art.json
    history.json
    programming.json

and also renames:

    Hannibal_Baraq → Hannibal_Barca
    Lordgood → LordGood
    stanislas69 → Stan
Patch by: @Nescio
Comments by: @Freagarach, @Itms
Differential Revision: https://code.wildfiregames.com/D2427
This was SVN commit r23281.
2019-12-24 16:29:59 +00:00
wackyserious 4fb6346063 Texture Update: Athenian and Roman unit textures
Threads:
https://wildfiregames.com/forum/index.php?/topic/22184-task-greek-unit-texture-general-thread/
https://wildfiregames.com/forum/index.php?/topic/27371-task-iphicrates-unit-texture/
https://wildfiregames.com/forum/index.php?/topic/25533-committed-roman-infantry-new-texture/

Reviewed by: Art Department, Sundiata and Community members
Note: templates/units/rome_infantry_swordsman_slave.xml is included in
this commit.

This was SVN commit r23280.
2019-12-24 09:26:55 +00:00