1
0
forked from 0ad/0ad
Commit Graph

15965 Commits

Author SHA1 Message Date
a80ce526b7 [Fix] Patch globalscripts technology template helper after 8d80a2186e and the ProductionQueue split
Patch by @s0600204.

This lets all technologies show up correctly in-game and in the
structure tree again.

accepted by: @marder @Freagarach
Fixes: #6587

Differential Revision: https://code.wildfiregames.com/D4755
This was SVN commit r27042.
2022-08-10 21:49:15 +00:00
d1c9e96f87 [Gameplay] Disable training han crossbow cavalry in other civ's barracks
Request by Player of 0AD:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/page/15/#comment-513182

This was SVN commit r27040.
2022-08-08 21:32:56 +00:00
f8ff908d73 [maps] Adjust playerPlacementRiver to group teams on the same side in most cases
Brute forcing the right arrangement, which is unnecessary but accepted
since it has only a negligible performance impact overall.

accepted by: @lyv @andy5995
Fixes: #6390

Differential revision: https://code.wildfiregames.com/D4747
This was SVN commit r27039.
2022-08-08 20:52:05 +00:00
5afbdc6a09 [Gameplay] Disable training persian champions in other civ's barracks
Request by Player of 0AD:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/page/15/#comment-513143

This was SVN commit r27038.
2022-08-08 20:41:17 +00:00
10f2ad4463 [Gameplay] Disable loot for trainable animals
Request by Player of 0AD:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/page/15/#comment-513143

This was SVN commit r27037.
2022-08-08 18:16:58 +00:00
f843cf726d Cavalry vision range 92 m -> 80 m.
Patch by: @real_tabasco_sauce
Differential revision: https://code.wildfiregames.com/D4744
Comments by: @asterix, @borg-, @breakfastburrito_007, @chrstgtr,
@marder, @wowgetoffyourcellphone

This was SVN commit r27036.
2022-08-08 07:23:00 +00:00
96d33e02e4 Revert 774e8060d9.
Issue found:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/?do=findComment&comment=513199.
The issue introduced is significantly worse than the stuff it fixed.

This was SVN commit r27034.
2022-08-08 07:14:18 +00:00
0a54a4e2a5 [Alpha 26] [Fix] Restore the Kushite fisherman actor
Reported by @CovenantKillerJ here:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/?do=findComment&comment=512741

This was SVN commit r27029.
2022-08-04 15:36:13 +00:00
5cd08feba6 Fix issues with the sandbox_han.xml map in 08156e73fc.
Noticed by: @Langbart
This was SVN commit r27028.
2022-08-03 15:55:52 +00:00
5e824698e9 Fix false positive missing file in checkrefs.py in 22168569c6 (Game ignores double extensions)
Noticed by @Langbart

This was SVN commit r27027.
2022-08-03 15:43:07 +00:00
1e46b6f7e7 Fix material not using spectex in b8131a0f09
Noticed by @Langbart

This was SVN commit r27026.
2022-08-03 15:41:43 +00:00
d6d137bf5d [Fix] Adjust position of ice house and ministry in the building panel
accepted by: @asterix @Langbart
Fixes: #6502

Differential Revision: https://code.wildfiregames.com/D4746
This was SVN commit r27025.
2022-08-01 18:56:10 +00:00
a50d582c5f [Fix] Add missing loot to the Han minister
reported on the forums by Gurken Khan:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/page/14/#comment-511954

This was SVN commit r27023.
2022-07-31 21:05:16 +00:00
6a48b023ad [Alpha 26] [Fix] [Persians] Remove the "City" class from the Persian Ice House.
Reported by @Gurken Khan:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/?do=findComment&comment=511945

This was SVN commit r27022.
2022-07-31 20:55:39 +00:00
d76daebb03 [Gameplay] Rebalancing of the Gaul fanatic
patch by : @borg-
accepted by: @chrstgtr @real_tabasco_sauce
Differential revision: https://code.wildfiregames.com/D4722
This was SVN commit r27021.
2022-07-31 11:12:46 +00:00
b9e119e85e Add more world population options.
Requested by: @Edwarf
Accepted by: @Freagarach
Differential Revision: https://code.wildfiregames.com/D4742
This was SVN commit r27020.
2022-07-29 19:50:23 +00:00
b3d8b77173 [A26][Fix][Han] Add turret points to the Han wall gate.
Reported here by @0ad is the best rts game:
https://wildfiregames.com/forum/topic/87305-a26-hans-gate-cannot-be-garrisoned/

This was SVN commit r27018.
2022-07-26 14:16:29 +00:00
fbc9e19544 New icon for the han champion_infantry_crossbowman
Fixes #6591
Refs 08156e73fc

This was SVN commit r27013.
2022-07-18 12:06:43 +00:00
b8131a0f09 Use the new crossbow for han champion units.
This was SVN commit r27012.
2022-07-18 12:05:22 +00:00
22168569c6 New crossbow model for the han champion units.
Refs 08156e73fc

This was SVN commit r27011.
2022-07-18 12:04:43 +00:00
08156e73fc [Gameplay] Han unit roster restructure and other balancing adjustments
After feedback on the first RC's :
https://wildfiregames.com/forum/topic/83323-balancing-the-han/
This version of the roster seems to have a minimal concensus.
This removes some units from the very big roster of the Han,
restructures it and changes the cavalry crossbow champion for an
infantry one due to histrorical issues.
It furthermore reverts the changes to the champion infantry crossbow
template introduced in 9411d8c98e as that nerf wasn't necesarry.
This means that the Han and the Macedonians now have a champion crossbow
unit with the same stats.

Also:

Fixes #6560 by only keeping the "academy" templates, so that the Han can
now only train champions from the academy. Therefore, this reverts parts
of c4bdbe4dd9 and all of 2c9a6704e0.

Discussion with : @borg- @real_tabasco_sauce @wowgetoffyourcellphone
AIEND @Stan and other people on the forums and the Diff.

Differential revision: https://code.wildfiregames.com/D4713
This was SVN commit r27009.
2022-07-17 09:20:52 +00:00
fd08ab051f Fix other civs being able to upgrade Han CC to Court.
This ensures the `{civ}` and `{native}` tags are (properly) supported
for upgrades and uses it for the Han CC.

Reported on the forums
(https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/page/10/#comment-508908)
by @Gurken Khan.
Differential revision: https://code.wildfiregames.com/D4733
Comments by: @Stan, @wowgetoffyourcellphone
This was SVN commit r27008.
2022-07-15 17:16:00 +00:00
2ccf42a244 Add an order sound for the Maurya elephant.
Reported by: @GurkenKhan
Thread:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/?do=findComment&comment=508534

This was SVN commit r27006.
2022-07-12 08:19:14 +00:00
ba9cd30c9b Add missing garrison flag for the maurya houses.
Reported by: @GurkenKhan
Thread:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/?do=findComment&comment=508540
Refs #4581, #6160

This was SVN commit r27005.
2022-07-12 08:09:25 +00:00
3f243b7b50 Fix d1538f7fbd.
Where I forgot to remove the other members when disbanding a formation.

Reported by: @wowgetoffyourcellphone
This was SVN commit r27000.
2022-07-04 05:06:59 +00:00
35e5f268da Fix properties on Persian Champion Infantry Archer XML file.
This was SVN commit r26999.
2022-07-04 05:02:44 +00:00
a7c709c58c [A26][Persians][Fixes] Fixes the Immortal Archer and Ice House for Persians.
This was SVN commit r26998.
2022-07-03 21:04:23 +00:00
22466770f1 [Alpha 26][Fix][Macedonians] Change Macedonian Team Bonus from Barter Bonus to Siege Bonus
This changes the old bartering bonus, which has been proved to be
mathematically problematic, for a siege-focused bonus, which is also
historically relevant.
Differential revision: https://code.wildfiregames.com/D4729
Forum discussion (lengthy):
https://wildfiregames.com/forum/topic/71578-feedbacks-from-a26-svn-tests/page/6/#comment-485498
Accepted by: @chrstgtr, @real_tabasco_sauce, @borg-
This was SVN commit r26997.
2022-07-03 13:51:56 +00:00
b6caf5eb63 Differentiate Persians.
- Allows the immortals to be "upgraded" between sword and bow yielding.
- Reduces batch training time per progressing phase.
- Don't kill the immortals partly when reducing their training time.
- More units from the CC.
- Enable the Ice House.

Patch by: @borg-
Differential revision: https://code.wildfiregames.com/D4724
Accepted by: @chrstgtr, @real_tabasco_sauce
Comments by: @marder, @Stan
This was SVN commit r26996.
2022-07-03 05:44:37 +00:00
6e3ddadc7e Fix flickering tooltip for user report button
Patch by: @Langbart
Fixes #6581

This was SVN commit r26994.
2022-06-30 13:34:34 +00:00
d1538f7fbd Fix formation merging issues.
The motion parameters were calculated even without members, which caused
us to try set a undefined passclass.
Also were members added to previously merged twin-formations. Once
merged (i.e. disbanded), they are moved out of world now.

Some cleanups/deduplication whilst at it.

Reported by: @andy5995 at the forums
(https://wildfiregames.com/forum/topic/71578-feedbacks-from-a26-svn-tests/page/8/#comment-505078)
Differential revision: https://code.wildfiregames.com/D4727
Comments by: @Langbart, @marder
Tested by: @Langbart
Fixes #6580

This was SVN commit r26993.
2022-06-30 06:04:05 +00:00
5ab132c16c Remove unused han_hero_wei_qing_3.json aura.
Reported by: @Langbart
Fixes #6544
Fixes 77c11753c3

This was SVN commit r26992.
2022-06-28 13:47:39 +00:00
18bdacbb57 [maps] Adjust position of starting units on oceanside_2p.xml
For the Han they were inside the CC.

This was SVN commit r26989.
2022-06-24 18:01:15 +00:00
fd7f091b8c [Gameplay] Han - adjust crossbow stats & training techs
Similar dps as a slinger now, but with higher repat time. Normal citizen
soilder cost.
Nerf the crossbow training technology a bit.
Make the archer & crossbow technology availabe in the stable as well, as
it they also affect cavalry units.

accepted by : @real_tabasco_sauce
positive comment from: @borg-

Differential revision: https://code.wildfiregames.com/D4721
This was SVN commit r26988.
2022-06-24 17:31:02 +00:00
a6c1d5bbb9 revert last commit / 39dd5329cc
Misscommunication if this was the right move or not.

Leave the size as it was until someone has time to fix all buttons at
once.

This was SVN commit r26987.
2022-06-24 16:41:53 +00:00
39dd5329cc [GUI] increase msgbox button size to fix text overlap
Report:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/page/6/#comment-504135

3ab25cbd95 added a new button which has more text and can span have
multiple lines in some languages.
Fix: increase the size.
possible todo for the future: unify button sizes or make them adaptive
depending on the text size.

comments by @Langbart @Stan

accepted by @wraitii

Differential revision: https://code.wildfiregames.com/D4707
This was SVN commit r26986.
2022-06-24 11:19:17 +00:00
ec723428d1 Logic fix for very high shadows on very large screens.
ON large screens like 5120x1440 calculated shadow map was 32768. That
was 16x more than high setting, 32x more than medium setting and 64x
more than low setting.

After this change shadow map sizes using very high setting by resolution
will be following:
1920x1080 - 4096
2560x1440 - 4096
3840x1440 - 4096
5120x1440 - 8192
3840x2160 - 4096
7680x4320 - 8192
Patch by: @karmux
Reviewed by: @vladislavbelov, @Stan
Differential Revision: https://code.wildfiregames.com/D4723
This was SVN commit r26983.
2022-06-23 17:04:13 +00:00
3cdd5d2bd6 [Gameplay] Han - Reduce strength of art of war technology
Seemed a bit strong, especially with the hero.

accepted by : @borg-

Differential revision: https://code.wildfiregames.com/D4714
This was SVN commit r26982.
2022-06-22 17:29:59 +00:00
589dfa7a50 This was SVN commit r26981. 2022-06-22 17:18:11 +00:00
77c11753c3 [Gameplay] Han - Hero adjustments
accepted by : @borg-
positive comments by: @real_tabasco_sauce
Differential revision: https://code.wildfiregames.com/D4709
This was SVN commit r26980.
2022-06-22 17:06:11 +00:00
b4155900d3 [Gameplay] Han - adjust farming techs to the standard 20%
accepted by : @real_tabasco_sauce

Differential revision: https://code.wildfiregames.com/D4720
This was SVN commit r26979.
2022-06-22 17:03:31 +00:00
00e29977dc Add missing frequency for the idle variant.
Noticed by: @Langbart
Fixes #6579

This was SVN commit r26978.
2022-06-21 05:38:54 +00:00
3d47232ec8 [graphics] Adjust default config to give a better first impression
comments by @vladislavbelov
accepted by : @Stan

Differential revision: https://code.wildfiregames.com/D4706
This was SVN commit r26976.
2022-06-20 19:50:45 +00:00
f22fdcd004 [Gameplay] Han - remove Laozi gate
It is not historically correct and more importantly, I also doesn't add
that much gamplay value. Also clean up the template a bit and remove the
aura while at it.

accepted by : @Stan & people on the forum:
https://wildfiregames.com/forum/topic/83323-balancing-the-han-release-candidate-1/

Differential revision: https://code.wildfiregames.com/D4708
This was SVN commit r26975.
2022-06-20 19:16:51 +00:00
2685783886 [Gameplay] Adjust cost of mer cav (again)
Add a little bit of food cost. Not enough to hugely change stuff, but
just an addition to make it a little bit harder to mass them.

Conceptual agreement from @chrstgtr @real_tabasco_sauce

Differential revision: https://code.wildfiregames.com/D4710
This was SVN commit r26974.
2022-06-20 19:07:27 +00:00
db1a31b701 [Gameplay] Move ptol heroes to the fortress
accepted by : @chrstgtr @borg- @real_tabasco_sauce

Differential revision: https://code.wildfiregames.com/D4711
This was SVN commit r26973.
2022-06-20 19:04:08 +00:00
83bab71e8d [maps] Lighting adjustments to gulf_of_bothnia.js spring biome
Just some tweaks to make it look nicer.

This was SVN commit r26972.
2022-06-20 18:50:59 +00:00
e888587116 Fix some capes not having approaching animations.
EOL native + MIME type.
Remove duplicated tools objects spawning when gathering resources.

This was SVN commit r26971.
2022-06-20 13:48:24 +00:00
3294f0ea48 [GUI] Correction of the deco size at the bottom right of the ModernDialog sprite
The bottom deco on the right is 2 pixels wider than the one on the left.

Patch by @Langbart

Differential revision: https://code.wildfiregames.com/D4717
This was SVN commit r26968.
2022-06-20 06:33:27 +00:00
d93e29ae84 [GUI] Fix overlap in mutliplayer lobby dialog
Fixes #6573 ; reported by @phosit

Patch by @Langbart (on the ticket)

This was SVN commit r26967.
2022-06-19 21:20:47 +00:00
cc13cfd7cd Add a new type of flower for decoration
This was SVN commit r26966.
2022-06-19 20:21:51 +00:00
ebbc2909c8 Add missing file in 8471062bbb
This was SVN commit r26965.
2022-06-19 20:21:29 +00:00
78d1248abd Fix missing animations for grain gathering for spearmen. This workarounds a bug in UnitAI and improves consistency with other actors.
Refs #6566

This was SVN commit r26964.
2022-06-19 20:05:49 +00:00
059e71198a Fix missing animations for grain gathering for swordsmen. This workarounds a bug in UnitAI and improves consistency with other actors.
Refs #6566

This was SVN commit r26963.
2022-06-19 19:53:32 +00:00
860ab7ac31 Fix missing animations for grain gathering for pikemen. is workarounds a bug in UnitAI and improves consistency with other actors.
Refs #6566

This was SVN commit r26962.
2022-06-19 19:45:42 +00:00
8471062bbb Fix missing animations for grain gathering for han units. This workarounds a bug in UnitAI and improves consistency with other actors. Show the rice hat for approaching, returning and gathering grain.
Refs #6566

This was SVN commit r26961.
2022-06-19 19:27:31 +00:00
860521f463 Fix UVMap on tool_hoe2.dae.
Noticed while looking at #6566

This was SVN commit r26960.
2022-06-19 17:29:12 +00:00
76884ccba8 Properly clear back props when gathering. EOL native.
Noticed while looking at #6566

This was SVN commit r26959.
2022-06-19 17:28:42 +00:00
5a2474bd50 Fix Carths Naval Shipyard.
Which had the Trainer component, but not the user-required
ProductionQueue.

Differential revision: https://code.wildfiregames.com/D4695
Reviewed by: @Stan
Comments by: @jprahman
Fixes #6570

This was SVN commit r26958.
2022-06-19 06:37:58 +00:00
43aa870c68 Fix phasing by cheat with Athens.
Reported by @Langbart
Differential revision: https://code.wildfiregames.com/D4694
Reviewed by: @Langbart
Fixes #6571

This was SVN commit r26957.
2022-06-19 06:34:06 +00:00
774e8060d9 Make formations respond as one to threats.
Improves their functioning significantly.

Based on a patch by @lyv
Differential revision: https://code.wildfiregames.com/D4666
Reviewed by: @marder
Comments by: @Stan
This was SVN commit r26956.
2022-06-19 06:28:52 +00:00
01fd2564e5 [Alpha 26][Fix] Barracks should garrison infantry, while stables garrison cavalry. This bug is a holdover from the unified barracks days prior to the stable split.
As reported on the forum.

This was SVN commit r26955.
2022-06-19 01:14:32 +00:00
729a35c472 Choose civ randomly in gamesetup
Refs: #3987

accepted by: @Stan
Differential revision: https://code.wildfiregames.com/D4703
This was SVN commit r26954.
2022-06-18 14:40:30 +00:00
9c3d725d8b Update the mod.io key so I and other team members can sign mods.
This was SVN commit r26953.
2022-06-18 09:50:46 +00:00
d51a0260bb Add garrisoned and projectile prop points to the han farmstead and storehouse.
Reported by: @Langbart
Refs: #4581

This was SVN commit r26951.
2022-06-17 19:59:32 +00:00
28e46ba765 Groups close minimap icons by path and color to decrease their visible count.
Comments By: phosit, Stan
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D4702
This was SVN commit r26949.
2022-06-17 19:40:50 +00:00
e123b64ef6 [Alpha 26] [Fix] [Han] Add RallyPoint to the Han storehouse and farmstead since they are garrisonable by the Minister.
Reported by @Gerken Khan:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/?do=findComment&comment=503777

This was SVN commit r26947.
2022-06-15 20:17:02 +00:00
1e654801a5 [art] [maps] Replace stone tiling texture on fortress.js
Use newer and better looking texture instead.

This was SVN commit r26946.
2022-06-13 20:46:48 +00:00
91aee3db59 [Alpha 26] Make the Han spear cavalry into two-handed and remove the shield as requested by @AIEND
Refs:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/?do=findComment&comment=503346

This was SVN commit r26945.
2022-06-13 20:28:31 +00:00
106bc68120 [maps] Fix entities placed outside of the passable map area on wild_lake.js and caledonia_meadows.js
Reported by Gurken Khan:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/page/4/#comment-503140

Fix:

rename "actor" to "entity" as that makes it clearer what it actually is
and use placeEntityPassable() to assure that nothing is placed outside
of the map.

also:
include https://code.wildfiregames.com/D2149 patch by @FeXoR
reduce the amount of entities placed on wild_lake. It looked extremely
crowded.

accepted by: @lyv
Differential revision: https://code.wildfiregames.com/D4699
This was SVN commit r26944.
2022-06-13 20:26:52 +00:00
e31f0f8766 [art] [maps] Replace large grass fields on Savanna & Nubia biomes
They make problems on several maps where they either float (e.g.
harbor.js) as they are placed to close to a cliff/ on a hill or they
cover way too much (e.g. D4699 / wild_lake.js).

Related: https://code.wildfiregames.com/D4699#199688

one could adjust all maps, but it is so much easier to just change the
actors here.

accepted by: @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D4701
This was SVN commit r26943.
2022-06-13 19:32:38 +00:00
8b03931497 [maps] Adjustments to Fortress.js
Houses are placed on top of each other, metal availability is bad (and
the textures are old).

First two problems reported by Gurken Khan:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/page/3/#comment-502958

Solution: use new balanced metal mine placement, update the textures and
replace the house switch/ the houses by a temple and a market.

An in-depth refactoring of the wall placement code should be made in the
future nevertheless.

accepted by: @lyv
Differential revision: https://code.wildfiregames.com/D4696
This was SVN commit r26940.
2022-06-12 16:09:52 +00:00
5f9e226625 Revert d81534d792 after 20a11614d7.
This was SVN commit r26938.
2022-06-12 04:51:50 +00:00
20a11614d7 [Alpha 26] Remove the food.rice distinction and subsequent animation variants. Fixes some odd behavior.
Fixes #6559
Fixes #6565

Refs #6566

This was SVN commit r26937.
2022-06-11 20:16:14 +00:00
76323e791b [Bug Fix] Han Female Citizen specific name was set to the generic name erroneously.
Fixes #6567

This was SVN commit r26936.
2022-06-11 16:53:29 +00:00
36386b622e [GUI] increase main menu tooltip size
Apparently the translations got longer over the years and some don't fit
anymore

reported by Obelix
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/#comment-502315

long string looks ok now

Differential revision: https://code.wildfiregames.com/D4692
This was SVN commit r26935.
2022-06-10 15:19:44 +00:00
26cb192f07 Improve shadow artifact problems without shadow filtering in some A25 biomes/maps
Without shadow filtering, artifacts may appear at some angle (shadow
bias issue). This change ssome settings so that these are less common.

Reported by: langbart
Accepted by: marder
Refs #6552

Differential Revision: https://code.wildfiregames.com/D4681
This was SVN commit r26934.
2022-06-10 07:39:23 +00:00
5d0826d7d9 Fix gamesetup breakage when matchsettings.json contains incorrect victory conditions.
Reported by: gameboy, langbart
Fixes #6553

Differential Revision: https://code.wildfiregames.com/D4678
This was SVN commit r26933.
2022-06-10 07:37:59 +00:00
d81534d792 Count rice as veggie.
Reported by @Gurken Khan at the forums:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/?do=findComment&comment=502523.

This was SVN commit r26931.
2022-06-10 04:53:25 +00:00
d19b602ecc Fix some text errors.
Reported on the forums by @Gurken Khan:
-
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/?do=findComment&comment=502270
-
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/?do=findComment&comment=502274

This was SVN commit r26928.
2022-06-09 14:16:44 +00:00
80016a49ab Adjust lighting on hellas.js
It is way to bright and hard to look at.
reported during a26 rc testing:
https://wildfiregames.com/forum/topic/82754-alpha-26-pre-releaserelease-candidate-build-testing/#comment-502290
by Salesome

accepted by: @lyv
Differential revision: https://code.wildfiregames.com/D4691
This was SVN commit r26927.
2022-06-08 21:02:52 +00:00
ffe4ea24ab Fixes LOS flickering because of float precision. Fixes #6546
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D4684
This was SVN commit r26922.
2022-06-06 20:48:18 +00:00
aaa95dc00b Minor cleanup in Future and TaskManager
- Remove redundant std::move() calls
- default ctor/dtor in place of empty {}

Patch by: jprahman
Comments by; phosit

Accepted by: vladislavbelov
Differential Revision: https://code.wildfiregames.com/D4675
This was SVN commit r26916.
2022-06-02 12:59:25 +00:00
f4128208de Fix text alignment handling of spaces around wrapping.
Follows f8d2927748.

There is an issue with text-wrapping and word separators (aka spaces).
Because 0 A.D. collates the space after a word to the same TextCall, we
occasionally need to ignore it when considering line-wrapping, because
we don't want empty spaces on the right-side of right-aligned text.
However, the logic to handle this is currently broken and inconsistent.

The method introduced here uses the SFeedback structure to properly
report it and generalises the checks.

Note that multiples spaces are not collapsed in 0 A.D., and for
consistency the word-separator-collapsing behaviour is ignored.

Comments by: phosit, vlasdislavbelov
Fixes #6551

Differential Revision: https://code.wildfiregames.com/D4662
This was SVN commit r26915.
2022-06-02 12:56:53 +00:00
b5abab5c79 Don't reset wonder victory timer on ally defeat.
Follows d86148defc.
Resetting the wonder time when an ally to the wonder-owner is defeated
seems like double-punishment, and should not happen.

Resetting on explicit diplomacy change remains in Allied victory mode.

Fixes #6527

Reported by: Langbart
Differential Revision: https://code.wildfiregames.com/D4661
This was SVN commit r26914.
2022-06-01 15:44:53 +00:00
7946def863 Fix maps with conquest CC victory conditions.
Rename the file to be consistent with its title.
Also `centre` -> `center` as per the style guide. Reported by @nwtour at
https://code.wildfiregames.com/D3530#171291.

Reported by: @Langbart
Essentially a patch by: @Langbart
Fixes #6548

This was SVN commit r26913.
2022-05-30 15:13:17 +00:00
1d9e6f30b0 Add a new icon for the han siege tower.
Reported by: @Langbart
Fixes #6549

This was SVN commit r26911.
2022-05-30 07:33:39 +00:00
d4e523e0ea Slightly improve the look of the chinese siege tower. Raise the garrison flag. Remove useless unused materials from the daes.
Fixes #6503
Reported by: @Langbart
This was SVN commit r26910.
2022-05-29 21:41:45 +00:00
095838da0a Fixes A8 framebuffer format used for LOS interpolation and enables smooth LOS by default.
Tested By: Langbart, mastoras
Differential Revision: https://code.wildfiregames.com/D4654
This was SVN commit r26906.
2022-05-26 16:36:57 +00:00
a6f60afdc5 Adds instancing support to backend and enables it for minimap.
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D4650
This was SVN commit r26901.
2022-05-24 07:11:23 +00:00
7cbe8125f7 Delete some unused techs/ auras
detected by @Langbart
Fixes #6544

Differential revision: https://code.wildfiregames.com/D4663
This was SVN commit r26900.
2022-05-23 13:31:47 +00:00
ddb54bfe84 [Gameplay] Let the mauryan worker elephant build again
and also patch the AI by partly reverting 87ec9457c3

based on a patch by @Langbart
Fixes #6309

accepted by : @Freagarach

conceptual agreement from @chrstgtr @borg- @Stan

Differential revision: https://code.wildfiregames.com/D4249
This was SVN commit r26898.
2022-05-22 07:06:59 +00:00
0f99c79dad Fix issues with han siege tower
reported by @Langbart ; Fixes #6503 , also adjusts the footprint to fit
better to the actor

comments by: @Stan
accepted by : @phosit


Differential revision: https://code.wildfiregames.com/D4655
This was SVN commit r26897.
2022-05-21 14:54:01 +00:00
f03f19cfc5 Fix aura tooltips on panel entities.
Removed from the GUI interface in d8ed8b1462, but its uses weren't
checked (or ignored).
(https://code.wildfiregames.com/source/0ad/browse/ps/trunk/binaries/data/mods/public/gui/session/session.js;20965$998)

Reported by @Langbart
Based on a patch by: @Langbart
Differential revision: https://code.wildfiregames.com/D4648
Fixes #6387

This was SVN commit r26896.
2022-05-20 10:00:31 +00:00
f3d8f1e797 [Gameplay] - Remove min distance from siege towers
While it may be historically correct, it arguably can lead to very
broken looking behavior where siege towers try to get out of the min
range, but fail since the are attacked and end up shifting and turning
around uselessly, which just looks broken.

And since the min distance for siege towers is very small, I doubt that
it will actually change anything about the gamplay.

accepted by : @chrstgtr

Differential revision: https://code.wildfiregames.com/D4657
This was SVN commit r26894.
2022-05-20 07:13:09 +00:00
efc2d39372 Fix a comment and rename the formation angle function to better reflect what it does
wrong comment noticed by: @Silier
accepted by : @Freagarach

Differential revision: https://code.wildfiregames.com/D4658
This was SVN commit r26893.
2022-05-20 07:02:22 +00:00
9a3ae16087 Make ship and siege immune to poison
reported by @Langbart #6526

accepted by :
@Stan
@asterix

Differential revision: https://code.wildfiregames.com/D4656
This was SVN commit r26892.
2022-05-20 06:44:58 +00:00
b2e093d915 Rename the "Han Chinese" to "Han"
Han Chinese is not wrong per se but unnecessary precise.
See the forum discussion here:
https://wildfiregames.com/forum/topic/51306-thread-for-posting-suggestions-for-alpha-26/page/15/#comment-495849
and the usage of "Han" in an article from the metropilitan museeum:
https://www.metmuseum.org/toah/hd/hand/hd_hand.htm

comments by:
@Langbart

accepted by :
@asterix
@Freagarach

Differential revision: https://code.wildfiregames.com/D4659
This was SVN commit r26891.
2022-05-20 06:36:38 +00:00
d1775169d2 Removes unused a_tangent stream in model water shaders after 779a33ee30.
This was SVN commit r26887.
2022-05-16 16:36:58 +00:00
c0df9b9883 Fix: Han soilder missing gather animation for non-rice grains
accepted by : @Stan

Differential revision: https://code.wildfiregames.com/D4649
This was SVN commit r26886.
2022-05-16 15:00:29 +00:00
9528acfb8c Fix description of water weeding.
Reported by: @azayrahmad at the forums
(https://wildfiregames.com/forum/topic/77911-water-weeding/)
Patch by: @smiley
(https://wildfiregames.com/forum/topic/77911-water-weeding/#comment-498281)
Fixes #6512

This was SVN commit r26885.
2022-05-16 14:45:26 +00:00
364894287d Fix 557fa0312e
Forgot to re-add the GUI autostart script after moving it.

This was SVN commit r26880.
2022-05-15 06:36:27 +00:00
557fa0312e Fix non-visual autostart, as well as client/host autostart.
Follows 8eecc39e71.

Piping the autostart through a GUI page is easy but requires using the
GUI in non-visual mode, which is problematic since it's not initialized.
The GUI is not needed, only its ability to load scripts, so this diff
fixes the problem by adding an 'entrypoint' script in the new
`autostart` folder that gets called with this unique ability, setting
things up properly. The mod mod gets a placeholder.

Other changes:
- Fix some issues with networked autostart:
  - Players were not assigned slots.
  - The host didn't actually wait for other players.
- Move gamesettings from `gui/gamesettings/` to `gamesettings/`. This
moves attributes as well.
- Move autostart files from `gui/autostart/` to ` autostart/`. Note that
`gui/autostart/` still exists as it's used in the tutorial button from
the main menu.
- Rename the JSI_VFS functions to be explicitly about their function:
the ability to write and the potential restricted folders.
- Don't require `autostart` when using `--autostart-client` in
non-visual mode.

Starting the autostart client/host has poor UX in some situations, but
improving that feature is beyond the scope of this diff.

Suggestions for future work:
- Some files in gui/common should probably be moved elsewhere
- Template loading code is duplicated
- The gamesetup code still needs work for proper UI/logic separation.

Help & comments by: smiley

Reported by: vladislav / Langbart
Fixes #6513

Differential Revision: https://code.wildfiregames.com/D4628
This was SVN commit r26879.
2022-05-15 06:34:17 +00:00
967f9ea7a3 Fix double 'to' in weeding technology.
Noticed by translator @rodrigo.vegas at Transifex.

This was SVN commit r26878.
2022-05-15 05:27:05 +00:00
eb1febd5c1 Some fixes for the Han stone thrower.
A.k.a. Mangonel.
Adds UnitMotion. Refs. #1718
Adjust footprint.
Rearrange parents.

Patch by: @Langbart
Differential revision: https://code.wildfiregames.com/D4608
This was SVN commit r26877.
2022-05-15 05:13:39 +00:00
dec727ce8e Fix missing parentheses in formation turning angle calculation
The function that is calculating the difference between the two angles
is missing some parentheses.

Didn't notice it sooner as it works in 95% of all cases without them,
but sometimes you can see the formation doing a wrong turn.

reviewed by : @Freagarach

Differential revision: https://code.wildfiregames.com/D4626
This was SVN commit r26874.
2022-05-11 15:22:54 +00:00
ed4e07e594 Allow setting the passability class depending on formation members.
Improves pathfinding for the general case (no large entities in a
formation).

Differential revision: https://code.wildfiregames.com/D4605
Comments by: @marder, @Stan, @wraitii
This was SVN commit r26873.
2022-05-11 14:47:16 +00:00
13d701e3d0 Fix maps after ea72437739.
Correctly fetch the civ from the player's Identity.
Also remove the notions of the CivChanged message, since it was
effectively deleted already.

Differential revision: https://code.wildfiregames.com/D4486
Reviewed by: @wraitii
Comments by: @bb, @Silier, @smiley, @Stan, @vladislavbelov
Fixes #6444

This was SVN commit r26872.
2022-05-11 06:04:20 +00:00
ae54282794 Fixes depth texture sampling in ARB shaders after a87cb6c94d. Fixes #6537
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D4639
This was SVN commit r26862.
2022-05-09 07:55:40 +00:00
62e589ab76 Adds renderer backend interface and dummy backend.
Comments By: phosit, Stan
Tested By: Langbart, phosit
Differential Revision: https://code.wildfiregames.com/D4636
This was SVN commit r26858.
2022-05-08 22:02:46 +00:00
c5f71d6b87 Fixes grayscaleFactor usage in Canvas2D ARB shader added in 1f192f1593. Fixes #6536
Tested By: Langbart
This was SVN commit r26857.
2022-05-07 20:57:16 +00:00
5c17a11343 Fixes incorrect type of objectColor in overlay line ARB shader introduced in 34fc883317 and appeared after 04bd96cee0. Fixes #6534
This was SVN commit r26856.
2022-05-07 19:48:35 +00:00
27061d7bd4 Fix slow formation movement on spamclick by increasing instant turn angle to the same value as units.
Having a small instant turn angle apparently makes units (not only
formations) lag when spamclicking.

Patch by: @marder
Differential revision: https://code.wildfiregames.com/D4593
Fixes #6440

This was SVN commit r26855.
2022-05-07 04:47:03 +00:00
04bd96cee0 Moves uniform and texture binding to CDeviceCommandContext.
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D4631
This was SVN commit r26848.
2022-05-02 20:57:22 +00:00
a2df854547 Fix extra parenthesis in d0b2168879.
This was SVN commit r26845.
2022-05-01 15:27:33 +00:00
Angen
a90ba38357 [Gameplay] Buff spear cavalry
Bonus against cavalry 1.75 -> 2

Differential revision: D4625
Patch by: @LetswaveaBook
Reviewed by: @marder
Comments by: @real_tabasco_sauce
This was SVN commit r26844.
2022-05-01 11:08:52 +00:00
Angen
d0b2168879 Add Mouse drag to options
Allow to modify pixel distance when mouse input is detected as drag e.g.
for selection box.

Differential revision: D4624
Refs: #6506
Comments by: @vladislavbelow @Freagarach
Tested by: @psypherium
This was SVN commit r26843.
2022-05-01 10:50:23 +00:00
Angen
59fdc5e591 Fix chat window
Fix chat window not closing when submitting empty string introduced in
47f5c27eec
Always call submitted hanlders.

Differential revision: D4621
Fixes: #6511
Patch by: @Langbart
Comments by: @elexis
This was SVN commit r26842.
2022-04-29 17:48:01 +00:00
9c0817849e Fix - in previous commit.
This was SVN commit r26840.
2022-04-29 05:39:54 +00:00
65f631ff15 Make scythes aura only affect humans (instead of units).
Fixes affecting corpses and Siege.

Patch by: @Langbart
Differential revision: https://code.wildfiregames.com/D4619
Comments by: @asterix, @Silier, @wowgetoffyourcellphone
This was SVN commit r26839.
2022-04-29 05:38:58 +00:00
edccaaf84a Reduce fog on cisalpine winter map and artic biome.
People shouldn't be punished in a competitive setting for having high
graphic settings.

Patch by: @marder
Differential revision: https://code.wildfiregames.com/D4596
Reviewed by: @wowgetoffyourcellphone
This was SVN commit r26838.
2022-04-29 05:22:42 +00:00
Angen
7765393908 Shift group hotkeys to map 1 - 10 instead 0 - 9
Number groups from 1 - 10 replacing group 0 with group 10 for default
hotkey 0.

Differential revision: D4615
Reviewed by: @Langbart
Fixes: #6509

This was SVN commit r26837.
2022-04-28 17:03:58 +00:00
7e44e7ae69 [maps][alpha 26][fix] Change player owned trees to Gaia.
Reported in a video by: @psypherium
This was SVN commit r26828.
2022-04-25 19:28:08 +00:00
6214632ab1 Fix a missing ambient occlusion texture and uvmap revealed by 0766919645.
Reported in a video by: @psypherium
This was SVN commit r26827.
2022-04-25 15:27:16 +00:00
5a1c510ff1 [maps] Fix lost comma. Reported by Gameboy.
This was SVN commit r26825.
2022-04-25 03:46:51 +00:00
e9fdb01d2b [maps][fix] Quick little map file fixes, per @Stan.
This was SVN commit r26824.
2022-04-24 22:10:31 +00:00
42c46b41bb [maps][Alpha 26] Clean up of the Player data for Skirmish maps.
Fixes #6508

This was SVN commit r26821.
2022-04-24 04:37:27 +00:00
8368bd6248 [art][textures] Add some player color to the Arabic robes.
This was SVN commit r26820.
2022-04-24 03:04:18 +00:00
281ba0924f [maps][Alpha 26] Further improve corinthian_isthmus_2p and its map preview.
This was SVN commit r26819.
2022-04-24 02:58:20 +00:00
7606fd1eec [maps][Alpha 26] Improve the terrain of Corinthian Isthmus (2) since it is the default map for Spanish language players.
Also improve the terrain for Cycladic Archipelago 2p.
Fix naming conventions for Acropolis Bay, Chang Jiang, and Tarim Basin.
Add these new and updated maps to the "New Maps" campaign.

This was SVN commit r26818.
2022-04-24 01:11:12 +00:00
f1a59eca29 [art] Fix Brennus actor's material.
This was SVN commit r26809.
2022-04-20 17:28:38 +00:00
da983fbe42 [art][Alpha 26] Give an easier-to-see projectile to the Han Siege Tower
This was SVN commit r26808.
2022-04-20 06:53:40 +00:00
3dd1cd39ca [art][Alpha 26] Give an easier-to-see projectile to the Siege Tower
This was SVN commit r26807.
2022-04-19 07:50:26 +00:00
5de50c447c Allow setting the passability class dynamically. This is needed to improve formation behavior for the release.
Accepted by: @Freagarach
Refs: https://code.wildfiregames.com/D4563,
https://code.wildfiregames.com/D4605
Differential Revision: https://code.wildfiregames.com/Dr4599
This was SVN commit r26801.
2022-04-17 11:06:09 +00:00
28349a2067 [art] Reduce specular strength of this block wall texture.
This was SVN commit r26798.
2022-04-17 02:23:40 +00:00
6dfe7378fd [art][actors] Fix the Temperate stone actor to use the correct textures.
This was SVN commit r26797.
2022-04-16 06:44:41 +00:00
0e7c7f26cf [art][actors][Alpha 26] Remove a superfluous decal from these Arsenal actors. The game would display this decal inconsistently with the other decal, so I picked one over the other.
This was SVN commit r26796.
2022-04-16 05:07:54 +00:00
a2c3e7503b [art][model][decals] Fix the Spartan Forge by recentering the model, also create a new decal for it from the existing texture.
Tweak the other Spartan decals while I'm at it.

This was SVN commit r26795.
2022-04-16 05:06:01 +00:00
9217a710ec [art] Technology portrait for Wicker shields
This was SVN commit r26793.
2022-04-15 19:55:15 +00:00
eaac0b0dbe Uses vertex streams to get attribute locations reducing duplication in XML.
Also adds missing streams.

This was SVN commit r26792.
2022-04-15 18:13:33 +00:00
44a6b6bd23 [maps] Add a couple of improved maps to the new maps campaign.
This was SVN commit r26790.
2022-04-15 07:34:35 +00:00
458f4fca1e [art][fix][actors][Alpha 26] Fix the projectiles for a handful of siege engines.
This was SVN commit r26787.
2022-04-14 06:52:43 +00:00
0e9bbd10c6 [art][icons][Fix] Fix some new aura icons, renamed/modified some too. Added them to some auras. Added some old icons to other auras.
This was SVN commit r26786.
2022-04-14 06:25:43 +00:00
ad2068dae0 Uses sequential numbering of GL vertex attributes for modern hardware. Refs #3054
Differential Revision: https://code.wildfiregames.com/D4601
This was SVN commit r26781.
2022-04-12 16:13:47 +00:00
Angen
eafdb2339d Fix unit demo map
Split from D4589

Differential revision: D4600
Original patch by: @Langbart
Fixes: #6486
Refs: #6116

This was SVN commit r26775.
2022-04-11 18:59:25 +00:00
8a51e05c2e Avoids a crash if a texture size is not a power of two.
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D4586
This was SVN commit r26774.
2022-04-11 16:28:41 +00:00
b55c71ab88 [maps] Improve Median Oasis 2p with new terrain textures and new flora/geology.
This was SVN commit r26770.
2022-04-09 05:45:00 +00:00
06796303d7 Fix progress slider on formerly autoqueued items.
It was not resized for ghosts.

Reported by: @Langbart
Differential revision: https://code.wildfiregames.com/D4592
Fixes #6492

This was SVN commit r26769.
2022-04-09 05:34:43 +00:00
41032b034c [ maps ] Fix the absence of stone mines on Cisalpine Winter.
This was SVN commit r26768.
2022-04-09 04:54:05 +00:00
001da7fdb8 [ art ][ particles ] Slow down the snow fall for aesthetics.
This was SVN commit r26767.
2022-04-09 04:52:22 +00:00
73ec3fd48b [ Alpha 26 ] In Carthaginian embassies, remove references to "researching technologies" since there are none.
Report:
https://wildfiregames.com/forum/topic/51306-thread-for-posting-suggestions-for-alpha-26/page/14/#comment-489907

This was SVN commit r26766.
2022-04-09 01:08:42 +00:00
ed6b87c0fe [art] [Alpha 26] Improve and standardize the portraits for Ruins and Rocks. Delete a now-unused portrait.
This was SVN commit r26765.
2022-04-09 00:53:25 +00:00
0766919645 [ art ][ actors ][ Alpha 26 ] A large actor visual update (mainly buildings)
- Better fitting decals
- Player color
- Warships use the larger, easier to see projectile like buildings do
- Upgrading variants
- Standardized decals for Stables
- Fix a few death variants
- Some better tree props
- Fixed sheath position for the Roman Centurion
- Add Cavalry variants for Gallic heroes (templates will come later)
- A more "British" shield for the Brit fanatic
- Add a new Atlas building for the Spartans, the "Persian Stoa"
- Add distinct actors between lit and non-lit Fireships

This was SVN commit r26764.
2022-04-08 21:45:47 +00:00
383df82c4a Improve acropolis_bay_2p by removing fences and tweaking roads lightly and allow rebuilding towers.
Accepted by: @marder
Patch by: @Langbart
Differential Revision: https://code.wildfiregames.com/D4591
This was SVN commit r26761.
2022-04-07 15:51:36 +00:00
6cc44f7a6f [art][textures] Reduce the resolution of the camel blanket textures by half. They were originally ginormous, 4x bigger than a standard unit texture.
This was SVN commit r26758.
2022-04-04 03:50:28 +00:00
7da9ec6005 [art][actors] Improved the look of some actors.
- Different dirt decals for 3 Iberian structures
- Variations for the trees on the Kushite wonder
- Spec maps for a couple Athenian units
- Changed textures for Gallic elite javelineer
- New textures for the Ptolemy war elephant driver
- Peytral for the Elite Seleucid jav cav
- More helmet variants for the Elite Seleucid spear cav

This was SVN commit r26757.
2022-04-03 20:51:39 +00:00
f9fae35b59 Fix selecting formations when cycling through idle entities.
Since formations have `cmpIdentity` now (b778caf146), they were
incorrectly selected when cycling through idle entities.

Reported and tested by: @Langbart
Differential revision: https://code.wildfiregames.com/D4588
Fixes #6490

This was SVN commit r26756.
2022-04-03 17:37:34 +00:00
d847a1c479 Fix research icon position.
It was overlayed with the FPS overlay which rendered it unreadable.

Introduced in 7c3aed5f36
Reported by: @Langbart
Patch by: @phosit
Differential revision: https://code.wildfiregames.com/D4585
Comments by: @elexis
Fixes #6484

This was SVN commit r26755.
2022-04-03 17:32:19 +00:00
a9d266f9f7 Rework Iphicratean Reform.
- Gymnasium to the second phase.
- Allow training the marines and cretan archers there.
- Move the above mentioned tech to that structure and the dock.

Patch by: @marder
Differential revision: https://code.wildfiregames.com/D4537
Comments (implied acceptence) by: @chrstgtr, @ValihrAnt

This was SVN commit r26754.
2022-04-03 17:18:46 +00:00
Angen
3a43cb272c [Gameplay] Ships less pierce attack, but can destroy other ships because of a multiplier
Currently garrisoned ships easily kill organic units that dare to get to
close to them. A garrisoned ship is a killing machine like nothing else
in the game.

This patch solves their absurd deadliness against organic units. Ships
get 12 pierce attack and a 3x multiplier against other ships so they can
sink enemy ships at comparable rate as in A24 and A25.

Differential revision: D4507
Patch by: @LetswaveaBook
Reviewed by: @wowgetoffyourcellphone
Comments by: @marder @wraitii @Freagarach
This was SVN commit r26753.
2022-04-03 09:24:10 +00:00
6297d1a58f [art][actors] Use the "normal" material instead of "parallax" for these 2 Kushite actors. The normal maps don't have an alpha anyway.
This was SVN commit r26751.
2022-04-02 23:47:29 +00:00
84531ea28a [art][textures] Significantly reduce the bump effect of 3 Kushite royal textures.
This prevents a lot of visual artifacts.

Also reduce the size of this 1 spec map (it was overlarge). Saves disk
space.

This was SVN commit r26750.
2022-04-02 23:45:45 +00:00
4c17946717 [maps] Improve Saharan Oases skirmish map.
This was SVN commit r26748.
2022-04-02 08:57:27 +00:00
fdb1298efe [maps] Revamp Acropolis Bay skirmish map.
This was SVN commit r26747.
2022-04-02 08:54:47 +00:00
77e9ec372f [music] Rename music tracks to convention.
This was SVN commit r26746.
2022-04-02 08:37:30 +00:00
46dfad4c41 [maps][Atlas] Update Britons sandbox map. Refs #6488
This was SVN commit r26745.
2022-04-02 03:43:46 +00:00
c1fb182e5e [maps][Atlas] Fix Kushite sandbox map. Refs #6488
This was SVN commit r26744.
2022-04-02 03:28:16 +00:00
3a22d2ec69 [art][mesh] Fix the UV map of this head mesh to remove a visual defect on the pony tail geometry.
This was SVN commit r26743.
2022-04-01 23:56:36 +00:00
1af385a6dd Fix attack-walk with formations.
As well as patrolling.
Formations kept moving, finding targets and instructing their members to
attack (thereby resetting their attacking state every time).
We now move into `MEMBER` upon finding a target.

Differential revision: https://code.wildfiregames.com/D4550
Comments by: @Stan
Fixes #6461

This was SVN commit r26741.
2022-04-01 05:46:13 +00:00
a8e7bb179e Add identity tag to obstructor.
Introduced in 20bb3ea4a3.

We assume at many places that an entity has cmpIdentity and as such we
add it here as well.

Patch by: @Langbart
Differential revision: https://code.wildfiregames.com/D4583
Fixes #6416

This was SVN commit r26740.
2022-04-01 05:29:23 +00:00
12ac4c7714 Fix pop indication of paused items.
Reported by @Langbart at 75aa2091b7.

Differential revision: https://code.wildfiregames.com/D4308
Comments by: @Langbart, @marder, @Silier
Fixes #6452

This was SVN commit r26739.
2022-04-01 05:22:49 +00:00
a3248ac04b Escapes paths in user report terms to fix invisible backslashes on Windows. Fixes #6475
Patch By: Langbart
Differential Revision: https://code.wildfiregames.com/D4579
This was SVN commit r26733.
2022-03-29 22:11:58 +00:00
ff7c5c7601 [maps] Improve forests on savanna and nubia biomes
Accepted by: @wowgetoffyourcellphone
Patch by: @marder
Differential Revision: https://code.wildfiregames.com/D4562
This was SVN commit r26729.
2022-03-28 22:41:05 +00:00
5836637dde [Maps] Oly use actors in the decoratives of the random biomes
Accepted by: @wowgetoffyourcellphone
Patch by: @marder
Differential Revision: https://code.wildfiregames.com/D4569
This was SVN commit r26728.
2022-03-28 22:39:45 +00:00
8f85f24608 Update the water height slider if the water height is set using the picker.
Patch by: @phosit
Fixes: #6424
Differential Revision: https://code.wildfiregames.com/D4576
This was SVN commit r26727.
2022-03-28 22:36:17 +00:00
c842678591 Removes usages of EXT and INTEL timer query GL extensions.
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D4571
This was SVN commit r26724.
2022-03-28 17:32:09 +00:00
4013004040 [art] Odds n Ends. Add different trees to the Ptolemy library. Give the Polybolos a slightly larger projectile. Make a tree texture darker.
This was SVN commit r26723.
2022-03-28 09:56:17 +00:00
e341daef26 [art] Add player color to hele_struct_b.
This was SVN commit r26722.
2022-03-28 09:55:02 +00:00
050dff3aec [art][actors] Fix/Tweak some Carthaginian and Gallic actors.
This was SVN commit r26720.
2022-03-27 09:45:15 +00:00
8935fc8748 [art] Fix the front-back position of the Carth camel trader prop and now use it.
This was SVN commit r26719.
2022-03-27 09:43:19 +00:00
6a0a9370e9 [art] Delete this old, unused brit unit texture.
This was SVN commit r26718.
2022-03-27 09:39:03 +00:00
d2df1e5090 [art] Fix vertical position of this Carthaginian apartment model
This was SVN commit r26717.
2022-03-27 09:37:11 +00:00
3245cf1ad1 [art][actors] Tweaked the look of some actors and some minor style stuff.
This was SVN commit r26715.
2022-03-27 01:32:17 +00:00
838d7de552 [ART][TEXTURES][UI] Reduce resolution of these 20 technology portraits to a consistent 128^2. Save a little bit of space.
This was SVN commit r26714.
2022-03-26 23:53:48 +00:00
860552b166 [art] Fix 2 actors caught by Jenkins.
Reported by @Stan

This was SVN commit r26713.
2022-03-26 19:08:09 +00:00
6e3b33806c [art][Atlas][Alpha 26] Improve some Atlas structures.
- Use a nicer actor for the obelisk
- Better portrait for sele_colonnade.xml and Stoas
- Tweak some civs for the tents

This was SVN commit r26711.
2022-03-26 09:00:49 +00:00
5fa5b0ad24 [Alpha 26] Tweaked these Han technologies a little
This was SVN commit r26710.
2022-03-26 08:56:07 +00:00
efd296fb72 [art] Some additional art fixes and improvements before commit freeze.
- Date Palm actor variations for use on structures and elsewhere
- Fixed missing player color on the Celtic battering ram
- Unit actor fixes and updates
- Updated a Spartan unit texture and added a spec map for weapons

This was SVN commit r26709.
2022-03-26 08:54:24 +00:00
cf1d45042b [art][actors][Spartans] Fix and enhance some Spartan actors. Add some Helot actors for fun.
This was SVN commit r26708.
2022-03-26 02:32:12 +00:00
bc43ae9461 [art] Make is so these Lithobolos operator actors don't share the same helmet types.
This was SVN commit r26707.
2022-03-26 01:37:56 +00:00
0422d243c6 [art] A longer spear for the Persian champion cavalry.
This was SVN commit r26706.
2022-03-26 01:36:48 +00:00
cc16f89404 [Atlas] [Maps] Keep tweaking the Han sandbox map.
This was SVN commit r26704.
2022-03-25 06:58:16 +00:00
ca78a599db Make catapult / stonethrower more useful.
So decrease their attack spread to 3, increase their crush damage and
also increase their vision range slightly, so you can actually see what
they attack.
This still means they are primarily useful against buildings, and not
unit killer as in a23.

Patch by: @marder
Differential revision: https://code.wildfiregames.com/D4511
Accepted by: @chrstgtr, @ValihrAnt, @wowgetoffyourcellphone
Comments by: @Langbart, @Stan
This was SVN commit r26703.
2022-03-25 06:32:37 +00:00
a98049220c Use the Introductory Tutorial as tutorial.
As opposed to the Starting Economy Walkthrough, which is less
beginner-friendly.

Patch by: @azayrahmad
Differential revision: https://code.wildfiregames.com/D4194
Fixes #6347

This was SVN commit r26702.
2022-03-25 06:25:22 +00:00
4ddaa93a56 [art][Atlas] Move the terrains from the "new_temp" folder to the "biome-temperate" folder.
Requested by @Vladislav and @Stan

This was SVN commit r26701.
2022-03-22 07:01:43 +00:00
a403a9ed2e [Atlas] [Maps] Update the Default map in Atlas
Lowers default terrain grid height, which helps with shadow
sharpness on old shadows and allows for more vertical height
    A nicer Skybox as default
    One of the new higher-quality Terrain Textures by default


Patch by: @wowgetoffyourcellphone
Accepted by: @marder
Differential Revision: https://code.wildfiregames.com/D4446
This was SVN commit r26700.
2022-03-22 00:03:28 +00:00
6db7039bb4 fix mainland: decorative bushes spawnig inside the player cc on mainland.js
Patch by: @marder
Accepted by: @Langbart
Differential Revision: https://code.wildfiregames.com/D4549
This was SVN commit r26699.
2022-03-21 23:58:44 +00:00
6ad67d6a38 [art] only use the blossoming variant of the apple tree as a fruit tree to make it more distinct.
Add a normal variant.
Patch by: @marder
Accepted by: @wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D4555
This was SVN commit r26698.
2022-03-21 23:55:34 +00:00
1f09d43c7c Use geometry instead of transparency for han shields.
Recommended by: @vladislavbelov
Removed unused head for liu bang.

This was SVN commit r26697.
2022-03-21 23:41:08 +00:00
63841facb7 Remove not working terrain_parallax_spec.xml material and usages.
Remove two other unused/bad textures and use a better dummy texture
instead.

This was SVN commit r26696.
2022-03-21 20:29:22 +00:00
3c0c9098cf Adjust animal stances.
There have been complaints on the forums (e.g.
https://wildfiregames.com/forum/topic/51245-how-do-you-guys-feel-about-a25-in-terms-of-how-much-fun-you-have-compared-to-a23-or-a24/#comment-446690).
Boar and walrus now behave the same as the elephants (only attack back
when attacked), whilst most other animals have defensive stance (attack
only within some smaller distance and chase until left vision).

Differential revision: https://code.wildfiregames.com/D4533
Reviewed by: @marder, @wowgetoffyourcellphone
Comment by: @Silier
This was SVN commit r26694.
2022-03-21 06:58:13 +00:00
aca70ab800 [gameplay] Reenable the Han Academy' ability to be captured.
This was SVN commit r26692.
2022-03-21 02:43:20 +00:00
830839d55b [art] Improved a few portraits
This was SVN commit r26691.
2022-03-21 01:55:19 +00:00
8d9396e07e [art] Fix a space in the file name of this rock template, then fix the refs in the maps that use it.
This was SVN commit r26689.
2022-03-20 19:36:50 +00:00
fd1eb35e07 [art] replace fig tree by the better visible date palm (or by berries)
Patch by: @marder
Accepted by: @wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D4560
This was SVN commit r26686.
2022-03-20 14:51:51 +00:00
d8f6995dba [art] switch the berries on savanan biome
Patch by: @marder
Accepted by: wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D4558
This was SVN commit r26685.
2022-03-20 14:50:22 +00:00
9387020ace [art] remove a decal from the small desert mines
Patch by: @marder
Accepted by: @wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D4557
This was SVN commit r26684.
2022-03-20 14:36:23 +00:00
feb32fba1a [art] Recenter the Maurya ram mesh, it was centered with the wooden beam unlike the other ones.
Noticed by: @wowgetoffyourcellphone
This was SVN commit r26683.
2022-03-20 13:54:27 +00:00
74275a12f3 Fix some style issues noticed by translators.
This was SVN commit r26682.
2022-03-20 08:08:27 +00:00
e69a729b64 [art] The final new default cursor?
This was SVN commit r26681.
2022-03-20 03:24:21 +00:00
1c95269354 [art Alpha 26] Update the footprint sizes and selectable shapes for mechanical units (Siege and Ships)
Closes #6459

This was SVN commit r26680.
2022-03-20 00:34:19 +00:00
af4317c92f [art] Remove this unused actor.
This was SVN commit r26679.
2022-03-20 00:30:41 +00:00
897b37040c [gameplay] Increase the cost of mercenary cavalry from 80 to 90 metal.
Patch by: @marder
Accepted by: @ValihrAnt
Differential Revision: https://code.wildfiregames.com/D4515
This was SVN commit r26678.
2022-03-19 17:00:56 +00:00
83bdd88f4a [Gameplay] Fix Ministers being able to capture fields, palisades and walls.
Patch by: @Langbart
Reported by: Playerof0AD
Accepted by: @wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D4565
This was SVN commit r26677.
2022-03-19 16:56:44 +00:00
69d30d4725 Add missing Territory root tooltip information for the Han Ministry.
Patch by: @Langbart
Accepted by: @wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D4566
This was SVN commit r26676.
2022-03-19 16:51:02 +00:00
a77279ad3e [art] make the olive tree a source of wood, as it is hard to see that it is a food supply
Thread:
https://wildfiregames.com/forum/topic/73939-fruit-trees-are-too-difficult-to-tell-apart-from-other-trees/
Accepted by: @wowgetoffyourcellphone
Patch by: @marder
Differential Revision: https://code.wildfiregames.com/D4561
This was SVN commit r26675.
2022-03-19 16:38:00 +00:00
bb542f3aff Capitalize population in game setup
World pop was added with edb956424e, words (no preposition & articles)
for the title heading in the game setup are all capitalized except
population.

Patch By: @Langbart
Accepted by: @wowgetoffyourcellphone, @marder
Differential Revision: https://code.wildfiregames.com/D4564
This was SVN commit r26674.
2022-03-19 16:26:23 +00:00
18e4091d65 Alpha 26 Name: Zhuangzi
This is an ancient Chinese text from the late Warring States period.

Poll:
https://wildfiregames.com/forum/topic/53736-alpha-26-name-suggestions/

This was SVN commit r26673.
2022-03-19 16:19:31 +00:00
9365464717 [A26]
Style fix on the Ministry template. Add civ to the Han palisade
template.

This was SVN commit r26672.
2022-03-19 08:38:13 +00:00
8f2f111c35 [art - Alpha 26]
Shrink up the Arab oval shield model slightly, as it was overlapping
with the unit's weapons, etc.

This was SVN commit r26671.
2022-03-19 07:40:53 +00:00
67050b8a83 [art - Alpha 26] Han Chinese
Move the Han head textures to the proper folder and delete the bad
folder. Adjust the head actors to the correct texture folder.

Improve the han_fem_c.png face texture and the Han female citizen
portrait.

Improve the Han fisherman actor to use better textures.

This was SVN commit r26670.
2022-03-19 07:39:38 +00:00
12007ee14b [art Alpha 26]
Greatly reduce the size of these quiver textures. Part of an ongoing
effort to get texture sizes under control.

This was SVN commit r26669.
2022-03-19 06:41:10 +00:00
42b6784f07 Nerf fire cav (differently).
Give back their stacking fire, but reduce their damage, increase their
spread and repeat time.
Based on the discussion at
https://wildfiregames.com/forum/topic/72452-tasklist-for-closing-out-a26/,
this should decrease their efficiency versus units.

Patch by: @marder
Differential revision: https://code.wildfiregames.com/D4516
Reverts 422fbbee7f
Comments by: @Silier
Reviewed by: @chrstgtr, @ValihrAnt
This was SVN commit r26667.
2022-03-18 06:53:38 +00:00
2a66c783ee Make configurable mouse edge distance for view scroll.
Differential Revision: https://code.wildfiregames.com/D4552
This was SVN commit r26665.
2022-03-17 18:25:54 +00:00
37b30901b3 Removes C++ code for conditional defines removed in f29d059617.
Differential Revision: https://code.wildfiregames.com/D4551
This was SVN commit r26661.
2022-03-15 22:13:22 +00:00
7f279c695d Remove fortress and tower entity limits.
The distance requirement is enough:
These entity limits for fortresses and towers unnecessarily restrict
player freedom, especially on giant-size maps. See also comments by
various people on the forums (e.g.
https://wildfiregames.com/forum/topic/37687-lets-fight-gameplay-balance-mod/page/2/?tab=comments#comment-422251).

Patch by: @Nescio
Rebased by: @marder
Differential revision: https://code.wildfiregames.com/D3778
Reviewed by: @borg-, @chrstgtr
Comment from: @wowgetoffyourcellphone

This was SVN commit r26660.
2022-03-15 07:08:05 +00:00
7a42776b83 Increase the acceleration.
Patch by: @marder
Differential revision: https://code.wildfiregames.com/D4512
Agreed: @chrstgtr, @Effervescent, @LetswaveaBook, @PhiliptheSwaggerless,
@Stockfish, @ValihrAnt, @wowgetoffyourcellphone
Disagreed: @bb, @Freagarach

This was SVN commit r26659.
2022-03-15 07:04:42 +00:00
6db68dbe8e Don't show captured units in summary.
Since siege isn't capturable anymore since d583048690.

Reported by: fmmaks at
https://wildfiregames.com/forum/topic/73490-cant-capture-siege-engines-alpha-25/#comment-484544.
Patch by: @Langbart
Differential revision: https://code.wildfiregames.com/D4538
Fixes #6455

This was SVN commit r26658.
2022-03-15 06:53:40 +00:00
4af4fa84e3 Fix using numeric cheats with a non-numeric value.
Requested by @Silier at 93b22c5f86.
This notifies players when using a non-numeric value and guards the
simulation against such cases.

Previous behaviour was that a cheat was executed with its default value.
Now the cheat is not used.

Differential revision: https://code.wildfiregames.com/D4485
Comments by: @bb, @Silier
This was SVN commit r26657.
2022-03-15 06:46:34 +00:00
02de932816 Remove redundant function in HasDealtWithTech in trigger helper.
The function was redundant for a long time, but made an error in
73f741d266.

Reported by: @marder
Differential revision: https://code.wildfiregames.com/D4541
Tested by: @marder
Fixes #6458

This was SVN commit r26656.
2022-03-15 06:38:46 +00:00
959d50b81d Add icon and tooltip for han pop bonus.
Similar to the pers and maur ones.

This was SVN commit r26655.
2022-03-15 05:39:29 +00:00
bb
1b0891c566 Handle OutOfWorld for formations
Comments By: Silier
Reviewed By: Freagarach
Differential Revision: D4535
fixes #6448
fixes d9d4deb6ce

This was SVN commit r26651.
2022-03-14 19:51:22 +00:00
Angen
a7b7f50cc8 Move some shaders to mod
Differential revison: D4547
Fixes: #6294

This was SVN commit r26650.
2022-03-14 17:24:47 +00:00
cce1005c81 [art - Alpha 26]
Fix 2 Blemmye textures. Somehow during the moving and renaming process
the textures got screwed up.

This was SVN commit r26646.
2022-03-14 06:02:21 +00:00
36c7fff532 [Han Chinese - Alpha 26]
Renamed the Han civ bonus filename to match the Persian and Mauryan
files of the same effect. Very minor change.

This was SVN commit r26644.
2022-03-14 03:54:50 +00:00
91a1fddf9d Fix arctic biome bushes spawning too close to the CC.
Patch by: @marder
Accepted by: @wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D4543
This was SVN commit r26643.
2022-03-14 00:15:43 +00:00
Angen
74ce45b93e Fix Macedonian bonus
Differential revision: D4544
Patch by: @ValihrAnt
Missed rebase

This was SVN commit r26642.
2022-03-13 19:14:44 +00:00
Angen
020a123ea1 [gameplay] Adjust Kushite Pyramids to be more used
Differential revision: D4280
Patch by: @ValihrAnt
Reviewed by: @chrstgtr
Accepted by: @marder
Comments by: @wowgetoffyourcellphone @LetswaveaBook @wraitii @Freagarach
This was SVN commit r26641.
2022-03-13 19:08:46 +00:00
Angen
4023b04895 [gameplay] increase attack of defensive structures slightly
This increases their damage slightly from 10 to 11

Differential revision: D4510
Patch by: @marder
Reviewed by: @wowgetoffyourcellphone
Comments by: @chrstgtr
This was SVN commit r26640.
2022-03-13 18:54:06 +00:00
87b04cc3f9 Add a word of caution to the empire map.
Patch by: @Langbart
Fixes #6456
Differential Revision: https://code.wildfiregames.com/D4546
This was SVN commit r26639.
2022-03-13 18:51:13 +00:00
Angen
8f7ee59f79 Fix 0 tech cost multiplier in session tooltips
This was SVN commit r26638.
2022-03-13 13:01:19 +00:00
272b4c1828 [Han Chinese - Alpha 26]
Make the Imperial Court upgrade only applicable to 1 civic center.

This was SVN commit r26636.
2022-03-13 04:54:57 +00:00
ff4e30d672 [Han Chinese - Alpha 26] This retools the Imperial Court upgrade for the Civic Center.
Discussion:
https://wildfiregames.com/forum/topic/71582-fixing-chinese-han/

This removes the Champion training aspect and reduces the GarrisonHolder
from 2x to a 1.5x bonus, the same as the health and capture points
bonus. 2x garrisoning caused there to be a prohibitive number of arrows.

Replaces the champions with faster batch training speed. Unlocked heroes
still remain.

This was SVN commit r26634.
2022-03-13 04:53:40 +00:00
2c9a6704e0 Forgot to commit the unlock tech changes for c4bdbe4dd9
This was SVN commit r26633.
2022-03-13 04:53:08 +00:00
c4bdbe4dd9 [Han Chinese - Alpha 26] Champions trainable in captured Barracks and Stables now require Unlocking Techs
Discussion:
https://wildfiregames.com/forum/topic/71582-fixing-chinese-han/

Previously, one could capture an enemy Barracks or Stable and train Han
champions there without researching the champion unlocking techs. This
rectifies this (in an admittedly hacky way) by creating duplicate Han
champion templates with suffix "_academy" and putting those in the Han
Academy with the RequiredTechnology of City Phase.

The original Han champion templates, which are what can be trained in
captured Barracks and Stables, are given the unlocking
RequiredTechnology respective to their class (as most of civs'
champions).

Both Templates have the same SelectionGroupName, so should be selectable
together with a double-click with no problem.

Please report problems in the above linked thread.

This was SVN commit r26632.
2022-03-13 04:34:03 +00:00
4eb65144fc [Han Chinese] Minister
- Make his capture attack be 20% less than heroes, but 40% more than
champions (previously his capture attack was a whopping 20)
- Add an attack-move soundgroup
- Discussion:
https://wildfiregames.com/forum/topic/71582-fixing-chinese-han/

This was SVN commit r26631.
2022-03-13 04:25:10 +00:00
e89e55539e Removes custom vertex attribute locations for GLSL. Refs ce215cace3.
This was SVN commit r26630.
2022-03-12 23:25:23 +00:00
325176fa55 [gameplay] Macedonian bonus - Instant storehouse technology research time.
Patch by: @ValihrAnt
Accepted by: @chrstgtr
Differential Revision: https://code.wildfiregames.com/D4234
This was SVN commit r26627.
2022-03-12 21:52:23 +00:00
d9ccc5c499 [gameplay] Nerf Han hero Han Xin
Patch by: @ValihrAnt
Accepted by: @marder, @wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D4525
This was SVN commit r26626.
2022-03-12 21:22:16 +00:00
50234ba533 Slighty offset the stone mine on the tutorial map to prevent overlap.
Patch by: @Langbart
Accepted by: @marder
Thread:
https://wildfiregames.com/forum/topic/73619-tutorial-map-woman-overlapping-stone-mine

Differential Revision: https://code.wildfiregames.com/D4540
This was SVN commit r26625.
2022-03-12 19:29:18 +00:00