1
0
forked from 0ad/0ad
Commit Graph

15972 Commits

Author SHA1 Message Date
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
61ef7fc1d1 Adjusted walking speed and animation speed for a number of animals:
- camel, cow, sanga cattle, zebu: decreased animation speed
- deer and gazelle: decreased animation speed and walking speed.

Patch by @pszemsza
Fixes #5680
Differential Revision: https://code.wildfiregames.com/D3891
This was SVN commit r26622.
2022-03-11 13:51:43 +00:00
4f028b0771 [art] Resize the minimap icons from 32x32 to 16x16
This was SVN commit r26621.
2022-03-11 08:18:25 +00:00
dff79a388b Fix obstructed entities being able to drop off resources.
Introduced in 7ba4b1ffc8 by not checking the range anymore.
Reported by @FFFF at
https://wildfiregames.com/forum/topic/72985-stuck-units-delivering-resourses/.

Differential revision: https://code.wildfiregames.com/D4531
Tested by: @Langbart
Fixes #6446

This was SVN commit r26619.
2022-03-11 06:39:25 +00:00
41033d951e Fix stances of healers.
They fled whilst healing and not when idle. That is the other way around
than expected.
Introduced in healing introduction (c56f96040e); #999 specifically made
them flee, but it left quite undefined behaviour.
Reported by @BreakfastBurrito_007 on the forums somewhere.

Differential revision: https://code.wildfiregames.com/D4532
This was SVN commit r26618.
2022-03-11 06:37:03 +00:00
ca3c3714a7 [art] Han Chinese
New portrait for Wei Qing, by kul

This was SVN commit r26612.
2022-03-09 17:50:14 +00:00
6a09087225 [art] Han Chinese
- Liu Bang portrait by @kul

This was SVN commit r26608.
2022-03-08 09:21:07 +00:00
059fbf25d1 [Fix - Alpha 26] Remove minimap icons from Stone and Metal mines for this release, as some maps have more than the max number of 128.
Refs diff: ​https://code.wildfiregames.com/D4513
Refs changeset: 9e6e6e7535

This was SVN commit r26607.
2022-03-08 07:03:58 +00:00
3417669e97 [art] Improve the look of the loading screen parchment. From a cc0 source.
This was SVN commit r26602.
2022-03-07 07:28:48 +00:00
2d598c34f3 [Fix] Han Minister attack soundgroup
This was SVN commit r26601.
2022-03-07 06:56:21 +00:00
9e6e6e7535 [Minimap] Finish off the minimap feature with the rest of the icons
Refs diff: https://code.wildfiregames.com/D4513
Refs #26592

This was SVN commit r26600.
2022-03-07 06:49:08 +00:00
839d38386c [gameplay - Alpha 26] Han Chinese
- Remove the bolt shooter tech from the Han arsenal, since they no
longer have a bolt shooter

This was SVN commit r26598.
2022-03-07 05:04:22 +00:00
c62cc86477 [art] Improve the Ptolemy merc cav actors.
This was SVN commit r26597.
2022-03-07 05:03:05 +00:00
1fd263520c [art] Create a new material player_trans_ao_norm_spec.xml
This was SVN commit r26596.
2022-03-07 05:02:07 +00:00
475e1a02ae [art] Allow the Spartan Syssition model to use Spartan hoplite shields instead of the ugly low res bronze disks used previously.
This was SVN commit r26595.
2022-03-07 04:59:51 +00:00
36faf3bb4f This was SVN commit r26593. 2022-03-07 01:59:41 +00:00
ce18f297d5 Adds icons to minimap.
Tested By: Langbart, Stan
Differential Revision: https://code.wildfiregames.com/D4513
This was SVN commit r26592.
2022-03-07 01:22:06 +00:00
ddf88a2640 [gameplay - Alpha 26] Han Chinese
- Remove GarrisonHolder from the Han Dock, as it messed up the trade
route waypoint feature.
- Maybe investigate a way to get around this.

This was SVN commit r26591.
2022-03-06 23:25:46 +00:00
ff3b6d5ac4 [Jenkins Log]
- Fixing Thespian Melanochitones and Theban Sacred Band errors
introduced in 8c8d765c06
- Fixing some shield errors introduced in f2346b6796

This was SVN commit r26589.
2022-03-06 22:32:41 +00:00
bb
15ed402a12 [A26 Gameplay] Tweak the formation turning threshold
Reviewed By: marder
Differential Revision: D4517
This was SVN commit r26587.
2022-03-06 21:32:19 +00:00
bb
6a9a17606c further optimizations for map Unknown: Passes
Patch By: elexis
Transferred By: marder
aids 50fefd0605
Differential Revision: D4526
This was SVN commit r26586.
2022-03-06 21:30:19 +00:00
bb
8eecc39e71 Let the Gamesetup.cpp Autostart (starting from cl) use the gamesettings via the autostart gui page.
Comments and testing By: Langbart
Fixes #6433
Differential Revision: D4492
Includes/Obsoletes D4287

This was SVN commit r26584.
2022-03-06 21:12:16 +00:00
bb
2af020bab1 Generalize fromInitAttributes loop
Add deepCompare function to utilities to easy and reliably compare js
variables.

Comments By: Langbart, Stan, asterix
Differential Revision: D4521
This was SVN commit r26583.
2022-03-06 21:01:36 +00:00
18c450a268 [art] Fix resolution of portrait (from 250^2 to 256^2)
This was SVN commit r26581.
2022-03-06 20:23:38 +00:00
77978b8348 [art] New portraits of Han Xin and Cleopatra.
First art commit from user kul. Congrats!

Thread:
https://wildfiregames.com/forum/topic/27520-task-improve-hero-portraits/?do=findComment&comment=479591

This was SVN commit r26580.
2022-03-06 18:07:51 +00:00
50fefd0605 Fix unknown map: opponent being unreachable
Patch by: @elexis
Tweaks by: @Langbart, @marder
Fixes: #6422
Differential Revision: https://code.wildfiregames.com/D4457
This was SVN commit r26578.
2022-03-06 15:22:35 +00:00
3299bc7efb Fix unpassable and unnatural forests on African Plains
Patch by: @marder
Differential Revision: https://code.wildfiregames.com/D4502
This was SVN commit r26577.
2022-03-06 15:10:16 +00:00
aad2453e09 Texture update for polar sea
Patch by: @marder
Differential Revision: https://code.wildfiregames.com/D4450
This was SVN commit r26576.
2022-03-06 15:05:06 +00:00
352dd1873d Texture update/ general overhaul for Gulf of Bothnia and its biomes
Reviewed by: @smiley
Differential Revision: https://code.wildfiregames.com/D4086
This was SVN commit r26575.
2022-03-06 14:51:25 +00:00
Angen
9fcb007bb3 [Petra] Fix han civilisation
This was SVN commit r26574.
2022-03-06 13:54:03 +00:00
71a5274c52 Add 24 new music tracks.
Patch by: @Samulis, Omri Lahav
Refs: #6445

This was SVN commit r26573.
2022-03-06 11:25:57 +00:00
bb
b5d5628667 Make sure PlayerCiv values are initialized
fixes daada92a82
Reviewed By: Silier
Differential Revision: D4522
This was SVN commit r26572.
2022-03-06 09:39:57 +00:00
0668167fda [art] Seven new technology portraits.
This was SVN commit r26571.
2022-03-06 07:54:00 +00:00
217aa91496 [art] Better decals for some building actors; added 2 new "tents" for Atlas.
This was SVN commit r26570.
2022-03-06 07:52:34 +00:00
8c8d765c06 [art/templates] Move Sacred Band and Thespian Black Cloaks to the Theban folder; rename the templates to suit
This was SVN commit r26569.
2022-03-06 07:50:19 +00:00
5dbb7729d6 [art/art cleanup] Some texture updates and deletions.
This was SVN commit r26568.
2022-03-06 07:47:57 +00:00
4811b24483 [art cleanup] Reduce the resolution and file size of these Kushite statue textures.
This was SVN commit r26567.
2022-03-06 07:44:08 +00:00
f2346b6796 [art cleanup] Remove 190 unused shield textures and actors
- Attempt to fix all instances where there caused a problem. Still on
the lookout for anymore gremlins.
- Will hunt down and remove unused meshes in a later commit.

This was SVN commit r26566.
2022-03-06 07:32:38 +00:00
cbf0b49b85 [art] Cleanup these Scutum Boss textures by reducing their file dimensions and file size. (they were comically oversized)
This was SVN commit r26565.
2022-03-06 07:25:59 +00:00
0bcf289798 [art] Darken the sand decals slightly.
This was SVN commit r26564.
2022-03-06 07:24:39 +00:00
b45bc531c4 [art] Use newer shield models for the sides of the Roman warships
This was SVN commit r26563.
2022-03-06 07:20:05 +00:00
69daefeb2b [art] Move the prop points for the Roman tents to fit the newer Roman Scutum models.
This was SVN commit r26562.
2022-03-06 07:17:32 +00:00
fc5a165d81 [art] Add specular to the Mausoleum statues
This was SVN commit r26561.
2022-03-06 07:15:50 +00:00
5867d96ab4 [art] Add a Bronze Quadriga to the top of the Roman Triumphal Arch
This was SVN commit r26560.
2022-03-06 07:13:05 +00:00
ee8bec703d [art] Fix the Spart temple decal.
This was SVN commit r26559.
2022-03-06 07:10:54 +00:00
cddb52cd3f Fix menu music no longer playing.
This was SVN commit r26557.
2022-03-05 22:23:53 +00:00
dd499437ca [art] 4 improved unit portraits.
This was SVN commit r26556.
2022-03-05 21:56:52 +00:00
82ee4fdce2 [gameplay] Reduce pikemen pierce armor by 2
Patch by: ValihrAnt
Accepted by: @wowgetoffyourcellphone, @chrstgtr
Differential Revision: https://code.wildfiregames.com/D4524
This was SVN commit r26555.
2022-03-05 21:56:04 +00:00
db31e46030 [art] Move Han weapon textures to the right subfolder.
This was SVN commit r26554.
2022-03-05 21:37:04 +00:00
c55cd0d7f8 [art] A dozen new technology portraits.
This was SVN commit r26553.
2022-03-05 20:46:17 +00:00
ebac6b01fa [art] Some hero portrait background textures
This was SVN commit r26552.
2022-03-05 20:05:53 +00:00
d32c68eb2c Add Chinese specificName for Town and City phase techs.
Discussion:
https://wildfiregames.com/forum/topic/38729-addition-of-han-chinese-to-0ad/?do=findComment&comment=482980

Participants: @Carltonus @OliverLew @AIEND

This was SVN commit r26551.
2022-03-05 19:47:01 +00:00
d566f891d9 [art] Stopped dead Baobabs from swaying in the wind.
refs: #6423

This was SVN commit r26550.
2022-03-05 19:39:42 +00:00
ca47c244c5 [art] 2 new skyboxes; 1 updated
"Desert", "Sunrise", and "Stratus_2" skyboxes from cc0 sources.

This was SVN commit r26549.
2022-03-05 19:24:46 +00:00
6e863d141b [gameplay - Alpha 26] Han Chinese
The Han Minister can now defend himself. Exact values open for debate.

This was SVN commit r26548.
2022-03-05 19:14:58 +00:00
38351207ba Fix Han civil service technologies
Patch by: @marder
Accepted by: @wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D4523
This was SVN commit r26547.
2022-03-05 19:02:08 +00:00
376720e55e Fix white appearing in camel mipmaps.
Noticed by: @marder
This was SVN commit r26545.
2022-03-05 18:12:11 +00:00
f3fbc86529 Fix an error introduced in fa5671438a. _string was expected but message was there instead
Refs: #6197
Suggestion by: @bb
This was SVN commit r26543.
2022-03-04 14:33:06 +00:00
f2f54cb23d Only add default music tracks if civ.json doesn't override them.
Comments by: @bb, @Freagarach
Differential Revision: https://code.wildfiregames.com/D4500
This was SVN commit r26542.
2022-03-04 14:09:14 +00:00
ba825ac514 Fix Han practice_range triggering errors.
This was SVN commit r26541.
2022-03-04 14:04:54 +00:00
a586d94230 Use some of @Stan's new 'Polar' geology assets on the Alpine Valleys skirmish map.
This was SVN commit r26539.
2022-03-04 06:28:26 +00:00
bb
bd4b7d4bb6 Generalise gamesettings pickRandomItems' loop
Comments By: wraitii, Stan, Silier
Suggested By: elexis
Differential Revision: D4231
This was SVN commit r26535.
2022-03-03 16:13:35 +00:00
bc59f0c40b Use the correct resource type for polar stone mines.
Patch by: @marder
Differential Revision: https://code.wildfiregames.com/D4519
This was SVN commit r26534.
2022-03-03 15:04:59 +00:00
bb
be2f33b661 removeable => removable
Patch By: LudovicRousseau
Comments By: vladislav, Nescio
Differential Revision: D3663
fixes #6098

This was SVN commit r26533.
2022-03-03 14:52:13 +00:00
bb
aa79122b7f introduce template_unit_siege_flamethrower.xml
Patch By: Nescio
Differential Revision: D3576
This was SVN commit r26532.
2022-03-03 14:11:47 +00:00
fa5671438a Fix invalid translations in the game options.
Comments and fixes by: @bb
Fixes: #6197
Differential Revision: https://code.wildfiregames.com/D4083
This was SVN commit r26531.
2022-03-03 13:34:15 +00:00
2fbd9ea17d Add new polar mines.
Refs: https://code.wildfiregames.com/D4450

This was SVN commit r26529.
2022-03-03 11:04:52 +00:00
ab501175f9 Improve new metal mine textures. Better normal map and specular.
This was SVN commit r26528.
2022-03-03 11:02:57 +00:00
6281499708 Move Roman legionary shoulder pad actors to the /armor/ subfolder
This was SVN commit r26527.
2022-03-03 07:15:26 +00:00
6b158ce34d Line endings -> native
This was SVN commit r26526.
2022-03-03 07:12:04 +00:00
bb
7c3aed5f36 Set the size of the overlaybox without relying on the arbitrary initSize
Comments By: vladislav
Differential Revision: D4489
This was SVN commit r26523.
2022-03-02 16:27:11 +00:00
bb
f69e5c01e8 Fix template type in d9d4deb6ce
This was SVN commit r26521.
2022-03-02 15:55:16 +00:00
bb
d9d4deb6ce smoother formation manouvres
Implement a threshold between "turning" the formation and "rearranging"
it.

Patch By: marder
Based on Patch By: alre
Comments By: Freagarach, Stan, Silier
Glanced good By: Freagarach
Differential Revision: D4294
Forum Topic:
https://wildfiregames.com/forum/topic/44848-proposals-for-formations/#comment-452917

This was SVN commit r26520.
2022-03-02 12:54:43 +00:00
250b0f12c6 [gameplay - Alpha 26]
Attempt at making Crossbow teching less OP:
- Remove "Repeating Crossbows" as it was historically problematic and
was also OP for crossbows.
- Reduce the RepeatTime bonus in "Crossbow Training" from -33% to -20%.

This was SVN commit r26519.
2022-03-02 07:36:23 +00:00
df0cd5ac71 Really fix the Han Sandbox this time.
This was SVN commit r26517.
2022-03-01 18:37:33 +00:00
299df0f049 [gameplay - Alpha 26]
Removed the ability of the Han to research 'Will to Fight' from a
captured Fortress. Reported by @faction_02 here:
https://wildfiregames.com/forum/topic/71578-feedbacks-from-a26-svn-tests/?do=findComment&comment=482636

Increased the cost and research time of 'Art of War' to match the other
two Han special Fortress techs.

On the backend moved the Han techs to the Fortress parent template.
Seemed cleaner.

This was SVN commit r26516.
2022-03-01 18:24:43 +00:00
afde89eb33 Update some "sandbox" maps.
Fixed an error to the Han sandbox reported by @Stan.

This was SVN commit r26515.
2022-03-01 18:07:05 +00:00
32ed1f9065 Fix heads forgotten in 090ce1c82f
This was SVN commit r26513.
2022-03-01 15:39:24 +00:00
75f7cde184 Fix previous commit. Removing materials only doesn't work with the game's collada importer.
Noticed by: @marder
This was SVN commit r26512.
2022-03-01 15:34:17 +00:00
8f8752fbe4 Fix incorrect normal maps for stone_furrowed_0* meshes.
Remove duplication in some actors.
Fix naming conventions for those files.
Use the correct material.

Noticed by: @marder
This was SVN commit r26511.
2022-03-01 14:17:24 +00:00
552f66e527 Add additional animation variants to the medium player color cape.
This was SVN commit r26509.
2022-02-28 05:51:20 +00:00
88572c5e80 New f_armor_dress.dae mesh by @Stan with a better UV map
This allows for more accurate textures for female units with intricate
patterns on their long skirts. Boudicca is the first example, provided
here.

This was SVN commit r26508.
2022-02-28 05:50:27 +00:00