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

22161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vladislavbelov
7f6ef5db79 Removes gui_solid material usage from CChart. 
This was SVN commit r25605.
 2021-05-30 18:13:23 +00:00
vladislavbelov
9933fe4b69 Removes gui_solid material usage from ProfileViewer. 
This was SVN commit r25604.
 2021-05-30 17:35:26 +00:00
vladislavbelov
1f192f1593 Removes low level GL code from GUI sprite rendering and switches to Canvas2D. 
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D4031
This was SVN commit r25603.
 2021-05-30 13:48:58 +00:00
Angen
c388ef64ad Add missing credits in 7e92f714ca 
This was SVN commit r25602.
 2021-05-30 10:44:48 +00:00
Angen
0d87ec5cf4 Fix and simplify areFilters functions 
Workaround is not needed anymore since 37e08a4ffb

This was SVN commit r25601.
 2021-05-30 09:32:18 +00:00
Angen
7e92f714ca [PetraAI] - Make easy difficulties of AI weaker 
This patch decreases the popScaling so that the easy AI difficulties
have lower targeted population.
And it also decreases the size & priority of the attacks from the easy
an very easy AI.

Refs: #6149
Differential revision: D3997
Patch by: @marder
Tested by: @Langbart
Comments by: @wraitii, @Freagarach
This was SVN commit r25600.
 2021-05-30 09:07:27 +00:00
vladislavbelov
d08c96be43 Uses Canvas2D for str_gui_add material in GUIRenderer. 
This was SVN commit r25598.
 2021-05-30 01:01:42 +00:00
vladislavbelov
bee5a4b3a6 Uses Canvas2D for str_gui_solid_mask material in GUIRenderer. 
This was SVN commit r25597.
 2021-05-30 00:30:55 +00:00
vladislavbelov
9e611e11f8 Uses Canvas2D for gui_basic material in GUIRenderer. 
This was SVN commit r25596.
 2021-05-29 23:41:07 +00:00
vladislavbelov
a462970707 Restores GL check for tests in TextureManager forgotten in 283f524fcf. 
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D4030
This was SVN commit r25595.
 2021-05-29 23:24:36 +00:00
vladislavbelov
7f0c4ee9ab Removes unnecessary blend state changes from GUIRenderer. 
This was SVN commit r25594.
 2021-05-29 22:48:52 +00:00
vladislavbelov
df7cabd653 Implements DrawTexture in Canvas2D. 
This was SVN commit r25593.
 2021-05-29 22:30:23 +00:00
vladislavbelov
dacbab8b02 Fixes a mistype introduced in 283f524fcf. A smaller size might cause a write to an allocated memory. 
This was SVN commit r25592.
 2021-05-29 20:07:15 +00:00
vladislavbelov
57dde8d082 Provides Canvas2D for sprite rendering. 
Differential Revision: https://code.wildfiregames.com/D4029
This was SVN commit r25591.
 2021-05-29 19:47:36 +00:00
vladislavbelov
283f524fcf Implements DrawRect in Canvas2D, removes CConsole background drawing with low level GL calls. 
This was SVN commit r25590.
 2021-05-29 12:31:14 +00:00
vladislavbelov
2f3837e0b5 Adds Canvas2D to encapsulate low level GL calls for 2D rendering. 
Implements DrawLine for charts.

Differential Revision: https://code.wildfiregames.com/D4024
This was SVN commit r25588.
 2021-05-28 16:35:57 +00:00
Imarok
6f9a162dfa CList, COList, CDropdown, CText, CInput: Draw borders above the rest and improve scrollbar drawing order 
Fixes: #6055
Differential Revision: https://code.wildfiregames.com/D4004
This was SVN commit r25587.
 2021-05-28 16:32:04 +00:00
Stan
d50ca8e8ec Slight tweak to the grass texture. 
Patch by: @marder
This was SVN commit r25586.
 2021-05-28 13:11:16 +00:00
Freagarach
3d7af82328 Improve support for classes in PetraAI. 
Let PetraAI use MatchesClassList more.

Differential revision: https://code.wildfiregames.com/D2150
Reviewed by: Angen
Comments by: Stan
This was SVN commit r25584.
 2021-05-28 06:54:48 +00:00
vladislavbelov
f7ad2daf62 Removes gui_solid material shader usages from scene rendering. 
This was SVN commit r25582.
 2021-05-27 20:13:47 +00:00
wraitii
25b9faf1cb Split graphics options in two tabs 
To allow incorporating more options, this splits the graphics settings
into two tabs, one containing general options (such as
silhouettes/windowed), and one with more advanced settings.

Accepted by: asterix
Differential Revision: https://code.wildfiregames.com/D3985
This was SVN commit r25581.
 2021-05-27 10:12:13 +00:00
Stan
f57c2f71d5 Fix map names 
Noticed by @wraitii

This was SVN commit r25580.
 2021-05-27 09:18:00 +00:00
wraitii
bd8c6b1572 Fix GetLoadedModsWIthVersions following 498f0d420b 
Accidentally broke it in 498f0d420b and didn't notice because D3968
fixes it again.

This was SVN commit r25579.
 2021-05-27 08:30:27 +00:00
vladislavbelov
b17e8f3043 Removes global g_xres and g_yres dependency from GUI objects. 
Differential Revision: https://code.wildfiregames.com/D4014
This was SVN commit r25577.
 2021-05-26 18:52:22 +00:00
Stan
bcac3bb896 Fix two issues noticed by @marder. 
Disable AO on quarried objects as its arguably broken.
Adds a second uv in case it's enabled again to prevent crashes in Atlas.
Use normal instead of parallax for the texture that do not have height
information.

This was SVN commit r25576.
 2021-05-26 15:18:25 +00:00
wraitii
18372d665c Campaign menu: reuse default map preview if available. 
Differential Revision: https://code.wildfiregames.com/D4019
This was SVN commit r25575.
 2021-05-26 14:45:44 +00:00
wraitii
81457ef952 Fix potential undefined conversion. 
Summary: Ran into this when testing things in the lobby - I'm not sure
it can happen if everything is working correctly, but I've had it
repeatedly when testing broken stuff. Feels safer.

Test Plan: ^

Differential Revision: https://code.wildfiregames.com/D4018
This was SVN commit r25574.
 2021-05-26 13:29:11 +00:00
wraitii
bce26e905f Mod selector: "start mods" saves the configuration. 
Differential Revision: https://code.wildfiregames.com/D3992
This was SVN commit r25573.
 2021-05-26 13:27:43 +00:00
vladislavbelov
8f4b3dfb16 Removes GL1 constants deprecated in GL3+ from HWDetect since they are not useful anymore. 
This was SVN commit r25571.
 2021-05-25 22:34:57 +00:00
Imarok
35601a7bb3 Fix some error in rmgen. 
Reviewed by: kalimaps
Refs: #6180
Differential Revision: https://code.wildfiregames.com/D4017
This was SVN commit r25570.
 2021-05-25 21:26:48 +00:00
vladislavbelov
cf454fe533 Removes unused BitBuf added in 5b5726ed4d. 
Bit operations can be done via std::bitset. The current implementation
is too specific to have it just for a future. Refs 479f59e386,
5ca66fc757.

This was SVN commit r25569.
 2021-05-25 19:42:06 +00:00
vladislavbelov
db9356944c Removes unused base32 encoding added in 5cc814759f. 
For modern standards base64 costs a bit less space and might be
implemented on demand. base32 usage was introduced in e0dfbe719d and
removed in 93cffe9deb.

Refs a34b759720, 317f98a6c0.

This was SVN commit r25568.
 2021-05-25 19:18:22 +00:00
vladislavbelov
38e085a8c0 Removes unused wutil command line arguments parsing added in 5383eff15c. 
We already have a single place to access arguments, so we don't need
a platform dependent place for that.

Refs 3f58951808, 8c1bd05ab9.

This was SVN commit r25567.
 2021-05-25 18:42:27 +00:00
vladislavbelov
007d30f4b4 Removes outdated user32.dll preload hack added in 7a889deca3 and became useless in bbcd9b34cc. 
Refs 4b33f49da1, b242eafd02, 56bd5b59b4.

Tested By: Angen
Differential Revision: https://code.wildfiregames.com/D4007
This was SVN commit r25566.
 2021-05-25 18:29:50 +00:00
Stan
3f371f40b1 Replace missing biomes by the closest we now have. 
Reported by:  @Freagarach
This was SVN commit r25565.
 2021-05-25 14:17:39 +00:00
Freagarach
23d7969ffd Fix city phase requirements in PetraAI HQ. 
Defence towers were removed from the requirements in 29ab4b5af3, but
PetraAI was not made aware of this.

Differential revision: https://code.wildfiregames.com/D4015
Reviewed by: @Angen, @wraitii
Comment by: @Imarok
This was SVN commit r25564.
 2021-05-25 13:46:03 +00:00
Stan
44f935562c Update mainland icons 
This was SVN commit r25563.
 2021-05-25 12:26:29 +00:00
Stan
95e576dbe3 Use new biomes for random maps, 
Patch by: @wowgetoffyourcellphone
This was SVN commit r25562.
 2021-05-25 12:25:39 +00:00
Stan
de1a10ca53 New maps using the new biomes. 
Patch by: @wowgetoffyourcellphone
- cisalpine_winter_2p
- crocodilopolis_4p
- gallic_highlands_2p
- hindu_kush_2p
- hydaspes_river_4p
- magadha_2p
- miletus_peninsula_2p
- nubian_frontier_2p
- saharan_oases_2p
- scythia_4p
- white_cliffs_of_dover_5p

This was SVN commit r25561.
 2021-05-25 12:18:40 +00:00
Stan
88d3f50f7e Update some maps with new terrains 
Patch by: @wowgetoffyourcellphone
- syria_2p
- sporades_islands_2p
- saharan_oases_4p
- butana_steppe_2p
- bactria_2p
- alpine_valleys_2p
- belgian_bog_2p

This was SVN commit r25560.
 2021-05-25 12:15:41 +00:00
Stan
20bb3ea4a3 Add trading posts and shrines as map props 
Add a placement obstructor (idea by @Grapjas) to prevent  construction
but not movement

This was SVN commit r25559.
 2021-05-25 11:32:07 +00:00
Stan
92a4fdc8e4 Add more ruin objects 
Add a new metal type of ruins
Update templates accordingly.

Patch by @wowgetoffyourcellphone

This was SVN commit r25558.
 2021-05-25 11:00:13 +00:00
Stan
c8f1501db4 Add templates for the new rock and stone mines 
This was SVN commit r25557.
 2021-05-25 10:57:22 +00:00
Stan
b6ae8915de Add more prop actors for maps 
- Update the stone and metal mine meshes and
textures/skins/gaia/decal_quarry_sahara_a.png
- Slight tweak to the steppe grass
- Add some ptol eyecandy

Templates will come in a following commit.

This was SVN commit r25556.
 2021-05-25 10:53:20 +00:00
Stan
ac33c8513b More grass types for biomes 
Patch by @wowgetoffyourcellphone

This was SVN commit r25555.
 2021-05-25 10:44:19 +00:00
Stan
63199dac2d Some tweaks to the grass fields. 
This was SVN commit r25554.
 2021-05-25 10:40:39 +00:00
Stan
47fc344567 Update the resource icons. 
Patch by @wowgetoffyourcellphone.

This was SVN commit r25553.
 2021-05-25 10:21:52 +00:00
Stan
463775faa4 Slight tweaks to particles. 
This was SVN commit r25552.
 2021-05-25 10:07:04 +00:00
Stan
6324f3369a Use correct projectiles for artillery. 
Patch by @wowgetoffyourcellphone

This was SVN commit r25551.
 2021-05-25 10:06:34 +00:00
Stan
b3aa84adea New shark and whale icons. update the berry an tree and artic wolf icons. 
This was SVN commit r25550.
 2021-05-25 09:24:23 +00:00