1
1
forked from 0ad/0ad
Commit Graph

18763 Commits

Author SHA1 Message Date
54c2447379 petra: complete 8f4db16139 for the change in dock positionning in random maps
This was SVN commit r21256.
2018-02-18 18:17:33 +00:00
ab057e0bf5 Change the event tag of the bows. Noticed by Alexandermb
Thread:
https://wildfiregames.com/forum/index.php?/topic/23578-rome-legionary/&page=3&tab=comments#comment-348741

This was SVN commit r21255.
2018-02-18 17:27:04 +00:00
99994faf12 Fix options validation upon saving following 3312a83f82.
Only the GUI controls of the current category are accessible, but the
save button validates all of them.

This was SVN commit r21254.
2018-02-18 16:19:18 +00:00
84c4249fd1 Fix the test added in 59e7320a49
This was SVN commit r21253.
2018-02-18 15:47:44 +00:00
a447c3fc1b petra fixes for fishing
This was SVN commit r21252.
2018-02-18 11:54:12 +00:00
93f41918f4 petra: various fixes preventing units to be blocked
This was SVN commit r21251.
2018-02-18 11:52:02 +00:00
59e7320a49 Small StatisticsTracker test
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D1305
This was SVN commit r21250.
2018-02-18 10:50:06 +00:00
240af1de6d Dodecanese random map, based on patch by Hannibal Barca.
Bridge code and Volcano mine.

Differential Revision: https://code.wildfiregames.com/D1277
This was SVN commit r21248.
2018-02-18 02:37:18 +00:00
f545b718d7 Fix the Skiritai unit having no animations when gathering, carrying...
Reported by elexis

This was SVN commit r21247.
2018-02-18 01:33:53 +00:00
4fb105a68f Fix non-existing rubble.
This was SVN commit r21246.
2018-02-17 23:32:35 +00:00
7d09e0c962 Seleucid main menu foreground update
This was SVN commit r21244.
2018-02-17 20:25:29 +00:00
a68d38f5d5 Remove lastFormationTemplate from UnitAI
Differential Revision: https://code.wildfiregames.com/D1255
Reviewed by: bb
This was SVN commit r21243.
2018-02-17 17:54:24 +00:00
01f581e813 Move GetEngineInfo to Mod.[h|cpp]
Suggested by: elexis
refs d5807cd59f

This was SVN commit r21242.
2018-02-17 17:36:43 +00:00
7c8c4ac2f7 Fix selection rings while garrisoning
Differential Revision: https://code.wildfiregames.com/D1158
Reviewed by: elexis, Itms
Refs: #2627

This was SVN commit r21241.
2018-02-17 16:56:12 +00:00
OmriLahav
668da1b0d1 This was SVN commit r21240. 2018-02-17 16:54:09 +00:00
d5807cd59f Check for and save mod version for savegames and replays
Reviewed by: elexis
Fixes: #4887
Differential Revision: https://code.wildfiregames.com/D955
This was SVN commit r21239.
2018-02-17 16:53:14 +00:00
246d57a81d Pompeii heightmap missing in 5acd064cb9, reported by Imarok.
This was SVN commit r21238.
2018-02-17 15:05:40 +00:00
fa4c4efa9d Fix carry idle animation gliding when women flee. That was due to them not having a running animation.
Use the bag on the back for male as well for now. In the end women
should carry baskets, and not backpacks
and make can still have the one on the back.
Add XML headers
Fix Indent (Noticed by Temple)
Add EOL properties.

This was SVN commit r21236.
2018-02-17 12:46:02 +00:00
2406445821 Delete a duplicate basket introduced by 83680b0dee. Noticed by elexis.
This was SVN commit r21235.
2018-02-17 12:40:20 +00:00
470d3eb129 Replace a territory texture hack
Differential Revision: https://code.wildfiregames.com/D1293
This was SVN commit r21233.
2018-02-17 01:37:52 +00:00
866cf15751 Fix nomad units in e637e68ff6.
This was SVN commit r21232.
2018-02-16 22:11:01 +00:00
facc8fe15b Avoid NaN in Foundation and Repairable
Differential Revision: https://code.wildfiregames.com/D1296
Reviewed by: elexis
Comments by: bb, mimo
Fixes: #5030
Refs: #1879

This was SVN commit r21231.
2018-02-16 21:56:35 +00:00
fd7eb809f4 Remove civ hardcoding of the population space of houses on the Fortress map,
thereby fixing the granted population space for Mauryans and Ptolemians
following 6822e33c65, 08f431fa0d.

Patch By: (-_-) aka smiley
Differential Revision: https://code.wildfiregames.com/D1286
This was SVN commit r21230.
2018-02-16 21:52:33 +00:00
bb
fd8e2fbf1b vertically align gamesetup checkboxes, disalignment introduced in ac7b5ce861
Reviewed By: elexis
This was SVN commit r21229.
2018-02-16 20:52:19 +00:00
e637e68ff6 Hellas random map script.
Picks a random area of a digital elevation model of Greece that has a
certain amount of land.
Comes with different biomes depending on height, athenian artifacts,
docks, a temple and oxybeles.
Smoothens the map iteratively until the maximum amount of cliffs is
reached.
Uses mushrooms from dccbfe0fcd.

Map-description by Hannibal Barca

This was SVN commit r21228.
2018-02-16 20:26:42 +00:00
d29b1a1044 convertHeightmap1Dto2D helper function which allows extracting a subset of a heightmap image.
Could become superseded by the C++ counterpart returning a 2D array
instead, refs #5018, #4816.

One more DiskPlacer from dc18ea1973.

This was SVN commit r21227.
2018-02-16 19:02:51 +00:00
c9c1af355f Danubius is a naval map.
This was SVN commit r21226.
2018-02-16 18:52:14 +00:00
dc18ea1973 Implement a DiskPlacer to enable random map scripts chosing all points inside a circle without using a special case of the other placers.
Especially useful if the center position doesn't meet the constraint or
is outside of the map boundary.
Removing the preliminary boundary check from the centered placers seems
to come with a too high performance penalty, for instance when creating
forests.

This was SVN commit r21225.
2018-02-16 18:49:54 +00:00
a30ab829f4 Area getClosestPointTo helper function that allows dock placement on random maps without preknowledge about the water location.
This was SVN commit r21224.
2018-02-16 18:17:30 +00:00
c91fd9c2c3 Atlas should only list map JSON files as maps.
Differential Revision: https://code.wildfiregames.com/D1301
This was SVN commit r21223.
2018-02-16 16:42:46 +00:00
9dba939808 Fixes d408262d3d
Use the same speed for walk and run as it looked weird other wise
Use the correct anim for wood.

This was SVN commit r21220.
2018-02-16 06:17:13 +00:00
d408262d3d Add running animations for carrying units so that they do not glide.
Add XML headers.

This was SVN commit r21219.
2018-02-15 22:39:48 +00:00
ffe07d5cd9 Differential Revision: ​https://code.wildfiregames.com/D1121
Reviewed by: elexis
Comments by: wowgetoffyourcellphone
Fixes #4832

This was SVN commit r21218.
2018-02-15 19:42:18 +00:00
bebf68f8f5 Change hotkey.diplomacycolors to hotkey.session.diplomacycolors
This was SVN commit r21217.
2018-02-15 19:10:23 +00:00
b28b50ef63 Fix a typo and use better variable names in Footprint
Differential Revision: https://code.wildfiregames.com/D1287
Reviewed by: bb
Comments by: elexis, Stan
This was SVN commit r21216.
2018-02-15 18:40:18 +00:00
72fa750a0c Fix margin/padding issue in tooltips
Reviewed By: bb
Refs: D836, d01cb88ac4
Differential Revision: https://code.wildfiregames.com/D1298
This was SVN commit r21215.
2018-02-15 18:16:45 +00:00
98791a86a1 petra: fixes some unit assignments
This was SVN commit r21214.
2018-02-14 18:58:51 +00:00
8f4db16139 petra adaptation to changes in dock positioning in random maps
This was SVN commit r21213.
2018-02-14 18:52:41 +00:00
be255ac8ac Placeholder hero so the civ is complete, basically all that needs to be changed is the turret the rest is fine.
This was SVN commit r21211.
2018-02-13 22:39:29 +00:00
ee7ca1b86c rever the change in 03f064f0a1 as
it will cause some issues and the behaviour hasn't been well defined.

This was SVN commit r21210.
2018-02-13 21:19:11 +00:00
81b8fab010 Add a new hero (harsiotef father of nastasen) that should replace nastasen eventually as noted by sundiata.
This was SVN commit r21209.
2018-02-13 21:09:44 +00:00
a87a655801 Add new textures by Sundiata and wackyserious for kushites + some specs and normal maps.
Thread :
https://wildfiregames.com/forum/index.php?/topic/22765-kushites-units-unit-textures-and-unit-props/&page=20
Commits  in the branch :
d13c7c2d79
2fbaf4b404

This was SVN commit r21208.
2018-02-13 21:08:16 +00:00
c6aaeb7034 various petra fixes
This was SVN commit r21207.
2018-02-13 20:06:09 +00:00
07ac1051dc Move the randomPlayerLocations rmgen2/ function to rmgen/, so that one can use it without importing rmgen2, refs #4947, Belgian Uplands 5ca6217796, Islets D1277.
Delete rmgen2 placeRadial which is equal to playerPlacementCircle from
635e608776, refs #4805.
Remove createBase calls from rmgen2 player playerbase location
functions, so that they can be called without placing the bases.
Let them return the same data that rmgen/ functions return, refs #4947.
Delete placeRandom as it remains empty.
Rename sortPlayersByLocation to groupPlayersCycle,
groupPlayersByLocations to groupPlayersByArea,
randomPlayerLocations to playerPlacementRandom and addBases to
createBasesByPattern.

This was SVN commit r21206.
2018-02-13 19:44:43 +00:00
4f36fda38f Allow passing non-integer radius-queue values to the ChainPlacer, which was assumed by the Island Stronghold change in 45a9714865.
Beautify Ratumacos tributary rivers.

This was SVN commit r21205.
2018-02-13 19:42:50 +00:00
bb
45e5b2f0f8 Make the 'g' in 'last man standing' visible in gamesetup
Make more space for the dropdowns so longstring language doesn't
complain

Reviewed By: Imarok
Differential Revision: https://code.wildfiregames.com/D1260
fixes: #5015

This was SVN commit r21204.
2018-02-13 19:24:13 +00:00
8cc7865c16 Fix decal and rubble size.
Based on patch here:
51b1279b64

This was SVN commit r21203.
2018-02-13 18:09:03 +00:00
03f064f0a1 Update the templates to match the new unit names.
Rename ptol cavalry to camelry to better reflect what they are.
Update the maps accordingly.

This was SVN commit r21202.
2018-02-13 01:00:21 +00:00
95b700d73c Cleanup of the units PART XIV
New idle carry anims states for spartans + capes
Use the new convention discussed with wowgetoffyourcellphone

This was SVN commit r21201.
2018-02-13 00:58:28 +00:00
ee6616e5cc Cleanup of the units PART XIII
New idle carry anims states for seleucids + capes
Use the new convention discussed with wowgetoffyourcellphone

This was SVN commit r21200.
2018-02-13 00:57:57 +00:00