Commit Graph

17350 Commits

Author SHA1 Message Date
Itms f77441fb10 SpiderMonkey 38 upgrade: 20/35
Some options have been moved from ctxt to runtime. Patch by leper.

This was SVN commit r18674.
2016-09-02 16:35:58 +00:00
Itms 8f7ba9acf8 SpiderMonkey 38 upgrade: 18/35
JS_SetErrorReporter now takes a JSRuntime instead of a JSContext. Patch
by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=981198

This was SVN commit r18673.
2016-09-02 16:35:03 +00:00
Itms 2aa75a05d4 SpiderMonkey 38 upgrade: 18/35
Renamed JS_Compile{,UC}Function to JS::CompileFunction. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1089026

This was SVN commit r18672.
2016-09-02 16:34:02 +00:00
Itms 8747b1c098 SpiderMonkey 38 upgrade: 17/35
JS_GetUint*Array now takes an AutoCheckCannotGC parameter. Based on
patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1061288

This was SVN commit r18671.
2016-09-02 16:33:10 +00:00
Itms c06eda0209 SpiderMonkey 38 upgrade: 16/35
JS_GetTypeName was removed from the API, but we asked upstream to add it
back (https://bugzilla.mozilla.org/show_bug.cgi?id=1037718).

This was SVN commit r18670.
2016-09-02 16:32:26 +00:00
Itms ef764d5d64 SpiderMonkey 38 upgrade: 15/35
Temporary workaround dropping of parent parameter from JS_NewObject* by
switching to JS_NewObjectWithGivenProto.

We should just drop support for serializing the parent since upstream is
dropping the parent parameter from all those functions.

Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1136906 and
https://bugzilla.mozilla.org/show_bug.cgi?id=1136345

This was SVN commit r18669.
2016-09-02 16:30:35 +00:00
Itms c3710c9632 SpiderMonkey 38 upgrade: 14/35
JS_NewObject has no parent or proto arg anymore, use
JS_NewObjectWithGivenProto instead. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1136906
https://bugzilla.mozilla.org/show_bug.cgi?id=1127443 and
https://bugzilla.mozilla.org/show_bug.cgi?id=1136345

This was SVN commit r18668.
2016-09-02 16:29:21 +00:00
Itms 8d15411abf SpiderMonkey 38 upgrade: 13/35
Update JS_NewObject to JS_NewPlainObject, with new parameters. Patch by
leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1136906 and
https://bugzilla.mozilla.org/show_bug.cgi?id=1125356

This was SVN commit r18667.
2016-09-02 16:28:17 +00:00
Itms c99ae7ca1c SpiderMonkey 38 upgrade: 12/35
Major update to the JSClass stubs. Based on patch by leper.
https://bugzilla.mozilla.org/show_bug.cgi?id=1103152

This was SVN commit r18666.
2016-09-02 16:26:54 +00:00
Itms b01300c222 SpiderMonkey 38 upgrade: 11/35
Renamed JS_CallHeapFooTracer to JS_CallFooTracer. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1052388

This was SVN commit r18665.
2016-09-02 16:25:42 +00:00
Itms 761abd587e SpiderMonkey 38 upgrade: 10/35
Use operator= instead of .set(). Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1128110

This was SVN commit r18664.
2016-09-02 16:24:46 +00:00
Itms c7c3ef9f92 SpiderMonkey 38 upgrade: 09/35
Use .toFoo() instead of JSVAL_TO_FOO. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=952650

This was SVN commit r18663.
2016-09-02 16:23:44 +00:00
Itms 1223efcef8 SpiderMonkey 38 upgrade: 08/35
Update ObjectToIDMap to the ESR38 version and use the unbarriered
tracers. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1052388

This was SVN commit r18662.
2016-09-02 16:22:42 +00:00
Itms 548601b2d8 SpiderMonkey 38 upgrade: 07/35
Use operator[] instead of handleAt. Patch by leper.
Addresses https://bugzilla.mozilla.org/show_bug.cgi?id=972385

This was SVN commit r18661.
2016-09-02 16:21:03 +00:00
Itms 4b028508ae SpiderMonkey 38 upgrade: 06/35
Check for the new SpiderMonkey version.

This was SVN commit r18660.
2016-09-02 16:19:31 +00:00
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