1
0
forked from mirrors/0ad
Commit Graph

16271 Commits

Author SHA1 Message Date
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 1276b98965 Argh.
This was SVN commit r18466.
2016-07-01 15:18:09 +00:00
elexis a09c59e044 Attack component cleanup.
Use .filter(), .every() and .some() to simplify, Math.max/min instead of
if-statements, inline functions, add newlines and allow attack orders
while flying.

This was SVN commit r18465.
2016-07-01 15:05:09 +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 e611dd6993 Remove unneeded population bonus tooltip strings. Patch by fatherbushido, refs dde2cd38be.
This was SVN commit r18462.
2016-07-01 10:03:14 +00:00
elexis 1e5d67b6bb Fix missing replacement in 4d9565297d. Thanks Imarok for reporting.
This was SVN commit r18460.
2016-06-30 12:30:36 +00:00
elexis b134047abe Also add a reset-teams button for consistency, refs #3805.
This was SVN commit r18459.
2016-06-30 12:03:37 +00:00
elexis b642f0d876 Persist the the valid subset of chosen player settings when changing the skirmish map. Patch by Offensive ePeen, refs #3120.
This was SVN commit r18458.
2016-06-30 10:02:32 +00:00
elexis e6e8efec1c Tooltip cleanup.
Remove duplicate arguments from the helper function to get the
template/entity data.

This was SVN commit r18457.
2016-06-30 02:12:26 +00:00
elexis ef9eb787be Remove wrong space from 4d9565297d.
This was SVN commit r18456.
2016-06-30 02:11:30 +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 30c7a2ef18 Remove gathering capacity from elephant archers as they are way too clumsy for that (as they would use the melee/slaughter attack too).
It might be unexpected in the first place to let them gather.
(However that is not really weirder than having cavalry hunt sheep.)

This was SVN commit r18453.
2016-06-29 13:35:20 +00:00
elexis a23884d79a Cache gameAttributes in the session. Patch by Imarok, refs #3143, #3263.
This was SVN commit r18452.
2016-06-29 01:45:20 +00:00
elexis 46cabf0fde Add missing JSAutoRequest calls. Based on patch by echotangoecho, refs #4053.
This was SVN commit r18451.
2016-06-29 00:00:44 +00:00
FeXoR d30ee0292b Fixes a bug in random map library placer.js function SimpleObject.place() that placed entities outside of the playable map area. Add a constant MAP_BORDER_WIDTH to remove magic numbers. Also removed some unneeded brackets in the changed files. Fixes 4012
This was SVN commit r18450.
2016-06-28 11:37:56 +00:00
FeXoR 0f1cef8766 Code cleanup of random map lib map.js.
This was SVN commit r18449.
2016-06-27 22:42:12 +00:00
wraitii 9b3ec336fe Make non-refraction water less transparent.
This was SVN commit r18448.
2016-06-27 13:50:54 +00:00
wraitii d60d7d7da6 pow is behaving in undefined ways for negative numbers and this lead to issues on nvidia and amd. Fix this and comment for future reference. Thanks to fatherbushido for the debugging help.
This was SVN commit r18447.
2016-06-27 11:36:10 +00:00
elexis e782e23ff9 Fix 8da8d28102 as it didn't update the ingame summary screen and did a wrong inline. Reported by Imarok.
This was SVN commit r18446.
2016-06-27 11:18:56 +00:00
mimo 307ed87829 petra: fix some rare case trying to attack an ally
This was SVN commit r18444.
2016-06-26 18:18:29 +00:00
wraitii ead8436b3d Improve water rendering, partly based on a patch by aeonios, including:
-increase the size of the refraction and reflection texture
-blur the refraction map depending on depth

Fixes #3781

This was SVN commit r18443.
2016-06-26 16:54:58 +00:00
wraitii a4a45e4dc4 Fix compiler warning, thanks to elexis. Refs #4056
This was SVN commit r18442.
2016-06-26 16:51:52 +00:00
elexis 9f796068f8 Win and defeat cleanup, fixes #4013.
Add a new simulation message and chat notification for players who won.
Avoid duplicate playerstate messages in the sim and GUI by triggering
changes with a function instead of a message.
Reveal the map on defeat/win exclusively in the player component
(instead of having a silly GUI proxy and doing it also in the
EndGameManager sometimes).
Remove the skipAlliedVictory argument from the player component, since
that shouldn't contain references to the EndGameManager, refs #3970.

Show a proper message box on win/loss and add the hint for hosts
disconnecting other players.
Do defeat/win procedure in the GUI when such a message arrives, instead
of checking onTick for playerstate changes.
Thus don't show that confirmation again on every rejoin.
Don't show a pointless message box if IsAtlasRunning.

Explain that the session.js variable is needed to avoid an
order-of-execution bug.
Select "observer" item when rejoining as a defeated player.
Remove an unneeded call to updateTopPanel.

This was SVN commit r18441.
2016-06-26 04:40:50 +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
wraitii 898ab5229b Change profiling calls to get a better view of what is actually slow and what is not.
This was SVN commit r18438.
2016-06-25 13:12:35 +00:00
FeXoR d2e081b602 Separate getFullEntityList() - gathering all entities placed until now on a random map in a list - from getMapData(). Preparation for committing collision detection and beautifier patches. Fixes #4068
This was SVN commit r18437.
2016-06-25 12:00:06 +00:00
wraitii be1b5a9fa7 Improve Profiler2 JS interface with multiple threads and frameless threads. Add a setting to the analysis graphs. Refs #4056
This was SVN commit r18436.
2016-06-25 10:12:04 +00:00
wraitii c886206d96 Fix crash after opening profiler2 with GPU profiling following 3cbe96d24c. Refs #4056
This was SVN commit r18435.
2016-06-25 09:11:10 +00:00
mimo 98f8541581 remove a useless leftover var
This was SVN commit r18434.
2016-06-24 18:03:19 +00:00
elexis d8e9642d09 Fix lineendings of all files in simulation/.
This was SVN commit r18433.
2016-06-24 12:39:22 +00:00
elexis 989df9cb3b Fix lineendings of JS simulation components.
This was SVN commit r18432.
2016-06-24 12:23:39 +00:00
elexis b8fbfe2d20 Survival of the fittest cleanup. Based on patch by bb, refs #3102.
Show notificaiton to all players and observers.
Whitespace fixes.
let instead of var.

This was SVN commit r18430.
2016-06-23 22:37:42 +00:00
mimo 9c980173e3 petra cleanup
This was SVN commit r18429.
2016-06-23 18:25:27 +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 89fd897fd9 Buff quinquereme, especially the garrisoning of expensive catapults. Patch by causative, fixes #4065.
This was SVN commit r18427.
2016-06-23 13:20:46 +00:00
wraitii 95d3612b68 Fix Profiler2 calls in UserReport.cpp, which lead to multiple Leave events being recorded without corresponding enter events. Possible fix for the linux crash of profiler2.
This was SVN commit r18426.
2016-06-23 10:01:31 +00:00
wraitii 490ee7387f Fix a double to float coercion and JS errors with empty threads in Profiler2 . Refs #4056
This was SVN commit r18424.
2016-06-22 16:46:49 +00:00
wraitii 3cbe96d24c Revamp Profiler2 to make it more usable.
Features include new graphs to compare runtime of functions and runtimes
across reports, as well as new profiling functions that only profile
spikes.

This was SVN commit r18423.
2016-06-22 13:38:05 +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
elexis 2735494a92 Configurable batch size when training units. Patch by Sandarac, fixes #4059.
This was SVN commit r18421.
2016-06-22 11:13:40 +00:00
niektb 70417715be Enhanced autumn trees from Delenda Est. Related forum topic: https://wildfiregames.com/forum/index.php?/topic/20833-autumn-tree-content-mod/#comment-317651
This was SVN commit r18420.
2016-06-21 15:45:14 +00:00
elexis 0f807c643a GUI cleanup.
Point out missing functionality and unused properties in the
implementation of checkboxes.
Don't specify a useless font tag for checkboxes in the templates.

This was SVN commit r18419.
2016-06-21 14:38:06 +00:00
wraitii 9e526614be Accidentally left a change from #4056 in in 7c21a0cf8e.
This was SVN commit r18418.
2016-06-21 11:13:00 +00:00
wraitii 7c21a0cf8e Header cleanup: profile.h is no longer unnecessarily included in scriptinterface.h but rather in the required .cpp files
This was SVN commit r18417.
2016-06-21 10:33:11 +00:00
elexis bc40ebb97e Improve bartering GUI responsiveness and immediately switch to the selected resource instead of waiting one turn. Refs #3194.
This was SVN commit r18416.
2016-06-21 09:34:26 +00:00
elexis 4fde34c168 Revert be5f2d2bb5 since the implicit conversion throws a warning.
This was SVN commit r18415.
2016-06-21 00:06:14 +00:00
mimo 600f21578f cleanup of some replay and savedgame stuff
This was SVN commit r18414.
2016-06-20 17:43:16 +00:00
elexis be5f2d2bb5 Remove an unneeded String() conversion.
This was SVN commit r18413.
2016-06-20 16:09:57 +00:00