1
0
forked from mirrors/0ad
Commit Graph

18204 Commits

Author SHA1 Message Date
elexis b982e7f510 Fix build on armhf with gcc 7.
The abs caused a compiler error in that environment, because wchar_t is
unsigned on armhf, subtracting signed from unsigned results in unsigned
and std::abs does not define an unsigned variant.

Differential Revision: https://code.wildfiregames.com/D1122
Patch By: Peter Michael Green
Uploaded By: Ludovic
This was SVN commit r20869.
2018-01-14 21:18:37 +00:00
elexis 8ede017904 Don't crash while in the lobby when receiving an error IQ stanza without an error payload, refs d7121f4f55.
Differential Revision: https://code.wildfiregames.com/D1222
Patch By: Dunedan
This was SVN commit r20868.
2018-01-14 17:48:24 +00:00
Stan e132c26a0f Fix a typo I made in the neckguard.
This was SVN commit r20867.
2018-01-14 11:15:58 +00:00
elexis c74bd3425f Nomad mode on all random map scripts (except Survival of the Fittest), fixes #3591.
Fine-tune random map scripts if nomad mode is enabled by omitting gaia
attackers and vast voids.
Fix nomad units on the Unknown sometimes being stuck on mountains or
tiny islands, refs #3140.

Discussed with: bb

This was SVN commit r20866.
2018-01-14 00:59:06 +00:00
s0600204 7dfa4bda24 Pass an orientation angle on Fortress random map when placing fortresses
Should resolve current concern raised with 7aae697bc5.
(Until something better is done wrt default args and/or not having them,
or whatever.)

Refs D900, 7aae697bc5, #2944

This was SVN commit r20865.
2018-01-13 23:26:13 +00:00
elexis b180ad3e5d Remove distributeEntitiesByHeight / derivateEntitiesByHeight from 7471a0db63 / 49194819f6.
Fix collisions of mines with trees and berries on Schwarzwald.

It can't achieve anything that a createArea or createObjectGroups call
with a HeightConstraint (6278f75a1f) or HeightPlacer (49194819f6,
24f02d97eb) can't achieve too,
while it can't perform many crucial tasks like testing for arbitrary
Constraints, using custom shapes determined by a Placer or limiting the
amount of entities,
thus the unconventional code is redundant, refs #4805, #3764.

This was SVN commit r20864.
2018-01-13 22:42:14 +00:00
elexis d2e1af5270 Make the RectPlacer more permissive by not returning early if a coordinate is out of bounds.
Have some workarounds to mark tileclasses get rekt by this Placer.
Fix Hyrcanian Shores clHighlands class being painted on the entire
landarea rather than only the bottom 25% following 7d0cc59136.

This was SVN commit r20863.
2018-01-13 22:24:29 +00:00
elexis 6278f75a1f Add rmgen HeightConstraint to allow placing entities in a given height range.
This was SVN commit r20862.
2018-01-13 22:13:03 +00:00
elexis 495f83663e Extend the rmgen AndConstraint to be more permissive and receive falsy values or a Constraint to remove some Constraint conversion duplication, refs #4805.
This was SVN commit r20861.
2018-01-13 22:11:06 +00:00
elexis e8dea23cc4 Cleanup createArea calls on Deep Forest as in 376d8b3d1e.
This was SVN commit r20860.
2018-01-13 22:06:01 +00:00
elexis 55cdc8f639 Cleanup createArea calls on Neareastern Badlands as in 376d8b3d1e.
Use a separate tileclass for the oasis.
Use the mapCenter getter, refs #4854 and move important height and
radius constants to the top.

This was SVN commit r20859.
2018-01-13 22:01:59 +00:00
elexis d015b68f18 Fix unreachable trees on Oasis, fixes #4937.
Use constants instead of convoluting magic numbers
Use vector algebra and distributePointsOnCircle to determine the
locations of animals in the oasis, refs #4845.

This was SVN commit r20858.
2018-01-13 21:50:25 +00:00
elexis e58e60f75a Simplify island generation on Islands.
This was SVN commit r20857.
2018-01-13 21:42:46 +00:00
elexis 36afe80b27 Use vector algebra for the unconventional playerbase resources on Belgian Uplands, refs #4845.
Add an extra scope since that block will become conditional on nomad
maps, refs #3591.

This was SVN commit r20856.
2018-01-13 21:31:20 +00:00
elexis f8cc18589d Simplify the water-tileclass marking on Cycladic Archipelago and Corsica vs Sardinia using paintTileClassBasedOnHeight.
This was SVN commit r20855.
2018-01-13 21:26:59 +00:00
elexis eb46e4ec6a Remove dead tileclasses from random map scripts,
i.e. tileclasses that are never painted, thus always avoided.

Equally remove some checks for tileclasses before they are painted and
placement code that always failed on Flood.

This was SVN commit r20854.
2018-01-13 21:23:28 +00:00
elexis 8829610a1b Remove random map script log entries that measured the time.
The mechanism should work for all random map script log entries, if the
timestamps are not added to the CLogger directly, refs #4950.

This was SVN commit r20853.
2018-01-13 21:19:07 +00:00
elexis b838e57770 Clean some random map script comments.
This was SVN commit r20852.
2018-01-13 21:16:27 +00:00
elexis 851490e3bf Fix typo in 08f561c02d.
This was SVN commit r20851.
2018-01-13 21:12:22 +00:00
Stan 7a4325f49a Fix capes for elephants, and make them behave.
Fix heroes and pikemen attacking when on elephants
They will only display the capturing and death animations
Fix various indent issues.

This was SVN commit r20850.
2018-01-13 15:11:57 +00:00
Stan 23b791285a New peytral textures for horses by wackyserious.
Also move the textures to a new folder as they are not helmets
and remove some of the duplication by creating variants.
Reviewed by: Stan
Tweaks by: Stan
Advices by: Sundiata
This was SVN commit r20849.
2018-01-13 14:01:20 +00:00
mimo d05655ebda fix leftover in 5df1f4ec4c
This was SVN commit r20848.
2018-01-13 09:39:43 +00:00
Stan 1c7dd52b66 Fix an incorrect icon for ptol healers.
Thread :
https://wildfiregames.com/forum/index.php?/topic/21136-egyptian-priest-icon/

This was SVN commit r20846.
2018-01-12 21:44:47 +00:00
bb 5729b49610 Don't early return but update the active query when having no position or when outOfWorld
Based on Patch By: fatherbushido
Patch By: temple
Differential Revision: https://code.wildfiregames.com/D1219
Differential Revision: https://code.wildfiregames.com/D704
fixes #4658

This was SVN commit r20845.
2018-01-12 21:01:17 +00:00
Stan fbc5877d67 Update the credits with Leyto's real name.
This was SVN commit r20844.
2018-01-12 19:12:45 +00:00
Stan f17813a9eb Add missing icon in 1df50d9a07
Refs: #1992
Icon by wowgetoffyourcellphone

This was SVN commit r20843.
2018-01-12 18:07:15 +00:00
bb 6342112a5b Fix the currently wrong entity order/select/attack/trained sounds.
Adding/removing distanceLess/heardBy/omnipresent tags to/from the
actors.

Not adding missing sounds (lots of animals miss sounds), not renaming
files to something consistent, not making the files itself consistent.

Patch By: temple
Differential Revision: https://code.wildfiregames.com/D944
This was SVN commit r20842.
2018-01-12 17:43:04 +00:00
LordGood 51a92c27a1 Ptolemies stable,range,workshop,e-stable & Roman stable
This was SVN commit r20841.
2018-01-12 17:40:39 +00:00
Stan 1db8f9a815 New Muskox texture by Leyto
Slightly tweaked alpha by me,
Source files,
Update the credits.json using the files provided in the license
and the respective WikiCommons accounts of the people, for legal
issues.
Add leyto to the credits.

This was SVN commit r20840.
2018-01-12 11:42:13 +00:00
Stan c2ddae3264 Thracian cap.
Was partially fixed by 2d0e996725 but never disclosed.
Fixes #2292
Move the helmet to the new helmets folder,
Update the actors using this, apparently none used the other two
variants.

This was SVN commit r20839.
2018-01-12 10:52:06 +00:00
mimo ddb6fbd55d petra: remove some unneeded temporary variables
This was SVN commit r20838.
2018-01-11 21:31:12 +00:00
mimo 99e38f1731 Improve petra behavior in death-match: allow more builders when plenty of resources and replace tests on current population by tests on current + in-training-queue population (that allows faster phasing up).
Fixes #4168

This was SVN commit r20837.
2018-01-11 21:29:19 +00:00
Stan 4c348b6aaa Fixes #4634
Update Theatron and Stonehenge foundations making them with more props
Make Stonehenge foundation slightly bigger allowing one to select it
without having to place the cursor in the middle.

This was SVN commit r20836.
2018-01-11 20:31:28 +00:00
Stan 3a5b07109a Add a different siege tower for ptolemies to make use of their own garrison flag.
Use the hele_flag for the hele_siege_tower, as it's now used only by
macedonians
and they do not have their own.
Update the template to use the new actor

This was SVN commit r20835.
2018-01-11 16:10:35 +00:00
Stan 2688e06533 Fix garrison flag for the persian siege ram
Patch by Angen
Reviewed By: Stan
Differential Revision: ​https://code.wildfiregames.com/D1215
This was SVN commit r20834.
2018-01-11 14:35:08 +00:00
Stan fa9078876e Move two old celt models to their correct directory and rename them accordingly.
It will be easier for modders to find them and make templates for those
if they want.
Add the other textures that now exist, fix the actors, reindent them,
add svn eol properties.

This was SVN commit r20833.
2018-01-11 13:21:56 +00:00
Stan efa6bdf2c2 Remove the last occurence of multiply_color in the repo.
Fixes #2422

This was SVN commit r20832.
2018-01-11 12:44:43 +00:00
Stan 24f37eabb6 Use inheritance for animations for the remaining horses
This was SVN commit r20831.
2018-01-11 10:31:06 +00:00
Stan 4ea135838e Add missing unit in iberian commit
This was SVN commit r20830.
2018-01-11 10:22:55 +00:00
Stan b685951885 Use death and run variants for spartan horses.
Add eol properties

This was SVN commit r20829.
2018-01-11 10:00:44 +00:00
Stan 58a9d9fab7 Use death and run variants for seleucid horses.
Add eol properties

This was SVN commit r20828.
2018-01-11 09:59:59 +00:00
Stan 5428f569a3 Use death and run variants for roman horses.
Add eol properties

This was SVN commit r20827.
2018-01-11 09:59:41 +00:00
Stan e75a71cc94 Use death and run variants for ptolemy horses.
Add eol properties

This was SVN commit r20826.
2018-01-11 09:59:19 +00:00
Stan e004b1070b Use death and run variants for persian horses.
Add eol properties

This was SVN commit r20825.
2018-01-11 09:58:39 +00:00
Stan 028b7f3542 Use death and run variants for mauryans horses.
Add eol properties

This was SVN commit r20824.
2018-01-11 09:58:03 +00:00
Stan d8542d4264 Use death and run variants for macedonians horses.
Add eol properties

This was SVN commit r20823.
2018-01-11 09:57:18 +00:00
Stan 6abd53a36a Use death and run variants for macedonian horses.
Add eol properties

This was SVN commit r20822.
2018-01-11 09:56:42 +00:00
Stan 09ff2819f9 Use death and run variants for hellenes horses.
Add eol properties

This was SVN commit r20821.
2018-01-11 09:55:50 +00:00
Stan 5652d66894 Use death and run variants for celts horses.
Add eol properties

This was SVN commit r20820.
2018-01-11 09:54:32 +00:00
Stan 418eeb8098 Use death and run variants for carthaginian horses.
Add eol properties
Fix indent bug
Fix missing line end

This was SVN commit r20819.
2018-01-11 09:53:52 +00:00