wowgetoffyourcellphone/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
23,337 Commits 3 Branches 28 Tags 13 GiB
426edbc399
Commit Graph

23337 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stan
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
Stan
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
Stan
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
Stan
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
Stan
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
Stan
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
Freagarach
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
Freagarach
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
Freagarach
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
wowgetoffyourcellphone
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
marder
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
Stan
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
Stan
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
vladislavbelov
8ee8e63bcc Fixes same sequenced frames for LOS smooth textures. Fixes #6569 
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D4700
This was SVN commit r26950.
 2022-06-17 19:42:48 +00:00
vladislavbelov
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
wowgetoffyourcellphone
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
marder
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
wowgetoffyourcellphone
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
marder
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
marder
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
marder
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
wraitii
274fe129a1 Change deprecated binary_negate<> to not_fn<> 
Deprecated in C++17

Patch by: jprahman
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D4693
This was SVN commit r26939.
 2022-06-12 08:45:39 +00:00
Freagarach
5f9e226625 Revert d81534d792 after 20a11614d7. 
This was SVN commit r26938.
 2022-06-12 04:51:50 +00:00
wowgetoffyourcellphone
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
wowgetoffyourcellphone
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
marder
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
wraitii
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
wraitii
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
Freagarach
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
vladislavbelov
9845a99f77 Adds EGL support for Wayland. 
Tested By: Freagarach, Mentula, phosit
Differential Revision: https://code.wildfiregames.com/D4642
This was SVN commit r26929.
 2022-06-09 21:09:32 +00:00
Freagarach
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
marder
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
Stan
8b57e0eeba Fix build without precompiled headers. Fixes f4128208de 
This was SVN commit r26925.
 2022-06-06 21:48:07 +00:00
Stan
12dfe2ce55 Use CVector2D instead of float arrays for TexturedLineRData 
Reviewed by: @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D4688
This was SVN commit r26924.
 2022-06-06 21:46:37 +00:00
vladislavbelov
24140bf620 Fixes crash in LOSTexture because of incorrect nullptr check introduced in 648e68e49c. 
This was SVN commit r26923.
 2022-06-06 21:21:52 +00:00
vladislavbelov
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
vladislavbelov
b0c29b8676 Removes GL types from regular renderer code after 3ed4eaf247. 
This was SVN commit r26920.
 2022-06-06 07:30:45 +00:00
vladislavbelov
54aae3e6d4 Moves anisotropic filtering support check from GL texture to TextureManager to make it explicit. 
This was SVN commit r26919.
 2022-06-06 06:59:20 +00:00
wraitii
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
wraitii
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
wraitii
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
Freagarach
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
Stan
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
Stan
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
Stan
b9adbbd8be Fix 557fa0312e by adding the js files to the list of dependencies. They were previously found under the gui folder. 
Reported by: @Langbart
Fixes #6542

This was SVN commit r26909.
 2022-05-28 17:01:42 +00:00
vladislavbelov
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
vladislavbelov
68d73e1726 Fixes double shader program reloading after dddd599146. 
This was SVN commit r26904.
 2022-05-25 17:33:54 +00:00
vladislavbelov
53033ceaa2 Fixes rendering reflections and refractions in case of empty scissors. 
This was SVN commit r26902.
 2022-05-24 19:15:26 +00:00
vladislavbelov
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
marder
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