1
0
forked from 0ad/0ad
Commit Graph

10517 Commits

Author SHA1 Message Date
64b1da0ddf Adds globalscripts/BicubicInterpolation.js, the corresponding license_mit.txt and points to it for other files with the same license in LICENSE.txt - reviewed by Philip and Itms. Uses that to fix an interpolation issue in gaia.js and also fixes a "fail by one" there - reviewed by elexis. Fixes #4174
This was SVN commit r18710.
2016-09-06 21:49:57 +00:00
a673a330a5 Fixes a typo in 8c6944f58f.
This was SVN commit r18709.
2016-09-06 13:14:51 +00:00
baed376b06 Removes Town class from wallset template. It was misleading because palisades and walls are not Town structure and they didn't even count as such buildings because the built walls don't inherit class from wallset.
This was SVN commit r18708.
2016-09-06 12:47:09 +00:00
8c6944f58f Adds Capturable component tests. Fixes a message. Thanks elexis and sanderd17 for the remarks. Fixes #4149.
This was SVN commit r18707.
2016-09-05 20:02:33 +00:00
58c8812cc7 Removes duplicated entries in crannog template. Noticed by Imarok.
This was SVN commit r18706.
2016-09-05 14:08:55 +00:00
417aec9495 Fixes village, town, city classes inconsistencies in templates. Reported by WarBeast. Refs #4147.
This was SVN commit r18705.
2016-09-05 12:45:07 +00:00
c056b9bfb9 Fix critical gamesetup bug again where the game can't be started after a previously assigned disconnected client rejoins a full game. Same as #3602, reintroduced by b642f0d876, refs #3120. Fixes #4120.
This was SVN commit r18702.
2016-09-05 02:15:04 +00:00
565709701e Hide the "I'm ready" button to observers. Patch by echotangoecho, fixes #4112.
Right-align the affected buttons and neighboring GUI objects.

This was SVN commit r18701.
2016-09-05 01:53:08 +00:00
f61f051d74 New random map script Marmara by _kali, reviewed by niektb.
This was SVN commit r18700.
2016-09-04 22:30:03 +00:00
c118467c33 Fix broken transparency of the mediterranean mappreview image.
This was SVN commit r18699.
2016-09-04 22:25:57 +00:00
ff2fe5d04a Fixes immortals technology as it affected also the persian mercenary champion spearman. Reported by WarBeast.
This was SVN commit r18698.
2016-09-04 21:36:45 +00:00
488b4482d9 Skirmish map Two Seas overhaul by Stan, refs #2881.
Adds starting resources and units, forests, mines, animals, treasures
and some decoratives.

This was SVN commit r18697.
2016-09-04 21:19:14 +00:00
2e1441d2ba Fixes a copy paste error introduced in 46ead523b8 for a roman hero aura, noticed by WarBeast. Reviewed by elexis.
This was SVN commit r18695.
2016-09-04 10:34:57 +00:00
53d5f9f573 Adds melee cavalry to garrison arrow classes for some buildings and ships that can garrison cavalry. Previously all ranged units and all infantry were allowed wich was misleading. Discussed with Yves and reviewed by elexis.
This was SVN commit r18693.
2016-09-03 13:09:08 +00:00
317502d915 Objectives dialog. Icon by Lionkanzen. Reviewed by bb, fixes #3263 #4141.
Explain the new victory conditions and last man standing option in the
gamesetup.
Add an ingame dialog showing these explanations and all other chosen
gamesetup options,
so that players don't have to recall them and late observers don't have
to ask.

This was SVN commit r18692.
2016-09-03 09:11:02 +00:00
9b52dfb554 Allow queuing orders if an action is preselected. Patch by Imarok, refs #1720.
This was SVN commit r18691.
2016-09-03 07:42:08 +00:00
add6b0206c Adds a missing civ requirement for a pair technology.
This was SVN commit r18653.
2016-09-01 07:35:13 +00:00
8f1b37b216 Major ordered list GUI cleanup. Patch by Imarok, fixes #3905.
Remove m_SelectedDef, m_SelectedColumnOrder and m_HeadingHeight. Use
GetSetting and SetSetting instead. Thus
implement selecting a column / column order sprite from JS correctly.
Since the actual list sorting is done in JS, only the column header
sprites were inaccurate.

Remove "selected_def" since that is redundant with "selected_column".
Merge "selected_column" with "default_column" (and
"selected_column_order" with "default_column_order") since
all properties provided in XML pages are defaults and to remove the
copying on init.

Rename "def" to "column" and "ObjectDef" to "COListColumn".
Replace 30px header height hardcoded in the C++ with an option set by
the style.
Remove the unneeded requirement to specify a "list_name".
Thus rename "list_name" to "list_month" in the replay menu.
Remove unneeded "list_" prefix and substr(5) in column checks.
Use ranged loops.
Fix typo "Avalible".
Add an error message if the GUI style doesn't specify the selected
column order.

This was SVN commit r18652.
2016-08-31 19:29:48 +00:00
a4a99bc129 Fix a lot of whitespace in gui/.
This was SVN commit r18650.
2016-08-27 15:33:22 +00:00
fe8d096364 Add GetPlayersByDiplomacy to cmpPlayer.
This is in turn used by GetEnemies and the new GetAllies and
GetMutualAllies.
Use these in a few places as those are common queries.

Fixes #4161.
Reviewed by: fatherbushido
This was SVN commit r18649.
2016-08-27 15:28:02 +00:00
38c9d48708 Prevent leaking internal data in cmpPlayer.
Refs #4161.
Reviewed by: fatherbushido
This was SVN commit r18648.
2016-08-27 15:27:44 +00:00
2366d36f54 Remove unneeded includes.
Refs #4161.
Reviewed by: fatherbushido
This was SVN commit r18647.
2016-08-27 15:27:13 +00:00
2c5cddd684 Move message registrations to the right file.
Refs #4161.
Reviewed by: fatherbushido
This was SVN commit r18646.
2016-08-27 15:26:54 +00:00
c4c315f6a0 Remove cmpPlayerManager.GetAllPlayerEntities() which leaked internal data.
And all uses thereof could easily be replaced.
This changes the data structure of cmpTrigger.conquestEntitiesByPlayer
to
not store the player entity at all, and since that is now gone replaces
the
object by the array that was its sole property.

Refs #4161.
Reviewed by: fatherbushido
This was SVN commit r18645.
2016-08-27 15:26:23 +00:00
737ede0f89 Improves military-only-selection modifier, now filters fishing boat and merchant ship. Uses the same classes filter for find-idle-warrior. Reviewed by elexis. Fixes #4129.
This was SVN commit r18644.
2016-08-27 10:34:21 +00:00
35f8061ef2 Remove Armour from fish templates. Fixes #4169.
Given that Armour needs Health disabling one but not the other is an
error.

This was SVN commit r18643.
2016-08-26 19:37:12 +00:00
eb20661e34 Fix an oversight in 84bde41394, as reported by gameboy.
This was SVN commit r18642.
2016-08-26 14:19:01 +00:00
dfea781d71 Session GUI cleanup.
Remove a wrong space in a tooltip if the delete hotkey isn't set.

This was SVN commit r18641.
2016-08-26 10:05:23 +00:00
859dffd949 Add disabled effect for Stone themed buttons and Modern themed checkboxes. Patch by Imarok, fixes #4165.
This was SVN commit r18639.
2016-08-25 22:35:01 +00:00
b50ffac36b GUI sprite cleanup.
Move training panel portrait sprite from common/ to session/.

This was SVN commit r18638.
2016-08-25 22:14:56 +00:00
29c95f3a49 GUI sprite / style cleanup.
Merge common/styles.xml (which contains only the special default style)
with common/common_styles.xml.
Rename common/common_sprites.xml to common/sprites.xml.

This was SVN commit r18637.
2016-08-25 20:23:17 +00:00
84bde41394 GUI style / sprite cleanup.
Move remains of common/sprite1.xml to common/common_sprites.xml.

Remove duplicates bkFillBlack and bkTranslucent.
Rename bkWhiteBorderBlack to BackgroundWhiteBorderBlack.

Move BackgroundSessionTooltip and BackgroundInformationTooltip to
session/.
Remove unused BackgroundErrorTooltip.

This was SVN commit r18636.
2016-08-25 18:36:05 +00:00
eab5436d55 Fix oversight in 42cef1d29f.
This was SVN commit r18635.
2016-08-25 18:12:24 +00:00
52504bbfa8 GUI style / sprite cleanup.
Move civ icon overlay entries from common/ to session/.
Move main menu entries from common/ to pregame/.
Remove unused pgButton.

This was SVN commit r18634.
2016-08-25 13:59:25 +00:00
a8837fed41 Major GUI stlye and sprite cleanup.
Remove many unused and orphaned entries from common/,
including the entire Wheat theme from more than a decade ago and
most parts of the Stone theme.

Besides being unused, nearly all of the styles were ugly and don't fit
to the existing theme.
No entry should be reintroduced without being actually used somewhere
and if so, use a new subdirectory with the name of the theme.

This was SVN commit r18633.
2016-08-25 13:24:03 +00:00
f5eabf8ec8 Reverts e38665d7a6 (excepting the buildtime part of iberian and macedonian fortress templates) as #3818 must be fixed in a cleaner way. Fixes a typo. Refs #3818.
This was SVN commit r18632.
2016-08-25 10:44:19 +00:00
9fb4e9ef90 GUI style cleanup.
Remove commented out, unused scrollbars and a style.

This was SVN commit r18631.
2016-08-25 09:45:41 +00:00
4935c4384e GUI sprite cleanup.
Remove the commented out StonePanel theme which is superseded by thin
and large border variations.

This was SVN commit r18630.
2016-08-25 09:36:36 +00:00
6df480260e Main menu cleanup.
Remove code that was commented out.
Remove unneeded comments.
Use JSdoc comments.
Move globals to the top of the file.
Quotes for object keys.

This was SVN commit r18629.
2016-08-24 11:18:26 +00:00
42cef1d29f Hero / group icon color fade cleanup.
Move globals to the top of the file.
Proper case for globals.
Rename restartAble to restartable.
Use proper JSdoc comments.
Whitespace fixes.
Abbreviate with rgbToGuiColor.

This was SVN commit r18628.
2016-08-24 10:10:30 +00:00
11d10baf26 Delete old main menu background whose reference was removed in 6bcb3f5695 (2779512c6e). Delete commented out sprites.
This was SVN commit r18627.
2016-08-23 15:57:37 +00:00
2f12bae102 Deal ranged damage even if the attacker dies. Patch by LeanderH. Fixes #3610.
Create a Damage system component from the Damage helper object and parts
of
the Attack component. This fixes the issue by making ranged damage
independent
of the attacking entity.

While there fix the issue of damaging all nearby entities in case the
actual
target was not hit, instead of only a single one.

This was SVN commit r18625.
2016-08-22 01:00:57 +00:00
7947351a08 Add regression test for damage being dealt if the attacker dies. Based on patch by LeanderH. Refs #3610.
This was SVN commit r18624.
2016-08-22 01:00:30 +00:00
f79a9bd4c4 Removes 3 redundant numerical informations in tooltips. Reviewed by elexis.
This was SVN commit r18618.
2016-08-21 16:22:42 +00:00
ea48757635 Cleans simulation templates xml files: sorts components by alphabetical order, fixes identation and removes tabs. Reviewed by elexis. Fixes #4160.
This was SVN commit r18617.
2016-08-21 16:19:03 +00:00
289916b4d2 Updates Identity classes and visible classes documentation. Cleans inconsistencies (identation, some classes were sometimes in Classes and other times in VisibleClasses, adds missing class for javelinist cavalry hero, removes Camel classes from traders and seleucid cavalry, removes unused and misleading Light, Medium, Heavy classes). Comments by Sanderd17, elexis and s0600204. Refs #4147
This was SVN commit r18616.
2016-08-21 09:03:00 +00:00
9846f374a0 Suppress a file not found error and show the placeholder image instead of plain magenta if the mappreview wasn't found.
This was SVN commit r18614.
2016-08-17 23:11:11 +00:00
7470e88624 Always save the replay metadata (summary screen info) when ending the application. Patch by Imarok, fixes #4020.
This was SVN commit r18613.
2016-08-17 15:17:43 +00:00
d789a09be5 Add missing component check to fix regicide on survival of the fittest. Patch by bb, refs #2160.
This was SVN commit r18611.
2016-08-16 10:51:54 +00:00
9a7dbc55ae Removes duplicated unused unit templates. Greek references by Itms. Reviewed by elexis.
This was SVN commit r18607.
2016-08-15 11:51:57 +00:00