Commit Graph

16335 Commits

Author SHA1 Message Date
Itms ca80797dcc SpiderMonkey 38 upgrade: 05/35
Update premake scripts.

This was SVN commit r18659.
2016-09-02 16:18:57 +00:00
Itms 7e6a960e83 SpiderMonkey 38 upgrade: 02/35
Update files for building SpiderMonkey.
Add a script for starting the tracelogger, as well as some instructions,
to be detailed in the wiki.

This was SVN commit r18656.
2016-09-02 16:14:11 +00:00
fatherbushido add6b0206c Adds a missing civ requirement for a pair technology.
This was SVN commit r18653.
2016-09-01 07:35:13 +00:00
elexis 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
elexis a4a99bc129 Fix a lot of whitespace in gui/.
This was SVN commit r18650.
2016-08-27 15:33:22 +00:00
leper 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
leper 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
leper 2366d36f54 Remove unneeded includes.
Refs #4161.
Reviewed by: fatherbushido
This was SVN commit r18647.
2016-08-27 15:27:13 +00:00
leper 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
leper 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
fatherbushido 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
leper 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
elexis eb20661e34 Fix an oversight in 84bde41394, as reported by gameboy.
This was SVN commit r18642.
2016-08-26 14:19:01 +00:00
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis eab5436d55 Fix oversight in 42cef1d29f.
This was SVN commit r18635.
2016-08-25 18:12:24 +00:00
elexis 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
elexis 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
fatherbushido 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
elexis 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
elexis 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
elexis 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
elexis 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
elexis 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
leper 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
leper 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
leper 014a6d621b Keep mounting the cache directory in tests. Fixes oversight in 493990f472.
This was SVN commit r18623.
2016-08-22 01:00:23 +00:00
leper e4c527d5c5 Fix indentation.
This was SVN commit r18622.
2016-08-21 20:35:13 +00:00
leper 4ed7d6c202 Fix compilation failure.
This was SVN commit r18621.
2016-08-21 20:35:10 +00:00
leper 9998592542 Remove unused variable.
This was SVN commit r18620.
2016-08-21 20:35:08 +00:00
leper e7df8edc7d Mark method const.
This was SVN commit r18619.
2016-08-21 20:35:06 +00:00
fatherbushido f79a9bd4c4 Removes 3 redundant numerical informations in tooltips. Reviewed by elexis.
This was SVN commit r18618.
2016-08-21 16:22:42 +00:00
fatherbushido 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
fatherbushido 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
elexis 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
elexis 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
scythetwirler 3a2b418c0e Fixes off-by-one error.
This was SVN commit r18612.
2016-08-17 00:30:57 +00:00
elexis 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
scythetwirler 27f2b2e04d Guess who hasn't used SVN in a while...actually svn add the new file.
This was SVN commit r18610.
2016-08-16 03:38:56 +00:00
scythetwirler 5e643ba6be Splits lobby bot into a ratings bot and a main bot. Fixes #3022.
This was SVN commit r18609.
2016-08-16 03:35:53 +00:00
Itms b9a6d2af16 Use the debugger output on Windows for invalid parameter tests (see bd9bc6db78).
This way, the test output is not polluted by the error messages when
running in debug mode.

This was SVN commit r18608.
2016-08-15 12:15:19 +00:00
fatherbushido 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
elexis 6eaf76d653 Actually seed the random number generator used in the simulation. Reviewed by sanderd17, fixes #4127.
This was SVN commit r18604.
2016-08-14 16:28:54 +00:00
elexis 00a469be1b Show the last-man-standing option regardless of whether it is possible to set it. Reviewed by fatherbushido, refs #3970.
This was SVN commit r18603.
2016-08-14 15:35:58 +00:00
elexis 0c21c24754 Replay menu init performance improvement, reviewed by Imarok.
displayReplayList was called once per filter initialization i.e. 8 times
too often on init.
This can save multiple seconds when opening the menu.

This was SVN commit r18602.
2016-08-14 10:34:23 +00:00
elexis e4000d11cf Display the gamestart time in the lobby. Patch by Imarok, combined with d7d0a7f869 fixes #3476.
XPartaMupp patch reviewed by scythetwirler.

This was SVN commit r18601.
2016-08-14 09:03:30 +00:00
elexis 416049e4b4 Remove charge attack from the templates which isn't implemented nor designed yet. Patch by fatherbushido, fixes #4139.
Remove the unused "recharge" attack timer which was introduced in
b21e798243 but should have been removed with 4e5c5e2d8f.

This was SVN commit r18599.
2016-08-11 14:35:50 +00:00