mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-26 08:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,462 Commits 1 Branch 39 Tags
8babdeba04b6c5a421d02f8e42daca8166aba69a
Commit Graph

18462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
temple 8babdeba04 Spawn units in rally point direction 
Differential Revision: https://code.wildfiregames.com/D1041
Reviewed by: bb
Comments by: elexis, wraitii
Fixes: #4735

This was SVN commit r21144.
 2018-02-07 20:58:07 +00:00
Stan 268c340c00 Fix incorrect line in art.json 
Found by: Leper
fixes d30643a6c9

This was SVN commit r21143.
 2018-02-07 20:50:16 +00:00
s0600204 d01cb88ac4 Calculate and return correct width in CGUI::GenerateText 
Reviewed By: bb
Differential Revision: https://code.wildfiregames.com/D836
This was SVN commit r21142.
 2018-02-07 20:47:10 +00:00
elexis cacbdf7b1a Pass Infinity to the ChainPlacer if failed tiles should be ignored, rather than different numbers above 1 that have the same effect, refs #4805. 
This was SVN commit r21141.
 2018-02-07 16:39:36 +00:00
elexis 70bec0ac90 Pass Infinity as the fail fraction to the ClumpPlacer if failed tiles should be ignored, rather than sometimes passing 100%, 400%, 1000% or 10000%, refs #4805. 
This was SVN commit r21140.
 2018-02-07 16:31:41 +00:00
mimo 5efff8941a make kush demo map consistent with others 
This was SVN commit r21139.
 2018-02-07 14:28:23 +00:00
mimo 365edbce8c petra update for kush 
This was SVN commit r21138.
 2018-02-07 14:26:45 +00:00
elexis 2e8e394521 Red Sea random map replica, based on the original map by _kali created in 33e3e6c2ab deleted in f5375cbcb9, refs #4816, #5018, D957. 
Uses an unadulterated, easily exchangeable, well compressed topography
image of the NASA Blue Marble series in the public domain,
instead of a heavily tuned and not so well licensed NASA SRTM v4.1 image
encoded in JSON.
Circular intead of a square map shape.
Randomized, height- and slope-based terrain texture painting, refs
#5004.

This was SVN commit r21135.
 2018-02-07 03:18:21 +00:00
elexis 8216bf9511 Arbitrarily constrain the random playerbase location function. 
Decrease the minimum distance between players progressively to find
suitable locations.
Assume that constraint to be constant and compute possible locations in
advance, improving performance drastically, refs #5011.

This was SVN commit r21134.
 2018-02-07 02:12:19 +00:00
elexis 6319647795 Implement JS random map library counterpart to 2180862d40 and 204b04f2d4, refs #4816, #5018. 
Refactors the heightmap and terrainmap copying code from 33e3e6c2ab and
the bicubic interpolation code from 64b1da0ddf / 93aefe0787 which were
unused since f5375cbcb9.

This was SVN commit r21133.
 2018-02-07 02:08:20 +00:00
elexis c0b493bdc4 Abstract the vertex locations on a tile in rmgen, refs #4805. 
This was SVN commit r21132.
 2018-02-06 23:30:29 +00:00
elexis 2180862d40 Implement random map script backend to read terrain PMP files created with Atlas, fixes #4816. 
Allows developers to set elevation and terrain textures in the map
editor and use that for a random map.

This was SVN commit r21131.
 2018-02-06 23:05:58 +00:00
Stan 66c48c34c1 Change seleucid spearman name to pikeman, to better reflect their function. 
This was SVN commit r21130.
 2018-02-06 22:52:56 +00:00
elexis f63cc9a1d2 Static Vector2D min and max. 
This was SVN commit r21129.
 2018-02-06 22:52:53 +00:00
Stan d30643a6c9 Artwork by: LordGood, wowgetoffyourcellphone, Stan, wackyserious, Lion.Kanzen, Sundiata, Alexandermb 
Templates: wowgetoffyourcellphone, Hannibal_Barca, elexis, mimo,
Sundiata
Maps: wowgetoffyourcellphone
History Research: Sundiata
Tested By: FeldFeld, (-_-), Grugnas, mapkoc, Dizaka, Cesar, Liberty,
Sundiata
Discussed With: Itms, niektb, WhiteTreePaladin, feneur, fabio, leper,
Pureon

This was SVN commit r21128.
 2018-02-06 22:32:04 +00:00
Stan e6f4561341 Remove another broken variant 
This was SVN commit r21127.
 2018-02-06 21:43:41 +00:00
Stan 86b698b7b8 Remove another broken variant 
This was SVN commit r21126.
 2018-02-06 21:41:48 +00:00
Stan 38193e29c6 Remove broken variant as Enrique didn't commit the files in 83680b0dee 
This was SVN commit r21125.
 2018-02-06 21:26:41 +00:00
Stan ebfa9a7495 Remove unused variant since it's missing props and is used only by Terra Magna. 
This was SVN commit r21124.
 2018-02-06 21:23:16 +00:00
Stan fa34b043cd Slightly tweak rain to be more visible, add an angled version. 
Discussed with bb_, Itms at FOSDEM,
Thanks for the maths :)

This was SVN commit r21123.
 2018-02-06 20:54:24 +00:00
bb 6b88ca6a11 Fix the autostart victoryDuration support, which was broken by 63ca7ad672 
Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D1285
This was SVN commit r21122.
 2018-02-06 19:44:05 +00:00
temple e43ed4016c Add a repair time tooltip 
Differential Revision: https://code.wildfiregames.com/D573
Reviewed by: bb
This was SVN commit r21121.
 2018-02-06 19:31:51 +00:00
Stan ab395a6b29 Add a new stonequary actor using unused dae files by merging them and cleaning. 
Add this merged dae.
Move the old daes to the old_public folder.
Add an ao texture

This was SVN commit r21120.
 2018-02-06 19:30:02 +00:00
s0600204 a9f701a475 Unify structree build queue loading duplication. 
In similar vein to c53adeaaa6

This was SVN commit r21118.
 2018-02-06 01:14:17 +00:00
Stan 68798a485f Fix stonemine file contents. 
This was SVN commit r21117.
 2018-02-05 21:54:53 +00:00
Stan abbe786e02 Clean up one of the mine template, and add missing textures for high end graphics. 
This was SVN commit r21116.
 2018-02-05 20:22:25 +00:00
elexis b41a069854 Fortress random map bugfixes and cleanup. 
Fix typo in b5b384da48 reported by mimo.
Replace magic trigonometric equation from 17fd4fab94 with a createArea
call to the polygon placer from 906c23c54b to draw the fortress texture
on an arbitrarily rotated square.
Fix wrong treasure distance in 442c9848b8.
Remove treasure self-avoidance in 208e642089, since it can result in the
treasure not being placed.

This was SVN commit r21115.
 2018-02-05 19:44:28 +00:00
mimo 232d1d9503 petra: fixes/cleanup for regicide 
This was SVN commit r21114.
 2018-02-05 17:59:00 +00:00
elexis 204b04f2d4 Allow random map scripts to load heightmap image files, fixes #5018. 
Move the atlas heightmap import code to MapIO.cpp and reuse it.
Implements what 33e3e6c2ab and 69b7f39bf1 wanted to be.

This was SVN commit r21113.
 2018-02-05 16:02:00 +00:00
elexis c95901515e Stop claiming that JPEG files are supported for heightmap import following c9cecab0be, refs #2828. 
This was SVN commit r21112.
 2018-02-05 14:22:16 +00:00
elexis 98ebb3bb77 When importing a heightmap image in atlas, don't omit the last vertex of each side of the heightmap! Fixes #5021, refs c9abf6f68c. 
(Since there are 4 vertices per tile, there is one more vertex per side
than there are tiles / pixels per side.)

This was SVN commit r21111.
 2018-02-05 14:08:46 +00:00
mimo 22903b09a6 Set victory conditions for autostart games. 
Reviewed By: elexis
Trac Tickets: #5016

Differential Revision: https://code.wildfiregames.com/D1278
This was SVN commit r21108.
 2018-02-03 19:39:33 +00:00
temple 7819ea434e Diplomacy Colors 
Add a button to toggle between normal and "diplomacy" colors.
Reviewed by: elexis
Comments by: leper, ffffffff, Stan
Fixes: #4747

This was SVN commit r21107.
 2018-02-03 14:17:31 +00:00
elexis 23820c5713 Static equality test for vectors. 
This was SVN commit r21106.
 2018-02-02 20:13:31 +00:00
mimo 47ba6b9a84 petra: some fixes for relic game mode 
This was SVN commit r21105.
 2018-02-02 18:37:29 +00:00
elexis f92405aa25 Simplify unused and bad-practice, but potentially useful AvoidTextureConstraint. 
Implement StayTextureConstraint for the same reason.
getTexture should function on the entire square tilegrid, even on
circular maps.

This was SVN commit r21104.
 2018-02-02 17:44:53 +00:00
s0600204 db1ec0f7f7 Add a couple of string manipulation functions to globalscripts. 
(And use them where appropriate.)

This was SVN commit r21101.
 2018-02-02 01:37:39 +00:00
Stan 36e42fedbf Remove dae file from actor folder. 
This was SVN commit r21100.
 2018-02-02 00:57:50 +00:00
Stan dccbfe0fcd New mushrooms for maps; 
Discussed with : elexis, Imarok, fpre
Request by : FeXoR

This was SVN commit r21099.
 2018-02-01 23:48:03 +00:00
elexis fe424f03ca Fix wrong biome JS function name following 626d89a726, refs #4954. 
Based on patch by: (-_-)
This was SVN commit r21098.
 2018-02-01 22:41:09 +00:00
Itms 4fe59c141d Fix crash at start in snd_detect(), fixes #4786. 
Reviewed By: s0600204, echotangoecho
Differential Revision: https://code.wildfiregames.com/D1254
This was SVN commit r21097.
 2018-02-01 18:12:53 +00:00
elexis b695945c59 Move other/special_treasure_* to gaia/treasure/. 
Differential Revision: https://code.wildfiregames.com/D992
Refs #4770, D989
Patch By: Nescio
Comments By: fatherbushido, leper
This was SVN commit r21096.
 2018-01-31 23:42:43 +00:00
elexis 7d451f1611 Move gaia/special_treasure_* to gaia/treasure/. 
Rename metal_persian_bigl to metal_persian_big.

Differential Revision: https://code.wildfiregames.com/D989
Refs #4770
Patch By: Nescio
Comments By: fatherbushido, leper
This was SVN commit r21095.
 2018-01-31 23:23:51 +00:00
elexis 2739c41c70 Move ruins templates from other/ to gaia/ruins/. 
Differential Revision: https://code.wildfiregames.com/D991
Based on patch by: Nescio
Refs #4770, D989
Comments By: fatherbushido, leper
This was SVN commit r21094.
 2018-01-31 22:04:17 +00:00
elexis efc50e9046 Move ruins templates to a new gaia/ruins/ subfolder. 
Remove the "special" prefix since they are not special in any way.
Delete special_ruins.xml from 40b9fc8c1e as it is identical to
special_ruins_column_doric.xml from ff3c7b46f4.

Differential Revision: https://code.wildfiregames.com/D990
Based on patch by: Nescio
Refs #4770, D989
Comments By: fatherbushido, leper
This was SVN commit r21093.
 2018-01-31 21:50:50 +00:00
elexis 9a2bf1ebfb Performance improvement on Kerala, refs #5011. 
This was SVN commit r21092.
 2018-01-31 20:46:43 +00:00
elexis f1b6aaeabc Don't place trees inside civic centers on tiny Corsica vs Sardinia. 
This was SVN commit r21091.
 2018-01-31 19:54:40 +00:00
elexis a6e4c5142a On Persian Highlands, allow players to chose the summer or spring variant in the gamesetup, refs #4954. 
Add Hannibal_Barca's biome descriptions on Gulf Of Bothnia and Persian
Highlands.

This was SVN commit r21090.
 2018-01-31 19:51:23 +00:00
elexis 7723256248 Fix obligatorily broken translation of the new map-specific biome directory structure in 626d89a726, refs #4954. 
This was SVN commit r21089.
 2018-01-31 19:47:45 +00:00
elexis 399e40d8d9 Accelerate Danubius map generation performance, from 90 seconds to 15 seconds, refs #5011. 
Use the non-deprecated createObjectGroups variants, so that one doesn't
have to do 10 million placement attempts...
Mark the area (land, water, island) and only chose random locations from
these areas using createObjectGroupsByAreas.
Don't ignore the map border for siege engine patrol points, because
AvoidClassesConstraint is very slow for large radiuses.

This was SVN commit r21088.
 2018-01-31 18:31:11 +00:00