1
0
forked from 0ad/0ad
Commit Graph

18895 Commits

Author SHA1 Message Date
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
32e3faae76 Missing new files in 8cde469501.
This was SVN commit r21507.
2018-03-11 18:13:26 +00:00
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
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
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
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
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
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
d7220c3ebb Remove debug lines
This was SVN commit r21499.
2018-03-10 22:45:31 +00:00
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
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
ddd1689df5 petra: use null stance from 23bb82f930 for ship transports
This was SVN commit r21495.
2018-03-10 19:19:56 +00:00
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
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
c0ec4adb6f Missing file in c936824255, reported by temple, refs #5040.
This was SVN commit r21491.
2018-03-10 18:01:39 +00:00
108cb4b344 Fix filename -.-
This was SVN commit r21490.
2018-03-10 17:43:04 +00:00
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
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
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
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
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
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
8b0fd2bd0a Add new head for kush hero
This was SVN commit r21483.
2018-03-10 11:51:08 +00:00
2ef1c40870 Make horse crown a bit more like bronze
This was SVN commit r21482.
2018-03-10 11:15:24 +00:00
2d74bc4ff5 New crowns for Kushite Heroes.
Remove a duplicate texture.

This was SVN commit r21481.
2018-03-10 11:06:16 +00:00
cc67d54aeb Fix compiler warnings on VS 2015, refs #3439, refs #5069.
Patch By: Stan
Reviewed By: Itms, vladislavbelov
Differential Revision: https://code.wildfiregames.com/D1262
This was SVN commit r21480.
2018-03-10 09:58:53 +00:00
62c29bd809 Fix OOS on rejoin by cloning in Mirage
Differential Revision: https://code.wildfiregames.com/D1325
Reviewed by: elexis, bb
Fixes: #5048

This was SVN commit r21478.
2018-03-10 00:44:32 +00:00
a86b7b491d Kushite tweaks and balancing
Add an anti-champ/hero bonus to Meriotic Temple Guards.
Make the Temple of Amun a unique building available in the City phase.
Adjust some auras and add one for cheaper triremes.
Nerf clubman attack, remove spearmen tweaks.
Change barracks cost.
Fix some icons.

Differential Revision: https://code.wildfiregames.com/D1343
Patch by: Hannibal_Barca
Comments by: Nescio, Grugnas, elexis, Sundiata, mimo
This was SVN commit r21477.
2018-03-10 00:35:26 +00:00
0e710d716d Fixes the Alt + Tab crash in the fullscreen mode. Refs #4181.
Patch By: Angen
Comments By: echotangoecho, Imarok, Stan
Reviewed By: vladislavbelov
Trac Tickets: #4181
Differential Revision: https://code.wildfiregames.com/D1212
This was SVN commit r21476.
2018-03-09 22:23:03 +00:00
bb
2f763f1d87 Transfrom in all skirmisch and scenario maps the "GameType" string into a "VictoryConditions" array, so they are compatible with the combine victory commit
The same change should be done in all maps in mods

refs #4014
refs D1240

This was SVN commit r21475.
2018-03-09 21:56:51 +00:00
bb
6d54ab4c1f Implement combine victory conditions
Excluding the changes to scenario and skirmisch maps
Transform gameType string to victoryCondition array in load/replaymenu
Adapt the gamesetup to use checkboxes for every victory condition and an
array for storing them
Allow multiple queries in conquestCommon
Remove conquest from regicide, wonder and capture the relic
Move the endless gamedescription from settings to gamedescription
Fixing wrong tabulation from a8a29271ce

This commit will break all scenario and skirmisch maps, their "Gametype"
string needs to be transformed in a "VictoryCondition" array as is done
in the tutorial map (counting endless as an empty array). This counts
for mods too!
Old svn replays and savegame will throw warnings/errors as they are
incompatible after this commit. So svn users will need to delete all
those.

Comments on ai and autostart games By: mimo
Comments on Atlas By: Vladislav
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1240
fixes: #4014

This was SVN commit r21474.
2018-03-09 21:51:18 +00:00
b9a53529b9 Remove war dog slaughter attack
Differential Revision: https://code.wildfiregames.com/D1363
Reviewed by: elexis
Comments by: bb
This was SVN commit r21473.
2018-03-09 19:51:11 +00:00
edf91718b5 Refactor distributePointsOnCircle into distributePointsOnCircularSegment, refs #5061.
This was SVN commit r21472.
2018-03-09 09:39:53 +00:00
595edeaa2f Sound and Target Marker for freehand positioning of units
Patch by OptimusShepard
Refs #5060
Differential Revision: https://code.wildfiregames.com/D1352
This was SVN commit r21471.
2018-03-08 23:17:47 +00:00
48e861724d petra: be less restrictive for building a cc in islands with a dock
This was SVN commit r21470.
2018-03-08 21:17:39 +00:00
20a0df4ae2 petra: fixes in choice of best defenders when several islands + some cleanups
This was SVN commit r21469.
2018-03-08 21:09:31 +00:00
56b8fe31fd Disable speed bonus for formations
Differential Revision: https://code.wildfiregames.com/D1360
Patch by: Angen
This was SVN commit r21468.
2018-03-08 19:36:32 +00:00
12633bdaa8 Adjust melee and slaughter max range to better match animations
Differential Revision: https://code.wildfiregames.com/D988
Patch by: Grugnas
This was SVN commit r21467.
2018-03-08 19:11:34 +00:00
8ae6c448ee Fix the two incorrect replacements in b5c43fc5f9, refs #4950.
This was SVN commit r21466.
2018-03-08 19:00:04 +00:00
734ca44533 On Danubius, send soldier attack commands last, so that observers follow these units rather than the ships after the ungarrisoning.
Since healers can't attack enemies, they have left the gaia attacker
group immediately to start patroling.
To fix that, change healers to guard random soldiers of that group,
preferably heroes or champions.
Use absolute formation template paths.

This was SVN commit r21465.
2018-03-08 14:15:03 +00:00
147ef2b892 Allow observers to follow gaia commands on triggerscript maps.
This was SVN commit r21464.
2018-03-08 14:10:45 +00:00
adb84c50fb Fix oversight in 14da2f841f.
This was SVN commit r21463.
2018-03-08 14:06:41 +00:00
a14b351e87 Add a more detailed tooltip to the mainmenu lobby button
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D1358
This was SVN commit r21462.
2018-03-07 19:16:14 +00:00
212b74f7e5 petra: make the ai able to build docks in islands in which it has no cc, and use them for trade.
This was SVN commit r21461.
2018-03-07 18:45:16 +00:00
061371da92 more petra cleanup following eslint
This was SVN commit r21460.
2018-03-07 18:41:39 +00:00
14da2f841f TriggerHelper functions to retrieve entities by player and by class.
Removes repetitive RangeManager and Identity component querying from
triggerscripts.
It means that mostly map specific logic remains in the triggerscript.
This should bring TriggerScript coding a bit closer to map authors who
aren't exactly software developers.
Call the RangeManager entity getters on Danubius and Survival multiple
times on init to further simplify code, as these microseconds on init
are irrelevant.

This was SVN commit r21459.
2018-03-07 13:54:58 +00:00
3f7ea11059 TriggerHelper SetUnitStance helper function for a very frequent triggerscript order.
This was SVN commit r21458.
2018-03-07 12:36:45 +00:00
2a1929d378 Fix a typo (ritualIdx / heroIdx) in the Danubius OwnershipChange in 026dcf10eb / D204.
Simplify that function by tracking entities using Sets instead of
Arrays, even though it costs two Set-to-Array conversions.

This was SVN commit r21457.
2018-03-07 12:21:09 +00:00