1
0
forked from mirrors/0ad
Commit Graph

20662 Commits

Author SHA1 Message Date
s0600204 a4bc787ddc Don't have the Structure Tree fill up the entire screen
For those lucky enough to have screens with a high enough resolution to
display
a chosen civilisation's tree in its entirety, the Structure Tree page
now
determines the minimum space necessary to do so, and sizes itself
accordingly.
(e.g. The page no longer scales to fill the entire screen.)

For those on lower resolution screens, the page now takes up slightly
less space
vertically.

This was SVN commit r23813.
2020-07-11 02:50:32 +00:00
Stan ec3b3a9556 Fix some issues with bows noticed by Mr. Lie
Thread:
https://wildfiregames.com/forum/index.php?/topic/28481-some-animations-are-broken-gathering-and-other/page/2/&tab=comments#comment-400622

This was SVN commit r23812.
2020-07-10 17:35:59 +00:00
Stan d4b567ca85 Fix broken templates following 33042ad23d while retaining the same functionnality
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2864
This was SVN commit r23810.
2020-07-08 11:21:10 +00:00
s0600204 b2842e8021 Rewrite Structure Tree and Template Viewer to use OOP principles
Commenters: elexis, Stan, Angen
Refs.: #5387
Differential Revision: https://code.wildfiregames.com/D2734
This was SVN commit r23808.
2020-07-07 19:11:36 +00:00
vladislavbelov 365dbd91fc Fixes terrain index type (causing a warning) introduced in 1e1ce27eba.
This was SVN commit r23807.
2020-07-07 16:51:20 +00:00
wraitii a7da40ac2f Fix formations reshaping incorrectly & related issues.
Formation were reshaping in cases where they should not (such as when
the controller is waiting on members).
This made them look very odd for some orders.

This also cleans up held positions for formations somewhat.

Also:
- ed54ad3486 fixed units not facing correctly after a formation-walk.
The fix is correct, but we can actually make it slightly more
self-contained by moving everything in `leave`. Also clarify comments.
- This fixes some very broken code in 4ca448a686 in
FORMATIONMEMBER.WALKING.MovementUpdate. It never errored because
formation controllers weren't moved out of the world before.

Reviewed By: Angen
Fixes #5443

Differential Revision: https://code.wildfiregames.com/D2763
This was SVN commit r23806.
2020-07-07 10:24:58 +00:00
Stan 33042ad23d [gameplay-a24] differentiate African and Indian war elephants because of their sizes.
maur, pers, sele champion elephants +10% resource costs, training time,
health, and attack damage;
cart, kush, ptol champion elephants −10% resource costs, training time,
health, and attack damage.

Patch by: @Nescio
Accepted by: @Feldfeld, @borg-
Differential Revision: https://code.wildfiregames.com/D2861
This was SVN commit r23804.
2020-07-04 18:15:05 +00:00
Stan 586b045d09 Deprecate rotary mill, and instead introduce a special technology (town phase, workers +15% grain gather rate) for the Gauls, to reflect the fact they invented a harvesting machine in the Iron Age.
Patch by: @Nescio
Accepted by: @scythetwirler, @borg-
This was SVN commit r23803.
2020-07-04 14:11:17 +00:00
Angen 5e57e35c0a [gameplay-a24] Allow to train mercenaries from embassy by any civilisation
As a result, any player that captures an embassy (including Blemmy camp
or Nuba village) can train these mercenaries there, while preventing
them from building structures they shouldn't have access to.

Differential Revision: https://code.wildfiregames.com/D2536
Patch by: @Nescio
Reviewed by: @Angen
Agreed by: @ValihrAnt, @borg-
This was SVN commit r23802.
2020-07-04 13:10:27 +00:00
Angen a7894f05b8 [gameplay-a24] Lower the repeat rate of spear cavalry
Lower repeat rate of spear cavalry so it does not look like attacking in
slow motion and lower attack damage as well to compensate speeding up
attack.

Differential Revision: https://code.wildfiregames.com/D1365
Patch by: @temple
Reviewed by: @wraitii, @Angen
Agreed by: @ValihrAnt, @Lionkanzen
Comments by: @badosu
This was SVN commit r23801.
2020-07-04 12:43:55 +00:00
Stan 8e19745bba Decrease penalty -50% to -30% when promoting to advanced and elite.
Decrease the health gain to 10%. (20% health + 1 armour);
Increase the crush damage for axemen as well (Previously they only got a
penalty)

Patch by: @borg-
Reviewed by: @Nescio, @Feldfeld, @badosu
Differential Revision: https://code.wildfiregames.com/D2792
This was SVN commit r23800.
2020-07-04 11:05:05 +00:00
Stan 98285aa429 Replace various equivalent phrases (show/hide, enable/disable, open/close, hide/show) with the word “toggle”,
Replace two slashes (“/”) with “or” and another with “and” to reduce
ambiguity
Replace “Enter/Return” with “Enter (Return)”

Patch by: @Nescio
Reviewed by: @Gallaecio, @Stan
Differential Revision: https://code.wildfiregames.com/D2570
This was SVN commit r23799.
2020-07-04 10:30:58 +00:00
Stan 55dc5ed987 Increase cost of "upgrade mercenaries rank" tech to make it more like the other armor techs
Authored by: @borg,
Reviewed by: @badosu, @Nescio, @FeldFeld
Differential Revision: https://code.wildfiregames.com/D2835
This was SVN commit r23798.
2020-07-04 10:14:30 +00:00
Itms 56d3aa40fe Fix conversion of UTF8 strings between the scripts and the engine.
SpiderMonkey uses UTF16 internally, and only provides APIs for that
encoding, so stop hacking UTF8 strings: properly convert them to and
from UTF16 when passing them through SM.

Patch By: wraitii
Differential Revision: https://code.wildfiregames.com/D2838
This was SVN commit r23795.
2020-06-30 10:46:06 +00:00
Itms dc65912043 Fix building on GCC 10, fixes #5709, #5756.
Patch By: pcpa and wraitii
Tested By: Nescio, andy5995 and others
Differential Revision: https://code.wildfiregames.com/D2745
This was SVN commit r23794.
2020-06-30 10:24:00 +00:00
wraitii 108efc9291 Allow building Kushite mercenary camps in neutral territory.
This gives Kushites more interesting gameplay options, and is consistant
with other mercenary camps.
Kushite mercenaries lived outside of the core Kushite territory, thus
giving a historical ground to this change.


Accepted by: ValihrAnt, borg-, scythetwirler, Angen, badosu, sundiata
Patch by: Nescio
Differential Revision: https://code.wildfiregames.com/D2534
This was SVN commit r23793.
2020-06-28 09:55:09 +00:00
Stan c8402563ce Add garrison flags to all the merchant ships.
Refs: #4581

This was SVN commit r23792.
2020-06-26 23:08:12 +00:00
Imarok 0252ec16d8 Remove inappropriate quote about women
This is based on this PR: https://github.com/0ad/0ad/pull/28.

Reviewed by: Stan
Differential Revision: https://code.wildfiregames.com/D2832
This was SVN commit r23790.
2020-06-24 21:15:46 +00:00
bb e188066006 Absorb duplicated summary tab code to the tab_buttons gui
refs 8ae67ed15f/9ae7c4d810
Comments By: elexis, Stan, Freagarach
Tested By: Freagarach
Reviewed By: Imarok
Differential Revision: D1206
This was SVN commit r23789.
2020-06-23 20:15:36 +00:00
Stan cdc2f4cf57 Fix an issue with checkrefs.pl introduced in c04a1ebac3/https://code.wildfiregames.com/D2533. Checkrefs should support duplicated tags
Reported by: @Itms, checkrefs.pl
This was SVN commit r23788.
2020-06-23 18:06:32 +00:00
Itms aabab15324 Detect the need for libexecinfo in premake. This is mostly useful for musl Linux.
Patch By: nephele
Differential Revision: https://code.wildfiregames.com/D2671
This was SVN commit r23787.
2020-06-23 15:06:57 +00:00
Itms b437af833d Stop downloading boost from sourceforge on macOS, as it is not the official source anymore, and it is not very reliable for big files.
Reviewed By: Krinkle, wraitii
Differential Revision: https://code.wildfiregames.com/D2766
This was SVN commit r23786.
2020-06-23 14:42:54 +00:00
bb 9680d08b96 Remove unused bonuses schema from deathDamage
refs 16b452cf91

Patch By: Freagarach
Differential Revision: https://code.wildfiregames.com/D2831
This was SVN commit r23785.
2020-06-22 20:12:10 +00:00
Imarok 853e8c0f1e CVector2D: Fix members may not be initialized warnings
Differential Revision: https://code.wildfiregames.com/D2825
This was SVN commit r23784.
2020-06-21 18:21:31 +00:00
bb bdadb2080a Cleanup summary selection
Fixes some issues from 8ae67ed15f
Reviewed By: Freagarach
Noticed By: elexis
Differential Revision: https://code.wildfiregames.com/D1205
This was SVN commit r23783.
2020-06-20 21:26:20 +00:00
Stan 332b997ca6 Make javelineers easier to catch by cavalry, by reducing their speed slightly
Reviewed by: @borg-, @scythetwirler, @ValhirAnt
Differential Revision: https://code.wildfiregames.com/D2628
This was SVN commit r23782.
2020-06-19 06:31:50 +00:00
Stan c04a1ebac3 Remove the briton kennel as it's not historically correct.
War dogs are limited to a total of 20 instead of a five kennels times
ten dogs each, to compensate for the fact they no longer have special
requirements.

Patch by: @Nescio
Reviewed by: @borg-, @Stan
Thread:
https://wildfiregames.com/forum/index.php?/topic/25620-kennel-issues/&tab=comments#comment-372159

Differential Revision: https://code.wildfiregames.com/D2533
This was SVN commit r23781.
2020-06-19 06:28:39 +00:00
s0600204 dd5c7edea3 Introduce axeman templates
Introduces axeman parent templates, used to differentiate axemen from
swordsmen
(which they had been "under the hood" up until now), and update entity
templates
and maps where applicable.

Artwork (actors, icons) is not touched here - see D2688 for that.


Patch by: Nescio
Reviewed By: s0600204
Differential Revision: https://code.wildfiregames.com/D1355
This was SVN commit r23780.
2020-06-18 21:36:16 +00:00
bb 1f68e4d740 De-uglyfy introductory tutorial's Launchattack function
Store components when used several times
Check all components for existance when used
Use ProcessCommand instead of injection order directly in unitAI

This was SVN commit r23779.
2020-06-18 16:24:59 +00:00
Stan 2101556946 Fix flying shields reported by Mr. Lie,
Thread:
https://wildfiregames.com/forum/index.php?/topic/28361-something-curious-with-actor-celtsmerchant_ship/&tab=comments#comment-399067

This was SVN commit r23778.
2020-06-15 20:04:23 +00:00
wraitii ec4f51d928 Fix --without-pch build following ffd2219200
Differential Revision: https://code.wildfiregames.com/D2819
This was SVN commit r23775.
2020-06-14 20:51:21 +00:00
wraitii 6b2b071ad5 Move LOS to a los helper header and cleanup Grid.h includes.
Changing Grid.h should recompile faster, as it is now included in fewer
TUs.

Differential Revision: https://code.wildfiregames.com/D2784
This was SVN commit r23774.
2020-06-14 20:39:03 +00:00
wraitii ffd2219200 Don't overwrite JS error reporting by calling JS_ReportError.
Upstream spidermonkey supports JSNative error reporting by returning an
explicit failure code. This provides a full stacktrace. Calling
JS_ReportError, removed upstream, removes that stacktrace.

Instead, we should simply LOGERROR.

Based on a patch by: elexis
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D2627
This was SVN commit r23773.
2020-06-14 10:34:49 +00:00
wraitii e8b3fe81cc build-osx-libs: Update GnuTLS to 3.6.13 (unbreak macOS 10.15)
This includes a workaround that should be removed when it is fixed
upstream (LDFLAGS=).
It disables guile support, since we do not need it and it fails to
compile too.

Patch by: Krinkle
Reviewed By: wraitii
Fixes #5729

Differential Revision: https://code.wildfiregames.com/D2716
This was SVN commit r23772.
2020-06-14 10:30:14 +00:00
wraitii 4b1a4ef4cf Rework ScriptInterface EnumeratePropertyNames to support non-enumerable properties.
This lets it support the JSClass syntax, introduced for components in
5fb88172a2/D2492, which required a workaround before.
As cleanup, remove the prefix logic which was too specific to be in
ScriptInterface, and use an upstream-compatible API that also does more
of what we want.

Based on a patch by: elexis
Differential Revision: https://code.wildfiregames.com/D2644
This was SVN commit r23771.
2020-06-14 09:49:32 +00:00
wraitii bea7a65389 Delete unused technologies.
Many were 'pair' technologies, originally removed from the game in
13b229d503.

Patch by: Nescio
Reviewed by: wraitii
Fixes #3800

Differential Revision: https://code.wildfiregames.com/D1775
This was SVN commit r23770.
2020-06-14 09:08:53 +00:00
wraitii 939002f0dc RangeManager: Grid for 2D array, enum cleanups.
Range manager has several `std::vector` for fixed-size arrays and 2D
grids. By using proper data structures, the code readability is
improved.
This also moves around the LosVisibility enum.

Comments by: Stan`, nani
Differential Revision: https://code.wildfiregames.com/D2770
This was SVN commit r23769.
2020-06-13 09:05:40 +00:00
vladislavbelov 6f70a901f8 Remove duplicated call in tile rendering for TerrainOverlay.
Patch By: vinhig
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D2811
This was SVN commit r23767.
2020-06-12 20:52:18 +00:00
vladislavbelov fd8a47f5d9 Moves calculations of bounds for fixed shadows to a separate function.
Reduces complexity of the SetupFrame function. Fixed shadows were added
in 8e48e1b17e.

This was SVN commit r23766.
2020-06-12 20:09:08 +00:00
vladislavbelov 06bf3a8739 Adds GLSL shaders of overlay lines.
We were using ARB shaders in GLSL mode for overlay lines (unit
selection, ranges and so on).

Tested By: Freagarach, OptimusShepard, Stan
Differential Revision: https://code.wildfiregames.com/D2621
This was SVN commit r23765.
2020-06-12 15:39:44 +00:00
wraitii 14b5cf0673 Increase the max # of embassies from 2 to 3.
Carthaginians currently rely on embassies to be competitive, and
restricting them to 2 is too limiting for balance purposes.
This change also affects Kushites structures which was also approved by
borg- and ValihrAnt.

Further, the original choice of 2 seems to have been to force
Carthaginian players to make a choice, but since one can delete an
existing embassy and pick another, that seems somewhat artificially
restricting.

Patch by: borg-
Approved By: ValihrAnt, PhyZic
Differential Revision: https://code.wildfiregames.com/D2798
This was SVN commit r23764.
2020-06-12 15:32:35 +00:00
Stan b4df84e05d Fix an issue with the celt_trader because the triangle was too far below the ground and that caused flickering issues. Ideally at some point we will remove the limitation for prop only meshes to have triangles. While at it restore the units back to meters.
Thread:
https://wildfiregames.com/forum/index.php?/topic/28310-flickering/page/3/&tab=comments#comment-398652
Reported by: Mr.lie
Debugging with: @vladislavbelov

This was SVN commit r23762.
2020-06-12 07:03:23 +00:00
Stan 27647e61c4 Play a sound when walls are upgraded to gates.
This was SVN commit r23761.
2020-06-11 07:00:52 +00:00
Angen e181614215 [PetraAI] Remove redundant branch introduced in f1610ce4fa
Branches introduced in f1610ce4fa had commented part to consider
stonewalls as blocking targets only if there have been siege units in
army.
Commented part was removed in ade8bcc0b8.

Differential Revision: https://code.wildfiregames.com/D2804
This was SVN commit r23760.
2020-06-10 18:27:13 +00:00
Angen 267ccd3127 [PetraAI] Do not try to attack entities which can't be attacked.
Avoid trying to attack unattackable entities based on restricted classes
from Attack component.

Differential Revision: https://code.wildfiregames.com/D2111
Patch by: Freagarach
Reviewed by: Angen
This was SVN commit r23759.
2020-06-10 18:23:41 +00:00
Angen 3336d6d543 Adjust trader footprints
Match trader footprint with mesh shape for nicer visual effect.
This also removes footprint inconsistency among camels.

Patch by: Nescio
Reviewed by: Angen
Comments by: Feldfeld
Differential Revision: https://code.wildfiregames.com/D2640
This was SVN commit r23758.
2020-06-10 18:13:22 +00:00
wraitii ea67b79667 Handle stacking status effects, modifiers, some related fixes.
Continuation of work on status effects, following 82a5ab6d19.

Allow techs to modify properties.
Enable different behaviour when status effects would stack, such as
extending the duration or stacking the effects.
Fix GUI issue with more than 5 status effects.
Improve tooltips.
Let status effects show a different tooltip for the attacker and the
receiver.

Patch by: Freagarach
Reviewed By: wraitii, Angen (on an older differential).
Differential Revision: https://code.wildfiregames.com/D2296
This was SVN commit r23757.
2020-06-09 11:47:16 +00:00
vladislavbelov 5176f848b8 Fixes missing deletion of files in 409c436ae2.
Patch By: linkmauve
Differential Revision: https://code.wildfiregames.com/D2476
This was SVN commit r23755.
2020-06-08 22:36:19 +00:00
vladislavbelov 409c436ae2 Remove obsolete GetVideoMode platform-specifics, replaces by platform-agnostic SDL2`s APIs.
Before and after the commit we don't support multiple displays and HiDPI
properly.

Patch By: linkmauve
Tested By: Angen, elexis, Stan
Differential Revision: https://code.wildfiregames.com/D2476
This was SVN commit r23754.
2020-06-08 17:49:26 +00:00
wraitii f3a49014fb Make rams less effective by reducing speed and preventing attacks on organics.
Rams are currently evry strong. This nerfs them by reducing their speed
slightly and by preventing them from attacking organic units.

The speed change was agreed by ValihrAnt, the organic restriction is
more experimental and might be reverted in favour of a "reduced damage"
approach (see D2684) if it proves too limiting.

Patch By: borg-
Approved by: wraitii, ValihrAnt (mostly on the speed debuf)
Differential Revision: https://code.wildfiregames.com/D2782
This was SVN commit r23753.
2020-06-08 15:06:13 +00:00