mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-27 22:12:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,648 Commits 1 Branch 39 Tags
1b525c191769008abc27cc1fe5420438132de110
Commit Graph

18648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mimo 1b525c1917 Small floating debris should not block ship movement. 
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1329
This was SVN commit r21349.
 2018-02-24 10:52:04 +00:00
mimo 3b26e8fac3 Decrease a bit the clearance of fishing ships (from 4 to 3). 
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1330
This was SVN commit r21348.
 2018-02-24 10:48:48 +00:00
Stan db080f7f22 Fix some templates errors introduced by the recent camel renaming. 
This was SVN commit r21347.
 2018-02-24 10:48:46 +00:00
mimo b11ff0df68 petra: fix oversight in 5a2b3d3d5d 
This was SVN commit r21346.
 2018-02-24 10:41:59 +00:00
elexis 7c7d74cf2e Fix missing right-alignment of lobby icon in the summary screen following 228399f913, refs #4106. 
This was SVN commit r21345.
 2018-02-24 10:26:44 +00:00
temple 4eb9582e63 Town bell - use matching classes, add a market alert 
Replace the alert level with matching classes.
Women respond to bells at the civic center, farmstead, and storehouse.
Trade carts respond to the bell at the market.
Allow garrisoning in allied buildings.
Adapt the GUI to the new behavior.

Differential Revision: https://code.wildfiregames.com/D937
Reviewed by: causative
This was SVN commit r21343.
 2018-02-24 04:35:26 +00:00
temple ee23f7adb1 Tweaks to Via Augusta 
Change the angles of civic centers and convert tree actors into trees.
Differential Revision: https://code.wildfiregames.com/D1328
Reviewed by: elexis
This was SVN commit r21342.
 2018-02-24 02:06:17 +00:00
elexis c69b5688bc Revert 8684e06ce0 / D1083 since the translated strings are only accessible while the public mod is enabled. 
Reported By: leper
Reviewed By: Vladislav
Alternatively one might consider mod label and description translations
contained in the mod.json.

This was SVN commit r21341.
 2018-02-24 00:33:30 +00:00
s0600204 1d0700c3cb Reduce duplication in code compiling template lists in Reference Suite 
Also supports having initial start entity templates not in the usual
`simulation/templates/{structures|units}` folders

This was SVN commit r21340.
 2018-02-23 22:04:45 +00:00
s0600204 760a47335d Add buttons for changing between, and hotkeys for opening, the civinfo and structree 
Patch by: fpre
Reviewed By: s0600204
Fixes: #4970
Differential Revision: https://code.wildfiregames.com/D846
This was SVN commit r21339.
 2018-02-23 20:54:28 +00:00
bb 70172519b7 Use a macro for creating checkboxes in the Atlas map panel (other panels code checkboxes in a different way) 
Agreed With: elexis

This was SVN commit r21338.
 2018-02-23 20:47:46 +00:00
bb 0ace1b44b2 Learn males chopped wood is not a weapon to fight with. 
Use correct variants in animations form UnitAI.

Patch By: wraitii
Reviewed By: temple
Differential Revision: https://code.wildfiregames.com/D1239
fixes #4932

This was SVN commit r21337.
 2018-02-23 20:20:57 +00:00
Imarok c894eeb856 Fix debug mode after d5807cd59f 
Reviewed by: temple
Differential Revision: https://code.wildfiregames.com/D1315
This was SVN commit r21336.
 2018-02-23 20:17:47 +00:00
bb c0349931c0 Update the animation immediately after a varaint is changed, so we don't have sliding issues when we do so. 
Differential Revision: https://code.wildfiregames.com/D1322
Reviewed By: temple
This was SVN commit r21335.
 2018-02-23 20:11:16 +00:00
elexis 7908045272 Add desert bush variant which was used in cc3d9de386 but became unused by 4d40c8dc7d. 
The elephantine map from 4c979d8e38 used it already, reported by Angen.
Use these berries for the desert and savanna random biomes and Sahel.

This was SVN commit r21334.
 2018-02-23 15:02:05 +00:00
elexis 51194c2eca Fix bloom on Persian Highlands following a6e4c5142a, refs #4766, #4954. 
This was SVN commit r21333.
 2018-02-23 14:55:15 +00:00
elexis e1d2d3e723 Update credits. 
This was SVN commit r21332.
 2018-02-23 13:19:57 +00:00
elexis 4c979d8e38 Elephantine random map script, refs #5040. 
Uses OpenStreetMap polygons for the shape of the water, refs #5018.

Proposed by: Sundiata, wowgetoffyourcellphone
This was SVN commit r21330.
 2018-02-23 05:41:35 +00:00
elexis dca8a68559 Change the RandomObject prototype to pick a different template upon each placement, making it much more useful. 
This was SVN commit r21329.
 2018-02-23 01:43:49 +00:00
Stan 07419b5ab1 Fix typo, that didn't break the game for some reason. 
This was SVN commit r21328.
 2018-02-22 21:04:45 +00:00
bb b2c923800f Fix linting issues in 9571c56d7e and ac7b5ce861 noticed by Imarok 
This was SVN commit r21327.
 2018-02-22 20:50:15 +00:00
Stan 1e42ab5548 New camels 
Models, Anims and textures by Alexandermb and Wackyserious
Thread:
https://wildfiregames.com/forum/index.php?/topic/23596-task-update-camel-units/&page=7

This was SVN commit r21326.
 2018-02-22 20:41:50 +00:00
s0600204 46114e00c8 Pass appropriate techcode to Template Viewer when clicking on one of a tech-pair in the session gui 
(Instead of the content of the tech-pair's pairing tech)

Reported by: wowgetoffyourcellphone
Report: https://wildfiregames.com/forum/index.php?/topic/24027-viewer/

Refs: https://code.wildfiregames.com/D297

This was SVN commit r21325.
 2018-02-22 20:22:45 +00:00
mimo fd14419bc0 petra: fix an index access + some cleanup 
This was SVN commit r21324.
 2018-02-22 18:42:45 +00:00
Stan b38cf55ff5 Cleanup materials, remove comments, and tweak requires. 
Reviewed By: Vladislav
Differential Revision: ​https://code.wildfiregames.com/D94
This was SVN commit r21323.
 2018-02-22 18:26:04 +00:00
mimo 6111f0b6cd cleanup temple_mars tooltip 
This was SVN commit r21322.
 2018-02-22 18:19:26 +00:00
mimo 187ad553f2 Increase vision range of fishing boats from 24 to 30 
Reviewed By: elexis, Stan
Differential Revision: https://code.wildfiregames.com/D1320
This was SVN commit r21321.
 2018-02-22 18:14:12 +00:00
temple 47750d788b Don't use "all" in ranged aura strings 
Differential Revision: https://code.wildfiregames.com/D1321
Reviewed by: elexis
This was SVN commit r21320.
 2018-02-22 17:57:56 +00:00
temple 3b3d86fe71 Add a diplomacy colors button to the diplomacy window 
Differential Revision: https://code.wildfiregames.com/D1318
Reviewed by: elexis
This was SVN commit r21319.
 2018-02-22 17:30:46 +00:00
mimo 7d872eaebb petra tweaks for temples 
This was SVN commit r21318.
 2018-02-22 17:09:48 +00:00
temple de9427a291 Bump year 
This was SVN commit r21316.
 2018-02-21 23:42:18 +00:00
Stan 8f99a77c77 Tweak Kushites as asked there for AI compatibility c71b521dad 
Transform the camps in embassies
Remove special class
Rename the mercs
Remove the more explicit camelry name

This was SVN commit r21315.
 2018-02-21 23:36:26 +00:00
Stan b573bbc63c Remove animal props from the camp not to confuse players. 
This was SVN commit r21314.
 2018-02-21 23:02:07 +00:00
Imarok 02ed411e6f Fix comments and year in d5807cd59f and 01f581e813 
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D1314
This was SVN commit r21313.
 2018-02-21 22:53:01 +00:00
temple 4fc87ced78 Grid bounds and SinkRate debug version fixes 
Differential Revision: https://code.wildfiregames.com/D1209
Patch by: Angen
Reviewed by: wraitii
Comments by: Itms, Stan
This was SVN commit r21312.
 2018-02-21 22:30:54 +00:00
vladislavbelov b6b547d5f8 Adds remember password checkbox 
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D822
This was SVN commit r21311.
 2018-02-21 22:01:03 +00:00
s0600204 c8fda40b02 Implement an in-game Template Details Viewer 
Right-click on icons of units, structures, technologies, flora, fauna,
etc. and view additional details.


Reviewed By: elexis
Fixes: #3212
Differential Revision: https://code.wildfiregames.com/D297
This was SVN commit r21310.
 2018-02-21 21:39:00 +00:00
s0600204 b94aff0955 Remove a couple of empty/nonsense History strings that have crept in 
Refs: D297, #3212, b80a255a0a

This was SVN commit r21309.
 2018-02-21 21:26:36 +00:00
temple 18149d9033 Adjust some footprints and obstructions to better handle spawning 
Differential Revision: https://code.wildfiregames.com/D1302
Reviewed by: bb
This was SVN commit r21308.
 2018-02-21 20:05:41 +00:00
temple 6ea532298e Add a countdown timer to the research progress panel 
Suggested by: fpre/ffffffff
Reviewed by: elexis, ffffffff
Comments by: vladislavbelov
This was SVN commit r21307.
 2018-02-21 19:56:37 +00:00
temple f397f7236c Remove phalanx formation from templates of units that don't use it 
Differential Revision: https://code.wildfiregames.com/D1313
Reviewed by: Stan
This was SVN commit r21306.
 2018-02-21 19:40:27 +00:00
elexis e497672a9c Bump copyright header year numbers. 
This was SVN commit r21305.
 2018-02-21 18:44:52 +00:00
elexis 9691d8da1c Fix missing rmgen-common import in Schwarzwald, fixes #5043. 
This was SVN commit r21304.
 2018-02-21 18:12:21 +00:00
mimo 1ceb612041 Allows the AI to go backToWork instead of restarting a new trade route each time 
Differential Revision: https://code.wildfiregames.com/D1312
This was SVN commit r21303.
 2018-02-21 17:37:52 +00:00
mimo 5b55a7d3f1 petra tuning of barter 
This was SVN commit r21302.
 2018-02-21 17:31:52 +00:00
Imarok eca956a513 Check lobby games for incompatible mods 
Reviewed by: elexis
Fixes #3370
Differential Revision: https://code.wildfiregames.com/D931
This was SVN commit r21301.
 2018-02-21 17:27:33 +00:00
elexis 774a626bb9 Ambush bluffs rework. 
Remove ugly large circle patterns around the playerbase on Ambush, fixes
#4993.
To ensure passability, create ramps from the playerbase to the bluffs.

Change the circular player avoidance to a ChainPlacer generating more
heterogenous pattern.
Use vectors in rmgen2 bluffs creation and simplify equations, refs
#4992.
Don't turn inaccessible bluffs to plateaus but don't place them until it
is certain they are passable.

Increase minimum distance from the playerbase to the mapcenter by
picking different distance values per playerbase pattern in
g_PlayerbaseTypes.
Attempt to improve bluffs performance by avoiding bluffIgnore by 0
instead of bluff by 12, refs #5011.
Implement AdjacentToAreaConstraint and deleteTerrainEntity.
Delete createBoundingBox and use getBoundingBox, refs #4947, #4805.
Delete fadeToGround and nextToFeature and use conventional createArea
calls with the SmoothingPainter of 02fe3ef3e3, refs #5027.
Paint bluff cliffs slightly more accurately using the SlopeConstraint
from 24388f781e, refs #5004.

This was SVN commit r21300.
 2018-02-21 16:49:05 +00:00
mimo 5a2b3d3d5d petra: reduce the traffic jams of ships 
This was SVN commit r21299.
 2018-02-21 15:47:28 +00:00
mimo 995ad12ead petra: add missing protection 
This was SVN commit r21298.
 2018-02-21 15:39:20 +00:00
elexis 1d99a5e2aa Print number of terrain entities and textures after generating the random map. 
Remove two unused variables and simplify SmoothElevationPainter
following previous commit.

This was SVN commit r21297.
 2018-02-21 11:10:42 +00:00