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

18818 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mimo df79180fa6 petra fixes to reduce cases of traffic jams on naval maps 
This was SVN commit r21533.
 2018-03-12 21:50:47 +00:00
Stan f590c6ab40 New textures, towers, and cushions for carthaginians elephants. 
Commit Authorization by: Itms
Reviewed by: Lordgood, me, the community
This was SVN commit r21532.
 2018-03-12 21:16:10 +00:00
elexis b8ca5b2033 Remove some duplication in the Jebel Barkal template loading. 
Prevent crash of the map when an odd playercount was chosen due to
primeSortPlayers returning a wrong number of elements as reported by
temple.
Remove some TODOs that likely won't be done soon and don't seem crucial.
Fix missing atlas biome rename in Aethiopia / Fields of Meroe.

This was SVN commit r21531.
 2018-03-12 14:10:00 +00:00
elexis 630341cd17 Sudd map description, refs #5040, inspired by Sundiatas explanations. 
(Preparation for string freeze while the map lies on FeXoRs currently
inaccessible harddrive.)

This was SVN commit r21529.
 2018-03-12 05:24:19 +00:00
elexis ae25564bdd Fix some wrong templates in Jebel Barkal. 
Patch By: temple
This was SVN commit r21528.
 2018-03-12 04:51:58 +00:00
elexis eee8217b45 Implement basic color editing in the options page and use it for the diplomacy colors, refs #4747, 7819ea434e. 
Update the RangeOverlay config option only when the options dialog was
closed, not each turn, refs ee5bb1fd61.

Patch By: temple
Differential Revision: https://code.wildfiregames.com/D1291
This was SVN commit r21527.
 2018-03-12 04:48:38 +00:00
elexis 9955a2f3ef Map description for Egypt by mimesot, more bushes and some but not all fixed entity owners. 
This was SVN commit r21526.
 2018-03-12 04:25:37 +00:00
elexis 1d313e7121 Map description for Jebel Barkal, based on description by Sundiata, refs #5040. 
Don't try to spawn units when there are no more spawn points.
Missing rename in 2765283b55.

This was SVN commit r21525.
 2018-03-12 03:13:49 +00:00
elexis 2765283b55 Rename Aethiopia to Fields Of Meroë as proposed by Sundiata and agreed with (-_-) aka smiley, refs #5040, D1359. 
New map description by Sundiata.

This was SVN commit r21524.
 2018-03-12 02:30:14 +00:00
elexis 8adc6d8e93 Display map biome specific preview in the replay menu and loading screen too, refs #4962. 
This was SVN commit r21523.
 2018-03-12 01:39:41 +00:00
bb 6d35fe5d2b Display all gamesetup setting is gamedescription 
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1369
fixes: #5049

This was SVN commit r21521.
 2018-03-12 00:28:41 +00:00
Imarok 0fd8aa2a77 Secure lobby authentication - prevent joins as a different player 
Reviewed by: Dunedan, elexis, Itms
Fixes #3549
Differential Revision: https://code.wildfiregames.com/D897
This was SVN commit r21520.
 2018-03-12 00:23:40 +00:00
Stan 520f70ab2c Fix elephant archers having no animations. 
Reported by: Temple
This was SVN commit r21519.
 2018-03-11 23:25:02 +00:00
temple fdc7bdb3e1 Reveal map on Napata Reconstruction 
This was SVN commit r21518.
 2018-03-11 23:14:45 +00:00
Stan 47e42199d0 Make use of the huge number of variants we have for the advanced ptol pikeman. 
They are already being used in Delenda Est and were made by
wackyserious, and committed by Enrique

This was SVN commit r21517.
 2018-03-11 23:00:22 +00:00
Stan 2595530658 New saddles, peytrals, and horse armors by Alexandermb, based on work by Enrique 
New kushites metal plates

Thread :
https://wildfiregames.com/forum/index.php?/topic/23910-task-horse-winged-peytrals-and-new-saddles-by-enrique/

This was SVN commit r21516.
 2018-03-11 22:45:24 +00:00
mimo 14c2ecbd5b petra: destroy unprotected docks about to be captured 
This was SVN commit r21515.
 2018-03-11 22:25:04 +00:00
mimo 5063d74f81 petra: take docks into account when positionning storehouses 
This was SVN commit r21514.
 2018-03-11 22:21:35 +00:00
Stan 779a58f3eb Remove historically innacurate unused kushite units. 
Discussed with: Sundiata

This was SVN commit r21513.
 2018-03-11 21:48:13 +00:00
elexis 3d410929a2 Allow biome JSON files to contain null values, refs #4954. 
Needed by the dry biome on Aethiopia, refs 78e34ea143 / D1359.
Reported By: Angen
This was SVN commit r21512.
 2018-03-11 21:45:59 +00:00
Stan d78b6bad8e Small tweaks to the nuba camp suggested by wowgetoffyourcellphone 
This was SVN commit r21511.
 2018-03-11 21:13:53 +00:00
Stan 6bd45c0c1d New nuba camp kush building set is now complete. 
https://github.com/0ADMods/kushites/issues/64
Discussed with Sundiata and Wowgetoffyourcellphone
Sketchfab soon

This was SVN commit r21510.
 2018-03-11 20:17:39 +00:00
Imarok b30db627e8 Add a loading screen tip featuring the freehand positioning feature 
Patch by OptimusShepard
Image approved by Stan
Differential Revision: https://code.wildfiregames.com/D1368
This was SVN commit r21509.
 2018-03-11 19:19:01 +00:00
Imarok 3e964b813a Address concerns of 5f0a0fbbef 
Patch by: Dunedan
Differential Revision: https://code.wildfiregames.com/D1378
This was SVN commit r21508.
 2018-03-11 18:32:17 +00:00
elexis 32e3faae76 Missing new files in 8cde469501. 
This was SVN commit r21507.
 2018-03-11 18:13:26 +00:00
elexis 8cde469501 Biome specific mappreview support and previews for Aethiopia and Gulf Of Bothnia, fixes #4962, refs #4954. 
This was SVN commit r21506.
 2018-03-11 18:11:56 +00:00
temple 6c3f93a33d Adjust resourceCarryingText position and small cleanup 
Differential Revision: https://code.wildfiregames.com/D1376
This was SVN commit r21505.
 2018-03-11 17:27:07 +00:00
elexis 78e34ea143 Add a second biome (rainy season) to the Aethiopia map. 
Patch By: smiley aka (-_-)
Differential Revision: https://code.wildfiregames.com/D1359
Refs #5040

This was SVN commit r21504.
 2018-03-11 17:09:10 +00:00
Itms 7d077ad71b Do not rely on undefined behavior in an unsupported part of the glooxwrapper, and make the code consistent with other unsupported parts. 
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D422
This was SVN commit r21503.
 2018-03-11 17:07:13 +00:00
temple dad45b60cd Have gather information take precedence over repair 
Differential Revision: https://code.wildfiregames.com/D1374
Reviewed by: mimo
This was SVN commit r21502.
 2018-03-11 17:07:12 +00:00
Itms 8124a6c76b Update libcurl for OSX, in order to fix the build. Use the opportunity to update libxml2 which had vulnerabilities. 
Refs #4362

This was SVN commit r21501.
 2018-03-11 16:44:15 +00:00
Stan d7220c3ebb Remove debug lines 
This was SVN commit r21499.
 2018-03-10 22:45:31 +00:00
Stan c9fe940401 Fix an oversight in cc67d54aeb 
Reviewed by: Itms,
Tested by: Angen,
Differential: https://code.wildfiregames.com/D1372

This was SVN commit r21498.
 2018-03-10 22:42:01 +00:00
Imarok fede6cccf1 Wheel-adjustable batch size 
Reviewed by: bb
Fixes #4767
Differential Revision: https://code.wildfiregames.com/D1034
This was SVN commit r21497.
 2018-03-10 20:15:51 +00:00
bb 88f16e5d52 properly indent json data in Multiplayer_demo 
refs 3450538ce1

This was SVN commit r21496.
 2018-03-10 19:40:18 +00:00
mimo ddd1689df5 petra: use null stance from 23bb82f930 for ship transports 
This was SVN commit r21495.
 2018-03-10 19:19:56 +00:00
mimo 23bb82f930 Add a null stance in UnitAI to be used by the AI or trigger scripts 
Reviewed By: bb
Differential Revision: https://code.wildfiregames.com/D1367
This was SVN commit r21494.
 2018-03-10 19:12:23 +00:00
elexis 391c49ab63 Fix player placement and hero rush on Jebel Barkal. 
This was SVN commit r21493.
 2018-03-10 18:46:24 +00:00
bb 3450538ce1 fix some maps missing VictoryConditions 
refs 2f763f1d87

This was SVN commit r21492.
 2018-03-10 18:10:56 +00:00
elexis c0ec4adb6f Missing file in c936824255, reported by temple, refs #5040. 
This was SVN commit r21491.
 2018-03-10 18:01:39 +00:00
elexis 108cb4b344 Fix filename -.- 
This was SVN commit r21490.
 2018-03-10 17:43:04 +00:00
temple e86e8d7ae9 Remove ResourceGatherer and trample tooltips for chariots 
Differential Revision: https://code.wildfiregames.com/D1371
Reviewed by: elexis
This was SVN commit r21489.
 2018-03-10 17:32:30 +00:00
elexis c936824255 Jebel Barkal random map, fixes #5040. 
Features:
* a mountain created in atlas, refs #4816
* a procedurally generated city, refs #5061
* scripted city guards and reoccuring gaia attackers
* attacker composition depend on the remaining buildings of the city
* random irrigation canals that indirectly increase the distance between
the two teams

Needs map description and player feedback to become complete.
Hill based on the Napata Reconstruction hill created by Skhorn of
8615acb2fc.
Consulting By: Sundiata, Skhorn
This was SVN commit r21488.
 2018-03-10 17:29:51 +00:00
temple f41452392d Cleanup skirmish replacements 
Differential Revision: https://code.wildfiregames.com/D1370
Reviewed by: bb
Comments by: elexis
This was SVN commit r21487.
 2018-03-10 17:29:02 +00:00
temple e68d99272f Fix maps after kush temple rename 
Differential Revision: https://code.wildfiregames.com/D1373
Reviewed by: elexis
Comments by: bb, mimo
This was SVN commit r21486.
 2018-03-10 17:24:58 +00:00
elexis 2ae5da09a0 CityPainter for random map scripts that fills the given area randomly with the given templates, fixes #5061, refs #5040. 
This was SVN commit r21485.
 2018-03-10 17:24:03 +00:00
elexis a3e5e0fef8 Common TriggerHelper functions to set formations on units, get the mapsize and current time, refs #5040. 
This was SVN commit r21484.
 2018-03-10 17:16:39 +00:00
Stan 8b0fd2bd0a Add new head for kush hero 
This was SVN commit r21483.
 2018-03-10 11:51:08 +00:00
Stan 2ef1c40870 Make horse crown a bit more like bronze 
This was SVN commit r21482.
 2018-03-10 11:15:24 +00:00
Stan 2d74bc4ff5 New crowns for Kushite Heroes. 
Remove a duplicate texture.

This was SVN commit r21481.
 2018-03-10 11:06:16 +00:00