Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
22,503 Commits 8 Branches 28 Tags 13 GiB
b3a6a1e6e5
Commit Graph

22503 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stan
7e0a42c87d Delete broken assets reported here https://wildfiregames.com/forum/topic/49785-building-a-64-bit-pyrogenesis-and-deps-for-windows/?do=findComment&comment=452589 
This was SVN commit r26061.
 2021-12-12 20:41:54 +00:00
Stan
e851fc019b Remove duplicate iber_struct.dds 
Fixes #6326

This was SVN commit r26060.
 2021-12-12 20:04:07 +00:00
Stan
0dd3bcc8e7 Remove duplicate dds textures for desert_forestfloor_palms.dds, kart_trireme.dds, tree_cypress_a.dds, farming_wheat_harvest_b.dds, road_roman.dds, celt_caratacos.dds, rome_ijv_e.dds, hele_trireme.dds, iber_sail_b.dds, kart_sail_1.dds, kart_sail_2.dds, kart_sail_3.dds. 
Refs #6326

This was SVN commit r26059.
 2021-12-12 19:15:40 +00:00
Stan
846b8154c2 Remove duplicate celt_prop_1 texture. 
Refs #6326

This was SVN commit r26058.
 2021-12-12 18:08:17 +00:00
Stan
09c39d710f Remove duplicate textures. 
Refs #6326

This was SVN commit r26057.
 2021-12-12 16:56:40 +00:00
Stan
b7cf30fce5 Fix Windows 11 Detection 
Comments by: @vladislavbelov, @Freagarach
Differential Revision: https://code.wildfiregames.com/D4337
This was SVN commit r26056.
 2021-12-12 16:08:09 +00:00
Stan
5b6bb1cd89 Fix Alt Tab on Windows for SDL > 2.0.12 
Comments by: @vladislavbelov,  @Freagarach
Differential Revision: https://code.wildfiregames.com/D4359
This was SVN commit r26055.
 2021-12-12 16:01:30 +00:00
Stan
c80da0cd3c Remove duplicate texture hele_struct_b 
- Use the correct material, as texture has no alpha, therefore no player
color
- Add missing textures where necessary
- Use null_white for hele_blacksmith_bucket_water instead of loading
useless textures.

Refs: #6326

This was SVN commit r26054.
 2021-12-12 15:43:50 +00:00
Angen
a43ff8b088 Fix not used SIEGE_NO_TRAINER 
In 2f24006afb, the siege state for no trainer was not assigned to
variable but used in condition.
Making use of that state actually.

Differential revision: D4367
Patch by: @JCWasmx86
This was SVN commit r26053.
 2021-12-12 12:19:11 +00:00
vladislavbelov
5e61febf16 Resolves concerns from e4907bdb6e. Fixes #6395 
Tested By: Langbart, nwtour
Differential Revision: https://code.wildfiregames.com/D4370
This was SVN commit r26051.
 2021-12-10 21:29:40 +00:00
vladislavbelov
9cb6e4c105 Cleanups Font and FontManager a little. 
This was SVN commit r26050.
 2021-12-10 16:59:32 +00:00
vladislavbelov
dfe165d6c2 Fixes unused m_Simulation after b991ef919b. 
This was SVN commit r26046.
 2021-12-09 18:07:10 +00:00
vladislavbelov
fe81a6eec7 Refactors WaterManager to remove duplication of the current texture index calculation. Removes unused m_WaterCurrentTex from f2cae8cb9b. 
This was SVN commit r26045.
 2021-12-09 18:01:28 +00:00
Freagarach
1dfa8140a9 Fix infinite loop when queuing a gather order after garrison. 
There was an infinite loop:
Order.Gather -> MustKill (L497) -> PushOrderFront(Attack) (L526) ->
NotInRange (L410) -> NotAbleToMove, thus finish order (L426/427) ->
Restart from Order.Gather.

We do two things here:
- Assume we don't have vision when garrisoned, which is not a bad
assumption.
- Check the range and if we are not able to move and not in range,
finish the order.

Introduced in: d3c3072c83
Reported by: @Langbart
Differential revision: https://code.wildfiregames.com/D4349
Fixes: #6377
Tested by: @Langbart
Comments by: @Silier, @Stan
This was SVN commit r26044.
 2021-12-09 16:35:03 +00:00
Freagarach
695ce382ec Fix Trainer/Researcher without entities/techs. 
It was explicitly allowed in 0c4f59d0a7, but not all references to
`this.template` were properly checked.

Noticed by: @nwtour
Differential revision: https://code.wildfiregames.com/D4357
Tested by: @nwtour
Comments by: @Stan
This was SVN commit r26043.
 2021-12-09 16:22:52 +00:00
Freagarach
a53405f697 Fix PetraAI after 5d3902498f. 
In 5d3902498f there was a wrong substitution.
`AttackManager` -> `AttackPlan` for the attack types.

Patch by: @JCWasmx86
Differential revision: https://code.wildfiregames.com/D4369
Reviewed by: @Silier
Tested by: @nwtour
This was SVN commit r26041.
 2021-12-09 05:47:29 +00:00
vladislavbelov
fe511e88d9 Adds FreeType support to the engine. 
Tested By: Langbart, Imarok, Stan, s0600204, wraitii
Differential Revision: https://code.wildfiregames.com/D4108
This was SVN commit r26040.
 2021-12-08 22:14:43 +00:00
vladislavbelov
04476bf29f Normalizes AO textures according to b53c454e3e via P259. 
Differential Revision: https://code.wildfiregames.com/D4361
This was SVN commit r26039.
 2021-12-08 18:35:23 +00:00
vladislavbelov
b53c454e3e Removes AO multiplier as a duplicate way to adjust AO, makes it closer to PBR. 
Differential Revision: https://code.wildfiregames.com/D4361
This was SVN commit r26038.
 2021-12-08 18:28:42 +00:00
wackyserious
22a21e4bd9 Update: Celtic Unit Actor File 
-Sword sheath position switch
-Make heroes look more historically accurate
-New hero textures (Caradoc and Boudicca)

Reviewed by: Genava55, wowgetoffyourcellphone and other community
members

This was SVN commit r26037.
 2021-12-08 08:26:31 +00:00
vladislavbelov
90f27d4909 Adds console toggle hotkeys to the console welcome message. 
Patch By: nwtour
Differential Revision: https://code.wildfiregames.com/D4347
This was SVN commit r26035.
 2021-12-07 20:09:46 +00:00
Freagarach
5ceeac3dd5 Use correct tooltip stye for the civ icon. 
Introduced in 18a97cc82a.

Patch by: @Langbart
Differential revision: https://code.wildfiregames.com/D4341
Fixes: #6378
Comment by: @vladislavbelov
This was SVN commit r26033.
 2021-12-06 07:22:12 +00:00
vladislavbelov
e4907bdb6e Forces GL 2.1 core context creation in VideoMode. 
This was SVN commit r26031.
 2021-12-04 22:01:20 +00:00
vladislavbelov
670f5f9a40 Adds more flexible dependencies to options. 
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D4354
This was SVN commit r26030.
 2021-12-04 20:09:53 +00:00
Freagarach
5d3902498f [PetraAI] - Use enum-like variables instead of magic values. -- [1] 
Improved readability. Easier find-and-replace.

This commit is focused on:
- BaseManager
- AttackPlan
- GarrisonManager

Patch by: @JCWasmx86
Differential revision: https://code.wildfiregames.com/D4334
Refs. #6256
Comments by: @Silier, @Stan
This was SVN commit r26029.
 2021-12-04 08:47:05 +00:00
vladislavbelov
5a7aa37cd1 Fixes without PCH build after af567560b8. 
Reported By: Freagarach
This was SVN commit r26026.
 2021-11-30 18:03:39 +00:00
vladislavbelov
a591e5aa69 Removes unused/not implemented hooks from AppHooks. Refs f947fa6afe. 
This was SVN commit r26024.
 2021-11-29 18:21:49 +00:00
vladislavbelov
af567560b8 Drops custom utf16 string implementation (from cdd3317ded), uses C++11 one. 
Patch By: sera
Differential Revision: https://code.wildfiregames.com/D4223
This was SVN commit r26023.
 2021-11-29 12:10:41 +00:00
vladislavbelov
e1374252b7 Removes direct access to shaders, leaves only techniques. 
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D4353
This was SVN commit r26020.
 2021-11-27 15:01:14 +00:00
vladislavbelov
4c26a2d11f Adds disabled sprites to slider. 
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D4355
This was SVN commit r26019.
 2021-11-27 13:37:05 +00:00
vladislavbelov
c0e0d620eb Draws fancy water and its shore waves only for GLSL shaders. 
This was SVN commit r26017.
 2021-11-26 21:47:04 +00:00
Freagarach
fcd10be509 Fix Researchers' GUI without a tech cost multiplier. 
This was SVN commit r26016.
 2021-11-26 20:53:14 +00:00
Freagarach
8d80a2186e Some fixes after the ProductionQueue split. 
0c4f59d0a7 / 8475c16c31 introduced a serialisation error (#6391).
Also the templates and the code could be improved.

Differential revision: https://code.wildfiregames.com/D4352
Comments by: @Silier, @Stan
Fixes: #6391

This was SVN commit r26015.
 2021-11-26 17:12:26 +00:00
vladislavbelov
809e3ed0bd Removes rand function usage from tests to avoid non-uniform distributions. 
This was SVN commit r26012.
 2021-11-25 17:57:59 +00:00
vladislavbelov
6efa293fd1 Reduces number of allocations during GPU profiler processing for Intel queries. 
This was SVN commit r26011.
 2021-11-25 17:33:17 +00:00
vladislavbelov
265a2246f0 Removes unused fnv_lc_hash, also file paths case sensitive so we can't use the function. 
This was SVN commit r26010.
 2021-11-25 16:58:04 +00:00
vladislavbelov
25ce179cbc Adds collision test for fnv_hash, removes unused include forgotten in b4a33851e6. 
This was SVN commit r26007.
 2021-11-21 11:59:02 +00:00
Freagarach
ab01a2d2fc Fix replay folders with special characters. 
Implemented in e7ab22286e, broken in cb346e207b.

Patch by: @Langbart
Help by: @elexis
Differential revision: https://code.wildfiregames.com/D4345
Fixes: #6373
Reviewed by: @vladislavbelov
Tested by: @Freagarach
This was SVN commit r26005.
 2021-11-19 11:34:26 +00:00
Freagarach
a16ecf0f62 Missing tileclass in archipelago / fix fish on land. 
This would cause fishes to be spawned on land under a specific set of
conditions. Cases where the concerned land is not painted clPlayer for
example (which fish also avoids).
Added by @marder: spacing of the forest and wood amount was corrected as
the above ^ pushed the wood away from the player.

Original patch by: @smiley
Additional changes by: @marder
Differential revision: https://code.wildfiregames.com/D1729
Comments by: @elexis
Tested by: @Freagarach
Fixes: #5797
Refs. #3746

This was SVN commit r26003.
 2021-11-17 07:20:18 +00:00
vladislavbelov
9b3dcd2610 Slightly improves minimap flares, makes animation more smooth via alpha fade in/out. 
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D4351
This was SVN commit r26001.
 2021-11-16 16:58:32 +00:00
Freagarach
0c4f59d0a7 Split tasks from ProductionQueue. 
The task of the production queue should first and foremost be that; a
queue for production items.
Hence, the specifics of training/researching are delegated to specific
components.

As a side effect, this improves the test coverage and fixes:
- Resource not refunding when hitting the entity limit. Introduced in
b8758c8941.
- Autoqueue changing when unable to spawn. Introduced in 956b3f96db.

Modders can change their templates using
https://code.wildfiregames.com/P256.

Differential revision: https://code.wildfiregames.com/D4333
Fixes: #6363
Comments by: @Silier
Refs. #6364

This was SVN commit r26000.
 2021-11-16 07:08:39 +00:00
vladislavbelov
b5d85e279f Removes border pixels drawing of the minimap texture with scissors after b991ef919b. Fixes #6382 
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D4350
This was SVN commit r25997.
 2021-11-14 16:51:39 +00:00
vladislavbelov
d1a7aa2858 Adds alpha and custom options to render debug modes. 
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D4346
This was SVN commit r25996.
 2021-11-14 08:33:59 +00:00
Angen
59a13f97be Show the correct message when exiting the multiplayer match as a client 
Forgotten change in: 3ab25cbd95
Reported by: @bb
Differential revision: D4330
Patch by: @Schweini
This was SVN commit r25995.
 2021-11-13 12:26:48 +00:00
vladislavbelov
b991ef919b Moves MiniMap texture rendering to a separate framebuffer to update it less frequently. 
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D4331
This was SVN commit r25993.
 2021-11-12 19:15:48 +00:00
vladislavbelov
36eb92f9a4 Adds render debug modes. 
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D4311
This was SVN commit r25992.
 2021-11-12 11:22:18 +00:00
Angen
dc361048aa Fix a1010b83d3 and 8f8996e338 
Fix wrong renaming done in a1010b83d3
Fix missed structure change in 453fe486de

Reported by: SciGuy42 on forum
https://wildfiregames.com/forum/topic/62269-onrange-triggers-in-a25/
Tested by: SciGuy42
Differential revision: D4335
This was SVN commit r25989.
 2021-11-06 11:07:28 +00:00
bb
c1cd28c878 Also do a postMove update when the average speed over last turn isn't zero 
Reviewed By: Freagarach
Differential Revision: D4302
refs acc780bcbb

This was SVN commit r25985.
 2021-10-31 17:21:04 +00:00
Freagarach
f0c708be41 Ceil the required XP in the GUI. 
344d1cc837 introduced a tech that percentually increased the required XP
for archers, showing a decimal value.
This rounds that up, for 150/150 without being promoted looks bad as
well.

Patch by: @Langbart
Differential revision: https://code.wildfiregames.com/D4322
Reviewed by: @Angen
This was SVN commit r25984.
 2021-10-31 07:00:39 +00:00
vladislavbelov
4bae03c6c8 Enables GL_TEXTURE_2D always since we don't support FPP anymore. 
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D4327
This was SVN commit r25982.
 2021-10-30 14:34:20 +00:00