phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
19,351 Commits 12 Branches 28 Tags 13 GiB
2c8efc9751
Commit Graph

19351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bb
2c8efc9751 align the footprint an obstruction size with the model size for the kush range 
This was SVN commit r22191.
 2019-04-15 21:46:44 +00:00
bb
536d5e3af4 unparent the range from the barracks, and reduce the duplication in the civs' range templates 
while at it, make the classes consistent and remove the cav from the
range

Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1791
This was SVN commit r22190.
 2019-04-15 21:39:21 +00:00
bb
a2e522edcb Move tooltips on gamesetup dropdowns from xml to js, since by current gamestup design that is the way all tooltips are added. 
While add it add some periods


Patch By: Polakrity
Differential Revision: https://code.wildfiregames.com/D594
This was SVN commit r22188.
 2019-04-14 20:29:08 +00:00
bb
53bb9fa367 Handle orderone hotkey also for the minimap 
refs D308, 62f07098ea
Patch By: luiko
Comments By: Angen, Stan
Differential Revision: https://code.wildfiregames.com/D1822
This was SVN commit r22187.
 2019-04-14 19:29:02 +00:00
wackyserious
9621009360 New Texture: Iberian Units Retexture 
Thread:
https://wildfiregames.com/forum/index.php?/topic/24988-task-iberian-units-update/

Reviewed by Genava55 and other community members

This was SVN commit r22186.
 2019-04-14 04:28:18 +00:00
wraitii
89a8c9ca87 Fix broken test introduced by b1659e7618 
This was SVN commit r22185.
 2019-04-13 12:49:33 +00:00
wraitii
b1659e7618 Move more things in the projectile part of the Attack/Ranged component 
Following D945, I reckon more things should be moved from Attack/Ranged
to Attack/Ranged/Projectile.

In the long run, I think most things should be moved to the Projectile,
which would let us have several projectiles per attack (for example),
make it easier to abstract away from the Melee/Ranged attack types, and
would also be more coherent. This is the first step, as it adds the
Projectile to all templates.

This also makes the launch point a parameter, though I only add "y" as
implementing the rotation is left as an exercise to the reader.

Reviewed By: bb
Differential Revision: https://code.wildfiregames.com/D1171
This was SVN commit r22184.
 2019-04-13 09:27:14 +00:00
Itms
4a5fb3ba94 Fix issue in 672d587bc0, detected by the checkrefs.pl script. 
Patch By: Nescio
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D1824
This was SVN commit r22183.
 2019-04-13 09:20:29 +00:00
bb
672d587bc0 Add ConquestCritical to structures that want it, instead of removing it from those that don't want it. 
While add it remove conquestCritical from benches/fences/tables/columns
etc.

Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1626
This was SVN commit r22182.
 2019-04-12 15:05:11 +00:00
bb
c66962a2aa Reduce duplication in template_structure_military* 
Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1793
This was SVN commit r22181.
 2019-04-12 14:12:16 +00:00
Stan
02a429bc7f Fix 4edcf21b98. Refs #5428 
Differential Revision: https://code.wildfiregames.com/D1821
This was SVN commit r22178.
 2019-04-10 06:05:34 +00:00
wackyserious
f472199acb New Texture: Basic Celtic Infantry (Topless with pants) + Linothorax for Spartan Skiritai 
Thread:
​https://wildfiregames.com/forum/index.php?/topic/23002-task-celtic-unit-textures/

Reviewed by Stanislas69 and other community members

This was SVN commit r22177.
 2019-04-10 03:54:55 +00:00
wackyserious
1ea60ff35a New Texture: Greek Psiloi (Elite) and Athenian Epilektoi 
Thread:
​https://wildfiregames.com/forum/index.php?/topic/22184-task-hellenic-unit-textures/

Reviewed by Stanislas69 and Wowgetoffyourcellphone

This was SVN commit r22176.
 2019-04-10 02:35:15 +00:00
Stan
4edcf21b98 Remove useless class, test class and use boost instead of it in test_RangeManager.h. Use boost::random::uniform_real_distribution<double> instead of deprecated boost::uniform_real<> in that class as well. 
Refs #5428
Reviewed by: @Angen, @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D1584
This was SVN commit r22175.
 2019-04-09 21:50:10 +00:00
Itms
c12b95d6f6 Corrections in game loading quotes. 
Use English names for authors and titles, use American English rather
than British.

Patch By: Nescio
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D1818
This was SVN commit r22174.
 2019-04-09 19:54:32 +00:00
LordGood
96261e3023 fixed anchor points on quarry entities 
This was SVN commit r22172.
 2019-04-07 21:33:28 +00:00
LordGood
9cfbce2879 Quarry stone 
This was SVN commit r22171.
 2019-04-07 21:00:50 +00:00
vladislavbelov
3a7335d723 Removes unused iterator in Xeromyces. Its usage was removed in a07add11c6. 
Patch By: Angen
Differential Revision: https://code.wildfiregames.com/D1814
This was SVN commit r22170.
 2019-04-07 18:23:04 +00:00
bb
0b1593e268 recieve -> receive 
Reported by Stan in 13288df4f4

This was SVN commit r22169.
 2019-04-07 16:06:10 +00:00
LordGood
493f6061cb Dead palms and some more stone cliff variation 
This was SVN commit r22168.
 2019-04-07 12:31:18 +00:00
bb
94716b9987 Remove an unused variable 
The variable was introduced in 492e49da38 without being used, neither
did it become used in a later commit. To me it seems that it is a
left-over from a copy paste, as the ".left" functions do use the
variable.
Notice 74c420f658 did cleanup around these lines, but did not remove
this variable

Patch By: Angen
Differential Revision: https://code.wildfiregames.com/D1813
This was SVN commit r22166.
 2019-04-06 22:04:13 +00:00
bb
13288df4f4 Update the wonder victory timer in case the wonder renames. 
Reviewed By: smiley
Comment By: elexis
Differential Revision: https://code.wildfiregames.com/D1732
This was SVN commit r22165.
 2019-04-06 21:58:20 +00:00
Imarok
359df88f1a [CSlider] On click move the slider-button to the mouse position 
Reviewed By: vladislavbelov
Refs: #2593
Differential Revision: https://code.wildfiregames.com/D1622
This was SVN commit r22164.
 2019-04-06 18:47:22 +00:00
bb
99e03b9311 Remove unneeded death sounds from structure templates, as they inherit from template_structure 
Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1795
This was SVN commit r22163.
 2019-04-06 14:35:39 +00:00
Stan
2288943f91 Fixes 
C4458 in AtlasObjectImpl.cpp line 292 and in AtlasUI/Object.cpp:547
C4456 in MapDialog.cpp:173 and in ScenarioEditor.cpp:742

Reviewed by: @Angen
Accepted by: @Itms
Comments by: @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D1741
This was SVN commit r22161.
 2019-04-05 12:37:37 +00:00
Stan
cac81d1e84 Fix berry bushes smoothing groups, 
Reported by: @Angen, @vladislavbelov
This was SVN commit r22160.
 2019-04-05 12:11:09 +00:00
Itms
734ea4fd6b Improve the error window on Windows by adding a link to https://trac.wildfiregames.com/wiki/GameDataPaths. 
Patch By: Angen
Reviewed By: Itms, vladislavbelov
Differential Revision: https://code.wildfiregames.com/D1799
This was SVN commit r22157.
 2019-04-04 20:30:52 +00:00
Stan
9d2adaf514 Add missing berry bush mesh from 114015f4e9 
Noticed by: @vladislavbelov
This was SVN commit r22156.
 2019-04-03 06:02:11 +00:00
vladislavbelov
7182de3b20 Removes unused variable. It was introduced in f0615df318, an interface to control 
the variable was removed in 12e2428495. A usage was removed in
9376609ee8.
And since then the usage is useless because we use infinity sky model.

This was SVN commit r22154.
 2019-04-02 18:49:12 +00:00
LordGood
b3e80c3870 I'm a huge fan of Mediterranean fan palms, which are themselves not very huge, mind you 
This was SVN commit r22153.
 2019-04-01 15:15:02 +00:00
Stan
114015f4e9 New berry bushes by BigTiger 
Reviewed by: @Stan
Comments by: @borg
Thread:
https://wildfiregames.com/forum/index.php?/topic/25431-task-trees/

This was SVN commit r22151.
 2019-04-01 07:19:01 +00:00
LordGood
390f573bef Giant reeds, rocks, fruiting date palms, few more date palm variations 
This was SVN commit r22150.
 2019-04-01 04:34:20 +00:00
Gallaecio
0a1cccc9b9 Improve team bonus descriptions consistency 
Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1720
This was SVN commit r22149.
 2019-03-31 22:14:01 +00:00
Gallaecio
08966f8cde centre → center 
Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1802
This was SVN commit r22148.
 2019-03-31 22:12:21 +00:00
Gallaecio
47c82fad4e can be bought → could be bought 
As suggested by Nescio, I’ve actually copied the string from line 66,
which contains
the very same string.

Patch By: Gallaecio
Differential Revision: https://code.wildfiregames.com/D1801
This was SVN commit r22147.
 2019-03-31 11:34:00 +00:00
LordGood
e6193c3f40 Updated date palms 
This was SVN commit r22146.
 2019-03-29 22:59:36 +00:00
vladislavbelov
cb83d494e0 Refactor CBoundingSphere and add tests 
Reviewed By: wraitii
Comments By: smiley, Stan
Differential Revision: https://code.wildfiregames.com/D1576
This was SVN commit r22143.
 2019-03-25 21:17:43 +00:00
LordGood
8ee8faf54b Palmyra Palms 
This was SVN commit r22142.
 2019-03-25 04:58:43 +00:00
LordGood
fd9e6ebfa7 Doum and Nipa palms, Normal maps and specmaps for the new trees 
This was SVN commit r22141.
 2019-03-25 00:11:43 +00:00
Gallaecio
f202f22a29 Reword the tooltip of the Disable Treasures option 
Patch By: Gallaecio
Differential Revision: https://code.wildfiregames.com/D1532
This was SVN commit r22140.
 2019-03-24 11:33:50 +00:00
LordGood
29196c3e21 Mangroves 
This was SVN commit r22139.
 2019-03-23 21:14:26 +00:00
Imarok
c158785f13 Remove and Update some outdated tips and refactor tip displaying 
Reviewed by: s0600204, Nescio, Imarok
Patch by: Angen
Refs: #4428
Differential Revision: https://code.wildfiregames.com/D1377
This was SVN commit r22137.
 2019-03-20 22:27:54 +00:00
LordGood
3178973899 Baobab age variants, Bamboos and banyans 
This was SVN commit r22136.
 2019-03-20 13:38:31 +00:00
s0600204
9c5062147a Add a GetTextSize() method to GUI objects 
Usage:
  let size = Engine.GetGUIObjectByName({gui_object_name}).GetTextSize()

Returns a JS object containing the height and width of the primary text
field within
the object, taking into account new lines, text wrapping, and font
changes.

Unless the object doesn't contain text, in which case the method will
return undefined.

Commented on by: vladislavbelov
Additional code by: elexis
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D844
This was SVN commit r22134.
 2019-03-18 22:15:40 +00:00
s0600204
a65f981545 Rename kush teambonus file to be consistent with the filenames of the other teambonuses 
Change proposed in D1603 by Angen,
Committed seperately by request.

This was SVN commit r22133.
 2019-03-18 20:32:49 +00:00
bb
f8a0ea7023 seige to siege 
Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1797
This was SVN commit r22132.
 2019-03-18 14:55:58 +00:00
LordGood
cfc4e3ca20 Normal edit modified previous trees, small UV edits on the baobabs 
This was SVN commit r22130.
 2019-03-18 04:18:06 +00:00
bb
7aab37e01a Add "At Least" to the front of the disabledTooltips 
Patch By: Angen
Differential Revision: https://code.wildfiregames.com/D1792
This was SVN commit r22129.
 2019-03-17 20:02:01 +00:00
Gallaecio
1b656dfb41 rally-point → rally point 
Patch By: Gallaecio
Differential Revision: https://code.wildfiregames.com/D1527
This was SVN commit r22128.
 2019-03-17 17:02:23 +00:00
Gallaecio
9d28b1945d Remove quotes made unnecessary by capitalization 
Patch By: Gallaecio
Differential Revision: https://code.wildfiregames.com/D1537
This was SVN commit r22127.
 2019-03-17 16:56:19 +00:00