mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-25 04:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,488 Commits 1 Branch 39 Tags
f0b26e95efcdebe30e86847e1cede2d3dba73b45
Commit Graph

18488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
temple f0b26e95ef Add a hotkey to toggle diplomacy colors 
Differential Revision: https://code.wildfiregames.com/D1292
Reviewed by: elexis
This was SVN commit r21173.
 2018-02-10 22:45:36 +00:00
Stan 42534b3d03 Move mushrooms out of the flora folder as they are not technically flora. 
Discussed with elexis.

This was SVN commit r21172.
 2018-02-10 16:39:26 +00:00
elexis 5ca6217796 Make Belgian Uplands a circular map and clean it's code, refs 21e284f8eb. 
Replace needlessly complicated code with a call to HeightConstraint,
stayClasses and randomPlayerLocations, refs #4805.
Do texture painting and actor placement at the impassable map border
too.
Replace another occurrence of the number of impassable tiles at the map
border, refs #4034.
Delete useless clone from 7471a0db63 since setRandomHeightmap replaces
the result.
Remove unneeded setReliefmap and operate on the target heightmap
directly.

This was SVN commit r21171.
 2018-02-10 14:13:17 +00:00
elexis f150617b2c Revert unintentionally overwritten red sea heightmap in 5acd064cb9. 
This was SVN commit r21170.
 2018-02-10 12:40:10 +00:00
mimo fd8f19a4b5 petra: cancel naval transport of builders when their target foundation has been destroyed before they are on board 
This was SVN commit r21169.
 2018-02-10 10:26:29 +00:00
s0600204 c13bc83aed Load and Initialise PlayerData in Atlas' ActorViewer 
Reviewed By: elexis
Fixes: #4900
Differential Revision: https://code.wildfiregames.com/D1276
This was SVN commit r21167.
 2018-02-09 21:49:46 +00:00
s0600204 262b27d770 Remove unnecessary argument from CSimulation2::InitGame 
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D1289
This was SVN commit r21166.
 2018-02-09 19:50:01 +00:00
elexis 29950c2d90 Ngorongoro replicate of _kali's map in a68881dd0f. 
This was SVN commit r21165.
 2018-02-09 16:34:13 +00:00
elexis 5acd064cb9 Pompeii random map script, largely based on _kalis map in c70975b116. 
The balancing problem of too much maparea being covered by impassable
mountains is worsened by the unaltered heightmap.
Players have to fight for straggler trees now.
Can be improved with a pathplacer and the custom elevationpainter used
on Caledonian Meadows.

This was SVN commit r21164.
 2018-02-09 15:35:49 +00:00
elexis 64de3ce7ac Bahrain random map, replicate of _kalis map in a68881dd0f. 
This was SVN commit r21163.
 2018-02-09 13:50:55 +00:00
elexis 06531ec645 Marmara replica of _kalis version in a68881dd0f. 
This was SVN commit r21162.
 2018-02-09 11:31:29 +00:00
elexis c1cd12787f Ratumacos / Rouen replica of _kalis map in a68881dd0f. 
Visually more appealing and more authentic heightmap, better fitting
water effect, random shallows, better playerbase alignment, circular
map.

This was SVN commit r21161.
 2018-02-09 10:17:06 +00:00
Stan 8fad0ea8ca New range icon by Lion.Kanzen 
Thread:
https://wildfiregames.com/forum/index.php?/topic/22982-committed-archery-icon/

This was SVN commit r21159.
 2018-02-08 23:16:36 +00:00
Imarok bc9e2b476e Some drag code cleanup in input.js (primary point -> vector) 
Patch by OptimusShepard
Differential Revision: https://code.wildfiregames.com/D1288
This was SVN commit r21158.
 2018-02-08 23:11:13 +00:00
elexis c45c305941 Mediterranean random map replica of _kali's map in 33e3e6c2ab, refs #5018, D957. 
This was SVN commit r21157.
 2018-02-08 22:49:08 +00:00
elexis 48fd687254 Allow using the rmgen2 random playerbase location function to only compute locations without actually placing the bases. 
Fix wrong border distance computation there in 8216bf9511.
Fix nomad units on Red Sea.

This was SVN commit r21156.
 2018-02-08 22:39:12 +00:00
elexis d613350012 Add small metal mines to biome files. 
This was SVN commit r21155.
 2018-02-08 21:59:04 +00:00
temple e4039ea5a8 Add rubble to stoas 
Add rubble to royal stoas, use 5x5 size for Sparta's foundation and
rubble.
Differential Revision: https://code.wildfiregames.com/D1290
Reviewed by: Stan
This was SVN commit r21154.
 2018-02-08 20:42:11 +00:00
mimo e92a736e79 petra: fix cases where gatherers were assigned to a resource type, even if none available 
This was SVN commit r21153.
 2018-02-08 19:48:35 +00:00
Stan ba6151f4e7 Fix capes disappearing when dying for athenians. 
This is due to the root prop point being overriden by the blood prop.

This was SVN commit r21152.
 2018-02-08 18:56:35 +00:00
mimo 75333019ef petra: fix cases where an attack would stop by not finding targets 
This was SVN commit r21151.
 2018-02-08 18:54:03 +00:00
Stan 2b0f232770 Change pyramids class on mimo's request. 
This was SVN commit r21150.
 2018-02-08 18:51:52 +00:00
mimo 56308ec1ad remove a useless (and bothering) intrusion of the gui 
This was SVN commit r21149.
 2018-02-08 18:50:18 +00:00
Stan 1c66c69aa8 Idle carry animations for athenians infantry. 
Cavalry needs some more variants so it will come afterwards.
Fix trader and healer blood.
Remove useless anims for heroes.
Remove gather praise for champions.
We do not use it anyway, but DE does.

This was SVN commit r21147.
 2018-02-07 23:29:05 +00:00
Stan c2c593d9fd Make the aura description of the catafalque more descriptive 
This was SVN commit r21146.
 2018-02-07 22:32:19 +00:00
Stan a97800ab0e Fix Kushites blood display, move the blood to the variant, and add the variant to the units missing it. 
This was SVN commit r21145.
 2018-02-07 22:13:28 +00:00
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