1
0
forked from mirrors/0ad
Commit Graph

11098 Commits

Author SHA1 Message Date
mimo af85c1bfdc change the diminishingReturns (used for farms) to make it more intuitive and mod-friendly, reviewed by fatherbushido, fixes #4356
This was SVN commit r18985.
2016-11-22 18:34:37 +00:00
elexis 0b03713b3b Unify duplicate patrol target types hardcodings. Reviewed by fatherbushido long ago, refs #4253.
This was SVN commit r18983.
2016-11-22 12:46:46 +00:00
elexis c390dee14c Hide the resources of defeated allies in the top panel tooltips, refs #3841.
This was SVN commit r18982.
2016-11-22 12:36:13 +00:00
elexis fd5ba1e882 Timer component cleanup. Patch by Stan, fixes #4158.
Use objects instead of arrays to achieve more readable code.
Use two for-of loops, a continue instead of an if-else pattern and
remove an unneeded variable dt.

This was SVN commit r18981.
2016-11-22 12:28:22 +00:00
elexis f391f113f9 Fix wall-placement cost tooltip, refs #3934.
This was SVN commit r18980.
2016-11-22 11:55:28 +00:00
Imarok a8b9416725 Colorize selected units in observermode, reviewed by elexis, fixes #4167
This was SVN commit r18979.
2016-11-21 21:35:26 +00:00
mimo 91c7805dec move the diminishing returns computation from the ResourceGatherer to the ResourceSupply component, reviewed by fatherbushido, refs #4356
This was SVN commit r18978.
2016-11-21 18:29:40 +00:00
elexis 1b20ac7671 Remove silencing of resource-not-found errors (that were introduced with an enabled property in the JSON resource files that got removed later). Refs #3934.
This was SVN commit r18977.
2016-11-21 17:32:17 +00:00
elexis 552f7043b0 Disable all unusable structures on survival of the fittest, refs #3102.
Prohibit gathering of wood by removing storehouses and the worker
elephant.
Keep the roman army camp allowed for now because it isn't a dropsite.
Always spawn at least one attacker in the first wave.

This was SVN commit r18976.
2016-11-21 17:28:21 +00:00
LordGood 7cb3fe8eff hidden texture loader actor in the carthaginian CC to prevent loading on damage
This was SVN commit r18972.
2016-11-20 22:02:18 +00:00
LordGood 0fa69f9983 Seleucid main menu background
This was SVN commit r18968.
2016-11-20 20:02:41 +00:00
LordGood 78e31116f7 Carthage themed background variant commit
This was SVN commit r18967.
2016-11-20 01:19:43 +00:00
elexis 3653925a00 Gatherrate tooltip rework.
Display the gatherrate tooltip in the selection details.
Remove structure tree specific gatherrate parsing code.
Receive the data directly from Templates.js and GUIInterface.js like the
other tooltips do.
Add TODO about the tooltip lying (averaging over the subtypes).

This was SVN commit r18966.
2016-11-19 14:34:02 +00:00
elexis f66a202cb0 Remove unused milk food subtype.
This was SVN commit r18965.
2016-11-19 14:30:32 +00:00
elexis 52f311da2b Merge resource agnostic branch by s0600204, fixes #3934.
Remove all occurances of hardcoded resources in the simulation, GUI and
AI code by
specifying resources as JSON files in a new simulation subdirectory and
accessing them through a globally defined prototype.

This was SVN commit r18964.
2016-11-19 14:29:45 +00:00
fatherbushido 79f3cae70d Add missing Mercenary visible classes to thracian mercenaries templates.
This was SVN commit r18962.
2016-11-19 08:25:56 +00:00
fatherbushido 85e68d4c0e Remove useless Rollover element from Identity schema. Fix a related unit template.
This was SVN commit r18961.
2016-11-18 20:05:38 +00:00
elexis b83d5eb63c Fix a test failure on SM45. Patch by leper, fixes #4353.
This was SVN commit r18959.
2016-11-18 09:43:54 +00:00
fatherbushido 527a7bc9b6 Clean some templates with useless Identity entries.
This was SVN commit r18956.
2016-11-17 09:23:58 +00:00
mimo 6efd5ea505 petra: some more adjustements for lastManStanding games
This was SVN commit r18955.
2016-11-16 19:35:12 +00:00
elexis 65fae7f965 Rename clStone to clRock, to be consistent with all other maps. Reviewed by FeXoR on 2016-10-29.
This was SVN commit r18954.
2016-11-16 14:05:54 +00:00
elexis d999fc4be5 Prevent collisions of straggler trees with mines. Reviewed by FeXoR on 2016-10-29.
This was SVN commit r18953.
2016-11-16 13:57:04 +00:00
elexis 827ee03cc0 Random map fortress generation code cleanup.
Create target objects in a single statement where possible, to highlight
the absence of self-reference.
Separate arrays of hardcoded templates from the logic.
Use loops to remove duplicate statements.
Add scopes to the new code to show and enforce that some variables are
indeed local.

This was SVN commit r18952.
2016-11-16 13:40:40 +00:00
elexis 5f97892814 Don't overwrite skipFirstWall of placePolygonalWall with true if false were given.
This was SVN commit r18951.
2016-11-16 12:48:24 +00:00
elexis 8efe5baf64 Further increase metal cost and train time of Spartan Skiritai swordsmen (0b2f0ea042), in agreement with borg, Vercingetorix and Hannibal Barca.
This was SVN commit r18950.
2016-11-16 10:31:30 +00:00
elexis d623a73f9f Remove structure tree helper function that was never used since 932dbc7221.
This was SVN commit r18949.
2016-11-16 10:07:08 +00:00
LordGood 95fa246b82 Aura icon for farm penalty around CC
This was SVN commit r18948.
2016-11-15 23:18:36 +00:00
elexis 64878bb416 Order the lobby gamelist by the number of playerslots instead of the ratio of online and total players. Reviewed by scythetwirler.
This was SVN commit r18947.
2016-11-15 21:59:16 +00:00
mimo 8243803f14 AI: clean some deprecated functions following f352e2c725
This was SVN commit r18946.
2016-11-15 19:50:36 +00:00
mimo f352e2c725 AI diplomacy support for lastManStanding, patch by Sandarac, tests reviewed by elexis, fixes #4143
This was SVN commit r18945.
2016-11-15 18:48:20 +00:00
elexis a96335fad1 Regression tests for all aura types. Patch by fatherbushido, fixes #4124.
This was SVN commit r18944.
2016-11-15 16:30:10 +00:00
elexis d6fa0c4255 Partial EndGameManager test by Sandarac, refs #4143.
This was SVN commit r18943.
2016-11-15 15:10:14 +00:00
elexis aa26863d5c Fix an OOS on rejoin caused by ParamNode.cpp using an invalid node cache. Patch by leper, fixes #4316.
Reuse the temple of vesta inheritance from 06bf79b7e8 which was affected
by this bug.

This was SVN commit r18942.
2016-11-15 14:01:15 +00:00
elexis 3008533c8e Add a template manager test that reveals an inheritance error in ParamNode.cpp which can trigger an OOS on rejoin. Patch by leper, refs #4316.
This was SVN commit r18941.
2016-11-15 13:51:29 +00:00
LordGood 9a4fcd55a8 Very large art commit, hopefully I don't break anything
foundations and construction sites, not-yet-implemented animations,
briton walls, fortress, and textures
Carthaginian buildings, destruction variants

This was SVN commit r18939.
2016-11-15 00:09:04 +00:00
wraitii cc4d68c68d micro optimisation of water shader
This was SVN commit r18938.
2016-11-14 23:41:48 +00:00
elexis a89f521e08 GUI cleanup.
Remove sprintf from untranslated error messages, unneeded braces and
comments, add missing quotes.

This was SVN commit r18934.
2016-11-14 13:43:27 +00:00
elexis 34ce0f865d Reset the cursor when opening new GUI pages. Patch by danger89, refs #539.
Remove duplicate cursor image and duplicate hardcoded default paths.

This was SVN commit r18933.
2016-11-14 13:23:07 +00:00
elexis ceecd948e2 Move that string to another transifex resource while not in string freeze, 58a8380dd9, f37faa57e3.
This was SVN commit r18931.
2016-11-14 09:22:38 +00:00
elexis 9dca10e32f Remove two pointless references and fix a typo. Patch by fatherbushido, refs #4276.
This was SVN commit r18929.
2016-11-14 01:44:17 +00:00
elexis 59edc42042 String extension for the will to fight upgrade following 5e88ae118a / 1f8c75db08.
This was SVN commit r18928.
2016-11-14 00:28:10 +00:00
Imarok 448bf31b15 Disable upgrade buttons to observers. Reviewed by elexis. Fixes #4302 Refs #2706
This was SVN commit r18927.
2016-11-13 22:31:04 +00:00
Imarok e256d85305 Disable right-click playercommands to observers. Patch by elexis. Refs #4302.
This was SVN commit r18926.
2016-11-13 18:03:23 +00:00
FeXoR 93aefe0787 Split the 1D and 2D interpolation into 2 Functions. Renamed BicubicInterpolation.js to interpolation.js. Original patch by Vladislav. Reviewed by fatherbushido. Fixes #4218
This was SVN commit r18925.
2016-11-13 17:34:08 +00:00
mimo 1a05eba451 petra: do not steal ally's cattle when inside its territory, fixes #4331
This was SVN commit r18923.
2016-11-12 13:12:20 +00:00
mimo fe01a710a5 implement ptol civ bonus and optimization of ResourceTrickle component, refs #4082
This was SVN commit r18920.
2016-11-11 12:46:25 +00:00
elexis e55ee5048e Bump version number to Alpha 22.
Remove "new" keyword from Alpha 21 maps.
Remove "new pathfinder" hint from Alpha 19, as reported by fcxSanya.
Show chat timestmaps by default.

This was SVN commit r18919.
2016-11-11 01:46:12 +00:00
elexis 41a338ca3e Translate the reveal map cheat notification following the lift of the string freeze.
This was SVN commit r18918.
2016-11-11 01:16:55 +00:00
elexis 01b667ab86 Invincible women on survival of the fittest to prevent women fights and cheap tower kills. Based on patch by bb, refs #3102.
This was SVN commit r18915.
2016-11-06 03:11:04 +00:00
elexis 9468cfdc8c Don't use black for gaia on survival of the fittest, refs #3102.
Some GUI elements use white until the first diplomacy change.
The choice black is confusing, problematic as there is a dark gray
player color and
problematic as black words in the chat have no contrast to the black
background.
Changing playercolors in running games is a questionable feature, thus
don't attempt to inform the GUI via a GUIInterface notification now.

This was SVN commit r18914.
2016-11-06 02:16:40 +00:00