1
0
forked from mirrors/0ad
Commit Graph

18508 Commits

Author SHA1 Message Date
Stan 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
Stan 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
Stan 91c91263fc Clean up global units
This was SVN commit r21192.
2018-02-13 00:52:20 +00:00
Stan 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
Stan 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
Stan 00f0bd561d Remove a useless old ship
This was SVN commit r21189.
2018-02-13 00:46:37 +00:00
Stan 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
Stan 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
mimo 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
elexis 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
Stan 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
Stan 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
elexis 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
mimo 0de78fde81 petra: changes to improve startup on small islands
This was SVN commit r21178.
2018-02-11 17:44:20 +00:00
elexis 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
elexis 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
elexis 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
s0600204 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
temple 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
Stan 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
elexis 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
elexis f150617b2c Revert unintentionally overwritten red sea heightmap in 5acd064cb9.
This was SVN commit r21170.
2018-02-10 12:40:10 +00:00
mimo 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
s0600204 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
s0600204 262b27d770 Remove unnecessary argument from CSimulation2::InitGame
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D1289
This was SVN commit r21166.
2018-02-09 19:50:01 +00:00
elexis 29950c2d90 Ngorongoro replicate of _kali's map in a68881dd0f.
This was SVN commit r21165.
2018-02-09 16:34:13 +00:00
elexis 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
elexis 64de3ce7ac Bahrain random map, replicate of _kalis map in a68881dd0f.
This was SVN commit r21163.
2018-02-09 13:50:55 +00:00
elexis 06531ec645 Marmara replica of _kalis version in a68881dd0f.
This was SVN commit r21162.
2018-02-09 11:31:29 +00:00
elexis c1cd12787f Ratumacos / Rouen replica of _kalis map in a68881dd0f.
Visually more appealing and more authentic heightmap, better fitting
water effect, random shallows, better playerbase alignment, circular
map.

This was SVN commit r21161.
2018-02-09 10:17:06 +00:00
Stan 8fad0ea8ca New range icon by Lion.Kanzen
Thread:
https://wildfiregames.com/forum/index.php?/topic/22982-committed-archery-icon/

This was SVN commit r21159.
2018-02-08 23:16:36 +00:00
Imarok bc9e2b476e Some drag code cleanup in input.js (primary point -> vector)
Patch by OptimusShepard
Differential Revision: https://code.wildfiregames.com/D1288
This was SVN commit r21158.
2018-02-08 23:11:13 +00:00
elexis c45c305941 Mediterranean random map replica of _kali's map in 33e3e6c2ab, refs #5018, D957.
This was SVN commit r21157.
2018-02-08 22:49:08 +00:00
elexis 48fd687254 Allow using the rmgen2 random playerbase location function to only compute locations without actually placing the bases.
Fix wrong border distance computation there in 8216bf9511.
Fix nomad units on Red Sea.

This was SVN commit r21156.
2018-02-08 22:39:12 +00:00
elexis d613350012 Add small metal mines to biome files.
This was SVN commit r21155.
2018-02-08 21:59:04 +00:00
temple e4039ea5a8 Add rubble to stoas
Add rubble to royal stoas, use 5x5 size for Sparta's foundation and
rubble.
Differential Revision: https://code.wildfiregames.com/D1290
Reviewed by: Stan
This was SVN commit r21154.
2018-02-08 20:42:11 +00:00
mimo e92a736e79 petra: fix cases where gatherers were assigned to a resource type, even if none available
This was SVN commit r21153.
2018-02-08 19:48:35 +00:00
Stan ba6151f4e7 Fix capes disappearing when dying for athenians.
This is due to the root prop point being overriden by the blood prop.

This was SVN commit r21152.
2018-02-08 18:56:35 +00:00
mimo 75333019ef petra: fix cases where an attack would stop by not finding targets
This was SVN commit r21151.
2018-02-08 18:54:03 +00:00
Stan 2b0f232770 Change pyramids class on mimo's request.
This was SVN commit r21150.
2018-02-08 18:51:52 +00:00
mimo 56308ec1ad remove a useless (and bothering) intrusion of the gui
This was SVN commit r21149.
2018-02-08 18:50:18 +00:00
Stan 1c66c69aa8 Idle carry animations for athenians infantry.
Cavalry needs some more variants so it will come afterwards.
Fix trader and healer blood.
Remove useless anims for heroes.
Remove gather praise for champions.
We do not use it anyway, but DE does.

This was SVN commit r21147.
2018-02-07 23:29:05 +00:00
Stan c2c593d9fd Make the aura description of the catafalque more descriptive
This was SVN commit r21146.
2018-02-07 22:32:19 +00:00
Stan a97800ab0e Fix Kushites blood display, move the blood to the variant, and add the variant to the units missing it.
This was SVN commit r21145.
2018-02-07 22:13:28 +00:00
temple 8babdeba04 Spawn units in rally point direction
Differential Revision: https://code.wildfiregames.com/D1041
Reviewed by: bb
Comments by: elexis, wraitii
Fixes: #4735

This was SVN commit r21144.
2018-02-07 20:58:07 +00:00
Stan 268c340c00 Fix incorrect line in art.json
Found by: Leper
fixes d30643a6c9

This was SVN commit r21143.
2018-02-07 20:50:16 +00:00
s0600204 d01cb88ac4 Calculate and return correct width in CGUI::GenerateText
Reviewed By: bb
Differential Revision: https://code.wildfiregames.com/D836
This was SVN commit r21142.
2018-02-07 20:47:10 +00:00
elexis cacbdf7b1a Pass Infinity to the ChainPlacer if failed tiles should be ignored, rather than different numbers above 1 that have the same effect, refs #4805.
This was SVN commit r21141.
2018-02-07 16:39:36 +00:00