1
1
forked from 0ad/0ad
Commit Graph

12395 Commits

Author SHA1 Message Date
bebf68f8f5 Change hotkey.diplomacycolors to hotkey.session.diplomacycolors
This was SVN commit r21217.
2018-02-15 19:10:23 +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
17380785f7 Cleanup of the units PART XII
New idle carry anims states for romans + capes
Use the new convention discussed with wowgetoffyourcellphone

This was SVN commit r21199.
2018-02-13 00:57:12 +00:00
f6e6295e92 Cleanup of the units PART XI
New idle carry anims states for ptolemies + capes
Use the new convention discussed with wowgetoffyourcellphone

This was SVN commit r21198.
2018-02-13 00:56:47 +00:00
5590f56603 Cleanup of the units PART X
New idle carry anims states for persians + capes
Use the new convention discussed with wowgetoffyourcellphone
Nuke some old unused units as they have better equivalents

This was SVN commit r21197.
2018-02-13 00:56:17 +00:00
91e81a024d Cleanup of the units PART IX
New idle carry anims states for mauryans + capes
Use the new convention discussed with wowgetoffyourcellphone
Nuke some old unused units as they have better equivalents

This was SVN commit r21196.
2018-02-13 00:54:27 +00:00
6ee1cd7f5f Cleanup of the units PART VII
New idle carry anims states for kushites + capes
Use the new convention discussed with wowgetoffyourcellphone

This was SVN commit r21195.
2018-02-13 00:53:44 +00:00
97fbfc3b20 Cleanup of the units PART VI
New idle carry anims states for iberians + capes
Use the new convention discussed with wowgetoffyourcellphone

This was SVN commit r21194.
2018-02-13 00:53:29 +00:00
28268ab5c2 Cleanup of the units PART V
New idle carry anims states for carthaginians + capes
Use the new convention discussed with wowgetoffyourcellphone

This was SVN commit r21193.
2018-02-13 00:53:00 +00:00
91c91263fc Clean up global units
This was SVN commit r21192.
2018-02-13 00:52:20 +00:00
4a8a610fab Cleanup of the units PART IV
New idle carry anims states for gauls and britons + capes
Use the new convention discussed with wowgetoffyourcellphone
move them to their own folders for differentiations.

This was SVN commit r21191.
2018-02-13 00:51:28 +00:00
26c3dd38aa Cleanup of the units PART III
New idle carry anims states for macedonians and athenians
Use the new convention discussed with wowgetoffyourcellphone

Update Capes + nuke redundant useless units

This allow easier search, a faster way to see what type of units are
there and
the suffix defines the actors

M -> Mount
C -> Champion
A -> Advanced
E -> Elite
B -> Base


Templates will come afterwards

This was SVN commit r21190.
2018-02-13 00:50:06 +00:00
00f0bd561d Remove a useless old ship
This was SVN commit r21189.
2018-02-13 00:46:37 +00:00
ccb831cf84 Cleanup of the units PART II
Delete unused variants as they were superseeded when using the new carry
idle animation by wraitii.
Add different variant anims per civ. Hele civs use mainly the same ones

This was SVN commit r21188.
2018-02-13 00:45:45 +00:00
9147b1d691 Cleanup of the units PART I
Move capes to another folder so it's easier to find them.
Remove props that will be come unused in the coming commits.
Tweak the cape anims for the idle carry animations.
Add a new gladius for cav gathering animation

This was SVN commit r21187.
2018-02-13 00:43:53 +00:00
d4381dbbc0 petra cleanups
This was SVN commit r21186.
2018-02-12 20:05:29 +00:00
bb
eba2d9dfcf Cleanup updateBandbox function with using vector functions
Patch By: OptimusShepard
Differential Revision: https://code.wildfiregames.com/D1295
This was SVN commit r21185.
2018-02-12 11:41:39 +00:00
bb
d3f213a865 Create an In-Game tab in the options menu, add periods in all option tooltips
Patch By: ffffffff
Comments By: elexis
Differential Revision: https://code.wildfiregames.com/D797
This was SVN commit r21184.
2018-02-12 11:01:26 +00:00
c1904a725a Implement ElevationBlendingPainter which interpolates the height of the given area with the desired height.
Primary use case, as represented on Caledonian Meadows, is creating a
path through impassable area, mountains or water, refs #4952.
Supersedes placeRandomPathToHeight from the heightmap library, refs
#3764.
The painter has the advantage that it can be applied to arbitrary areas
with arbitrary forms of smoothing (or no smoothing).
Replace the rectangularSmoothToHeight calls that only smooth an area
with a SmoothElevationPainter call.
Replace placeRandomPathToHeight which is a copy of the the
RandomPathPlacer from cbcbd19e0b, refs #4805.

This was SVN commit r21182.
2018-02-12 01:22:10 +00:00
c9a7817752 Move some old animation to the old public folder. Found with checkrefs.pl
This was SVN commit r21181.
2018-02-12 01:00:14 +00:00
ff5ca5ff9b Fix broken pyramid revealed by unit test demo.
You cannot use variants like this.

This was SVN commit r21180.
2018-02-12 00:13:32 +00:00
95e68d4896 Add roman docks and dock rubble to Pompeii, compensating the disadvantage of players spawned near the sea.
Use another lava texture.

This was SVN commit r21179.
2018-02-11 17:44:48 +00:00
0de78fde81 petra: changes to improve startup on small islands
This was SVN commit r21178.
2018-02-11 17:44:20 +00:00
45a9714865 Fix wrong argument order in Island Stronghold in 02fe3ef3e3.
Fix Island Stronghold tiny map starting islands since 875a774da9.
Fix berries inside CC on Schwarzwald since 921850cdef.
Prevent starting mines on mountains on Pompeii and other rmgen2 maps,
refs 5acd064cb9.

This was SVN commit r21177.
2018-02-11 16:02:51 +00:00
7f9652d6ff Migrate setRandomHeightmap from the heightmap library to a Painter that can be applied to arbitrary Areas, refs #3764.
The only current use-case is Belgian Uplands that has to smooth the map
for 15-45 seconds to transform that noise into an acceptable map.
The general use-case of this painter is questionable.

This was SVN commit r21176.
2018-02-11 15:22:27 +00:00
02fe3ef3e3 Implement SmoothingPainter for random maps, fixes #5027.
This allows only specific regions of the map to be smoothened,
especially important on imported digital elevation models.
It uses the Inverse Distance Weighting / Shepard's method as mentioned
by Imarok and formerly implemented in the Pyrenean Sierra map by wraitii
in a796800bb1.

Supersedes the globalSmoothHeightmap function in FeXoRs heightmap
library, refs #3764.
Drop the heightmap argument to be consistent with the other painters.
If painting on arbitrary heightmaps is wished, the createArea mechanism,
all Placers, Painters, Constraints and Areas can and should support
that.

Update the HeightmapPainter from 6319647795 to not break if
TILE_CENTERED_HEIGHT_MAP is enabled (i.e. numVertices = numTiles), refs
#5018.
Use that mode on Mediterranean and Red Sea.
Drop the disabling of bicubic interpolation in the HeightmapPainter
instead of extending it to this feature.

Inevitable smoothing performance improvement for Belgian Uplands (from
45 to 15 seconds per call), even if it implies a somewhat different
outcome, refs #5011.

This was SVN commit r21175.
2018-02-11 14:56:55 +00:00
9501292661 Merge the structree's loadUnit and loadStructure functions
The resultant function should be able to handle any (selectable) entity
template.

This was SVN commit r21174.
2018-02-11 04:09:28 +00:00
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
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
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
f150617b2c Revert unintentionally overwritten red sea heightmap in 5acd064cb9.
This was SVN commit r21170.
2018-02-10 12:40:10 +00:00
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
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
29950c2d90 Ngorongoro replicate of _kali's map in a68881dd0f.
This was SVN commit r21165.
2018-02-09 16:34:13 +00:00
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
64de3ce7ac Bahrain random map, replicate of _kalis map in a68881dd0f.
This was SVN commit r21163.
2018-02-09 13:50:55 +00:00
06531ec645 Marmara replica of _kalis version in a68881dd0f.
This was SVN commit r21162.
2018-02-09 11:31:29 +00:00