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

18835 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
temple ee7bc3dfa0 Add a nonbuilder filter template, use on survival of the fittest 
Differential Revision: https://code.wildfiregames.com/D1385
Reviewed by: elexis
Comments by: ffffffff, smiley
This was SVN commit r21551.
 2018-03-14 22:40:46 +00:00
elexis fd3193bd7d Fix some resource collisions on random maps. 
Remove water settings on Alpine Valley, which had water in cab65bb932
but was removed in 992a8ee0b8 otherwise.

This was SVN commit r21550.
 2018-03-14 22:25:40 +00:00
mimo 1446edd771 petra: add a missing check on exhausted resource 
This was SVN commit r21549.
 2018-03-14 19:13:17 +00:00
elexis 5dac54b900 Don't exclude gaia soldiers and structures the killed entities statistics, but only animals. 
This is especially relevant for triggerscript maps with spawned gaia
units, such as Jebel Barkal, Danubius, Survival Of The Fittest.

Differential Revision: https://code.wildfiregames.com/D1384
Reviewed By: temple
Cheering By: bb, fpre, Imarok
This was SVN commit r21548.
 2018-03-14 10:46:46 +00:00
s0600204 afd69a58b3 Stop new-line characters making lines longer than they should be. 
Reviewed By: Imarok
Fixes: #3351
Differential Revision: https://code.wildfiregames.com/D1299
This was SVN commit r21546.
 2018-03-13 23:06:21 +00:00
Stan 0f86ff6e48 Add a bigger beja shield for everyunit but the pikemen 
https://github.com/0ADMods/kushites/issues/69

This was SVN commit r21545.
 2018-03-13 22:21:14 +00:00
s0600204 d17e3b5560 Finally fix typo reported in db1ec0f7f7/b4d6353a08 (3rd time lucky) 
Refs: db1ec0f7f7, b4d6353a08, aa1bb01110
Concerned: temple, Angen

This was SVN commit r21544.
 2018-03-13 22:14:39 +00:00
Stan 7d143cfd36 Add the new tower to ptol elephants as well. 
This was SVN commit r21543.
 2018-03-13 22:03:31 +00:00
bb 33340265c8 Improve the massbarter onPress scripts, by inlining stuff used only once and uninlining mapped arrays used twice 
refs #5055

This was SVN commit r21542.
 2018-03-13 21:02:13 +00:00
vladislavbelov 2bbdd145ab Little cleanup for the 9f202500ea 
This was SVN commit r21541.
 2018-03-13 20:26:30 +00:00
vladislavbelov 9f202500ea Adds maps paths and a tutorial maps tab in Atlas 
Original Patch By: Phormio
Comments By: elexis
Reviewed By: s0600204
Differential Revision: https://code.wildfiregames.com/D614
This was SVN commit r21540.
 2018-03-13 20:20:45 +00:00
s0600204 aa1bb01110 Remedy the other typo in db1ec0f7f7 identified by temple 
Refs: db1ec0f7f7, b4d6353a08
Concerned: temple

This was SVN commit r21539.
 2018-03-13 19:50:44 +00:00
mimo 059ca55040 petra: some fixes when deciding if an enemy army is a threat or not 
This was SVN commit r21538.
 2018-03-13 19:20:45 +00:00
s0600204 b4d6353a08 Remedy typo in db1ec0f7f7 identified by temple 
Refs: db1ec0f7f7
Concerned: temple

This was SVN commit r21537.
 2018-03-13 18:54:21 +00:00
bb 1b2d23ac50 Make the conquest dropdown uncheck the conquest_structures/units checkboxes, instead of trying to access a variable with 3 different names... 
Notced By Imarok

This was SVN commit r21536.
 2018-03-13 15:33:58 +00:00
bb 2746514175 Order the victory checkboxes the same way as the descriptions are noticed by elexis 
This was SVN commit r21535.
 2018-03-13 15:25:26 +00:00
Imarok 0c522edef3 Fixed swapped names in 0fd8aa2a77 
Noticed by elexis

This was SVN commit r21534.
 2018-03-13 14:55:55 +00:00
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