1
0
forked from mirrors/0ad
Commit Graph

273 Commits

Author SHA1 Message Date
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
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 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
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
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
elexis edd5d20733 Hide unassigned hotkeys. Patch by Imarok, refs #3051.
This was SVN commit r18570.
2016-07-30 16:30:07 +00:00
elexis 9c4344a940 Acoustic notification when someone mentions the name of the player in the lobby or game chat. Patch and soundfile by andy5995.
This was SVN commit r18545.
2016-07-21 15:31:39 +00:00
elexis c84d41dc41 Hide walk speed tooltip for unpacked siege engines.
This was SVN commit r18538.
2016-07-21 00:04:42 +00:00
elexis d7d0a7f869 Submit and display more information about matches in the lobby. Patch by Imarok, refs #3476.
Includes team numbers, online/offline- and won/defeated state, AI type
and difficulty for running games and
only the playernames with observer-player distinction in the gamesetup.
Use JSON format inside the XML stanza and minimize traffic by packing
teams.

Use the observer distinction to correctly apply the "full games" trigger
in the lobby, fixes #3143.

XPartaMupp patch applied by scythetwirler.
unescapeText function by sanderd17, refs #3409.

This was SVN commit r18534.
2016-07-20 16:04:23 +00:00
elexis 2feeda802d Show the garrisoned healrate in tooltips, revealing not necessarily intuitive rates for special buildings and ships.
This was SVN commit r18529.
2016-07-19 13:19:37 +00:00
elexis 8f0439b016 Remove one array with hardcoded resources used for icons in tooltips. Patch by s0600204, refs #3934.
This was SVN commit r18494.
2016-07-07 01:32:41 +00:00
elexis 22b72a362b Splash damage tooltip.
This was SVN commit r18477.
2016-07-03 04:08:52 +00:00
wraitii b2f4b0f494 Allow entities to upgrade into other entities.
This new components allows giving the upgrade a cost, required
technologies, and a required time.
Implement gates using this generic component.
Fixes #2706

This was SVN commit r18467.
2016-07-01 19:43:26 +00:00
elexis 9d20881ef4 Update healer tooltips to also show up in the selection details with actual values from the simulation. Based on patch by fatherbushido, fixes #4026.
Also clean up the Health component.
Rename healer to heal (as that is the actual component name).
Remove the structure tree code to replace a proper Templates.js
implementation.

This was SVN commit r18464.
2016-07-01 13:32:34 +00:00
elexis bb69a6fb86 Tooltip cleanup.
Use toFixed instead of round hacks, refs #3395.
Show one more digit in the speed tooltip.

This was SVN commit r18463.
2016-07-01 10:37:01 +00:00
elexis 1114afa939 Garrison tooltips by fatherbushido.
Show how many units can be garrisoned, the number of arrows shot by
default, per unit and limit, fixes #3816.
Thus remove a lot of hardcoded numbers in the translated strings and
correct a wrong number for the mauryan ship, fixes #3904.

This was SVN commit r18455.
2016-06-30 01:31:40 +00:00
elexis 4d9565297d Tooltip overhaul.
Also contains a patch by fatherbushido for attackRateDetails and
getAttackTooltip to
not show something broken for buildingAI units that can capture, fixes
#4061 (see #4000).

Make tooltip functions uniform.
  Pass template everywhere
    instead of template.armour in getArmorTooltip
    rate in getRepairRateTooltip and getBuildRateTooltip and
    entState in attackRateDetails.
  Add an early return for every tooltip function.
    Use empty string instead of "Armor: (None)" for trees etc..
  Don't prefix tooltip return values with "\n", but let the user of that
function add them.
  Thus make tooltip concatenation much nicer (f.e. draw.js).

Use a loop instead of duplicating per damage type in damageTypesToText.
Add font functions to avoid duplicating tag code.
Merge sprintf's and inline variables.
Add few TODOs.

Fix some strings:
  Use "%(specificName)s %(fontStart)s(%(genericName)s)%(fontEnd)s")
instead of "(" + foo + ")" ...
  Use existing "%(percentage)s%%" instead of foo + "%" in
armorLevelToPercentageString.

Remove
 duplication by calling/introducing shared functions (getEntityTooltip,
getHealthTooltip, getGatherTooltip, getVisibleEntityClassesFormatted),
 unused function damageTypeDetails which was also a duplicate of
damageTypesToText,
 unused function damageValues,
 some warns that are equivalent to errors they attempt to cover up
(getAttackTypeLabel, getCostComponentDisplayIcon, getEntityNames,
getEntityNamesFormatted),
 some unused variables,
 "???" and translate("???").

Don't fix translate("Foo:") strings to avoid a lot of translation work.

This was SVN commit r18454.
2016-06-30 01:16:09 +00:00
elexis 8da8d28102 Savegame / summary screen / replay menu cleanup, refs #1090.
Savegame / replay menu selected game information:
  Show players who won the game (not only defeat).
  Show translated civs instead of the civ code.
  Use a translation for "%(team)s:\n%(playerDescriptions)s".
  Merge nearly duplicate objects passed to formatPlayerInfo.
  Merge deleteGame and deleteGameWithoutConfirmation.

Summary screen:
  Construct the summary screen title in place, not in the session, nor
replay menu.
  Remove g_Players from the replay metadata since all relevant
information is contained in the sim data.
  Split g_GameData into gui and sim.
  Access g_GameData instead of data for consistency.
  Move code from XML to JS.
  Don't use victory music when observers enter the summary screen (just
keep the current track like when exiting the game as a player).
  Rename updateObjectPlayerPosition to initPlayerBoxPositions.

This was SVN commit r18440.
2016-06-26 03:36:55 +00:00
elexis 62f4a4f7ca Lobby / gamesetup cleanup.
Translate the map "random" in the lobby.
Fix a warning in getMapDisplayName reported by echotangoecho when
hosting a lobby game and selecting the random map.
Use the right translation of that "random" map in b84b9a374a (since it's
not the maptype).
Notice mapInfoName still shouldn't be colored.

This was SVN commit r18428.
2016-06-23 14:33:28 +00:00
elexis 68bc88fb95 Savegame GUI cleanup..
Move duplicate reallyDeleteGame to shared file.
Inline getPlayerInfoText since it is used only once, refs #1090.
Merge deleteGame and deleteGameWithoutConfirmation.
Use let instead of var.

This was SVN commit r18422.
2016-06-22 11:42:43 +00:00
mimo f7ff2f2e99 improve load game UI, fixes #1090
This was SVN commit r18409.
2016-06-19 21:01:25 +00:00
elexis 09fdf716e9 Session cleanup.
Move chat window and developer overlay to a custom file.
Use String(foo) instead of ""+foo.
Remove a pointless loop and GetGUIObjectByName call in autoCompleteNick.
Remove noisy line-comments.

This was SVN commit r18399.
2016-06-17 15:38:07 +00:00
elexis 62061557db Host on arbitrary UDP ports. Patch in cooperation with Imarok, fixes #3575.
This was SVN commit r18372.
2016-06-13 16:56:14 +00:00
Itms 260f925ad9 Some fixes and improvements suggested by leper
This was SVN commit r18336.
2016-06-05 20:48:22 +00:00
elexis 248a48d88a Major network cleanup. Patch by Imarok.
Access the server from the client only, not from the GUI (except for
autostarted games).
Thereby lay the foundation for clients to setup the game (refs #3806)
and dedicated hosting (refs #3556).
Doesn't transfer nor remove the SetTurnLength showcase from 0ebe3486b6.

This was SVN commit r18322.
2016-06-04 12:08:30 +00:00
elexis 16bad4ee07 Properly handle the case of removed hotkeys in 6162c6388f, refs #3051.
This was SVN commit r18253.
2016-05-28 10:50:22 +00:00
elexis 6162c6388f Show hotkeys in the tooltips of six buttons.
This was SVN commit r18252.
2016-05-27 23:49:14 +00:00
elexis 78accf3d97 Add a button to the gamesetup to reset the selected civilizations of all players to random.
Code by Sandarac, icon by Lionkanzen, fixes #3805.

This was SVN commit r18239.
2016-05-26 22:58:30 +00:00
elexis ec1696ded3 Send a network message to update the GUI if another player pauses a multiplayer game. Patch by echotangoecho, fixes #1950.
Pause animations then and on disconnect.
Don't unpause unintentionally when closing a message box in
singleplayer.

This was SVN commit r18204.
2016-05-19 22:10:38 +00:00
elexis 9eccf5cd07 Use an actual playername instead of "You" in singleplayer, fixes #3979.
Differentiate between SP and MP name and allow editing it in the
settings.
Defaults to the OS username.
Makes sharing singleplayer replays more effective.
Also fixes a troublesome colorization of "You" in a translated sentence,
refs #3501.

This was SVN commit r18180.
2016-05-15 17:13:35 +00:00
elexis 4944d9b83c GUI / messagebox cleanup.
Remove pointless "mode" argument from messageBox and add newlines to its
calls.
Remove unused variable codes, trailing whitespace and useless comments.
Remove redundant button init code by using a loop (forEach to avoid a
closure).
Inline many unneeded variables.
Add missing translate to gamesetup_mp.js.
Quote object keys and capitalize globals correctly.

This was SVN commit r18178.
2016-05-15 04:04:31 +00:00
elexis f64f1c4ade Show a hint when failed to connect to a game stating that it is likely caused by the host not forwarding the UDP port. Patch by Stan, fixes #3570.
This was SVN commit r18176.
2016-05-15 00:37:58 +00:00
elexis f5dccae966 Display the carried resources when selecting a group of units. Patch by Imarok, fixes #3113.
Shows the information for all selected units and for all units of a
given type.
Rename g_CostDisplayNames to g_CostDisplayIcons.

This was SVN commit r18154.
2016-05-11 00:07:38 +00:00
elexis 71c441b092 GUI cleanup.
Remove a wrong translation comment.
Nuke duplicate calls.

This was SVN commit r18151.
2016-05-10 02:35:12 +00:00
elexis 983ef2ed2c Add translation context to the "Unknown" strings, allowing to chose a different translation for every occurance.
This was SVN commit r18112.
2016-04-30 14:01:07 +00:00
Itms d70062c348 Cleanup of the network code (range-based for, remove spaces between angle brackets, and other little things).
Based on a patch by elexis, fixes #3907

This was SVN commit r18091.
2016-04-24 20:48:53 +00:00
elexis b2fdfeba53 New gamesetup option enabling the host to vary the time required to win the wonder-gamemode. Patch by svott, fixes #3234.
This was SVN commit r18075.
2016-04-20 21:01:58 +00:00
elexis 62f6aa07d0 Add missing round to the armor tooltip. Patch by fatherbushido, fixes #3817.
This was SVN commit r17897.
2016-03-15 05:12:22 +00:00
elexis d61e315f4d Fix few style issues remarked by leper.
Add a unit (seconds) to the network-timeout warning.
Rename isChatAddressee to parseChatAddressee as it changes the message.
Early return for EnableOOSLog to avoid printing duplicate messages.

This was SVN commit r17895.
2016-03-15 04:37:41 +00:00
elexis 042c9a9334 Allow hosting matches with 8 players and up to 16 observers, fixes #3254.
The host can change the number of allowed observers in running games.

Make sure that joining observers won't take the "slot" of disconnected
players, fixes #3671.

Send clients a new disconnect reason "Server full" instead of letting
them timeout.

This was SVN commit r17881.
2016-03-13 16:52:00 +00:00
elexis f2ed0098ee Make the playername-deduplication ("User" -> "User (2)") optional.
Have it disabled by default to fix #3604.
Prevents players from rejoining as late-observers in case they timed-out
on the client-side but not on the server-side.

This was SVN commit r17851.
2016-03-09 15:02:38 +00:00