Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
23,085 Commits 6 Branches 28 Tags 13 GiB
069560a290
Commit Graph

23085 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stan
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
Stan
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
Stan
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
Stan
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
Stan
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
Freagarach
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
wowgetoffyourcellphone
aca70ab800 [gameplay] Reenable the Han Academy' ability to be captured. 
This was SVN commit r26692.
 2022-03-21 02:43:20 +00:00
wowgetoffyourcellphone
830839d55b [art] Improved a few portraits 
This was SVN commit r26691.
 2022-03-21 01:55:19 +00:00
vladislavbelov
249f7cad55 Fixes cinematic camera distortion on some angles. 
Differential Revision: https://code.wildfiregames.com/D4567
This was SVN commit r26690.
 2022-03-20 21:59:49 +00:00
wowgetoffyourcellphone
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
vladislavbelov
a57581471d Reduces the number of uniform changes in decals rendering and the number of render queries in models. 
This was SVN commit r26688.
 2022-03-20 16:08:19 +00:00
vladislavbelov
d214745f8f Reduces the number of uniform changes in decals rendering. 
This was SVN commit r26687.
 2022-03-20 14:58:03 +00:00
Stan
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
Stan
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
Stan
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
Stan
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
Freagarach
74275a12f3 Fix some style issues noticed by translators. 
This was SVN commit r26682.
 2022-03-20 08:08:27 +00:00
wowgetoffyourcellphone
e69a729b64 [art] The final new default cursor? 
This was SVN commit r26681.
 2022-03-20 03:24:21 +00:00
wowgetoffyourcellphone
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
wowgetoffyourcellphone
af4317c92f [art] Remove this unused actor. 
This was SVN commit r26679.
 2022-03-20 00:30:41 +00:00
Stan
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
Stan
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
Stan
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
Stan
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
Stan
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
Stan
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
wowgetoffyourcellphone
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
wowgetoffyourcellphone
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
wowgetoffyourcellphone
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
wowgetoffyourcellphone
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
Freagarach
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
vladislavbelov
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
vladislavbelov
2ed2e9de0c Invalidates CDeviceCommandContext texture bind cache properly. 
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D4553
This was SVN commit r26664.
 2022-03-17 18:17:11 +00:00
wraitii
ce3a47e49a Fix passibilty overlay in atlas 
Broken in bb49fbe793.

Patch by: nwtour
Fixes #6374

Differential Revision: https://code.wildfiregames.com/D4338
This was SVN commit r26663.
 2022-03-17 15:17:49 +00:00
vladislavbelov
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
Freagarach
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
Freagarach
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
Freagarach
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
Freagarach
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
Freagarach
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
Freagarach
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
vladislavbelov
ea6af3f148 Updates a model color uniform in RenderModifier only if it was changed. 
This was SVN commit r26653.
 2022-03-14 22:56:38 +00:00
vladislavbelov
b4253d48cb Moves CShaderProgram to backend and handling via CDeviceCommandContext. 
Differential Revision: https://code.wildfiregames.com/D4548
This was SVN commit r26652.
 2022-03-14 22:16:14 +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
Angen
8cec96270b Don't create thread on failed connection 
Differential revision: D4545
Fixes: #6442

This was SVN commit r26649.
 2022-03-14 17:19:42 +00:00
wowgetoffyourcellphone
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
wowgetoffyourcellphone
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
Stan
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