dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-07-04 05:55:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions
17295 commits 1 branch 39 tags 169 MiB
Commit graph

17295 commits

This branch
This branch
All branches
Author SHA1 Message Date
elexis
ab67d1a6f3 Delete gui/common/init.xml. 
It became almost unused throughout the years and just causes confusion
when reading include lists.

Refs D619.

This was SVN commit r19780.
 2017-06-15 22:11:48 +00:00
elexis
18b876bd55 Delete common/l10n.js. 
It held resource strings when introduced by 0f21151c4b, but those were
moved to json files in 52f311da2b. 9b041467a2 moved two trivial
functions of this file to tooltips.js.
Remove a wrong comma from the JSdoc comment.
Alwas return a string.

Differential Revision: https://code.wildfiregames.com/D618
Confirmed by Itms in a forum PM that this doesn't break string freeze.

This was SVN commit r19779.
 2017-06-15 20:42:03 +00:00
mimo
4ca1379bd9 petra: additional tunings following d5dcb0c61e + fix a warning when army defense 0 is turned into an attack 
Differential Revision: https://code.wildfiregames.com/D632
This was SVN commit r19778.
 2017-06-15 19:50:17 +00:00
Itms
860b5bbfce Revert an unfortunate early break introduced in 2527aabd5d, patch by Sandarac. 
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D641
This was SVN commit r19777.
 2017-06-15 17:45:16 +00:00
mimo
0179915f21 remove an unused computation in petra 
This was SVN commit r19775.
 2017-06-14 17:40:58 +00:00
Imarok
b94a54b18a Use direct gui.scale instead of reciprocal gui.scale 
Patch by Dariost.

Differential Revision: https://code.wildfiregames.com/D328
This was SVN commit r19774.
 2017-06-14 17:13:44 +00:00
Imarok
2729596624 Gamesetup - Hide mapfilter option if there are no maps matching the filter 
Reviewed by: elexis. Fixes: #4423.
Differential Revision: https://code.wildfiregames.com/D365
This was SVN commit r19773.
 2017-06-13 09:42:16 +00:00
elexis
9b041467a2 More comfortable and safe resource name translation without breaking translation freeze. 
Throw a reference error instead of silently using an untranslated string
if someone would have passed a non-existing translation context.
Throw a property undefined warning if someone passed a non-existing
resource when trying to translate it.
Both warnings had been introduced in 0f21151c4b, were removed by
52f311da2b but now occur without adding code explicitly.

Differential Revision: https://code.wildfiregames.com/D625
Reviewed By: s0600204
This was SVN commit r19771.
 2017-06-13 03:12:51 +00:00
elexis
ca9b3799b4 Remove an unneeded complicated resource-not-found warning in the ResourceSupply component which is already covered by template validation. 
It was a leftover from s0600204's proposal from 52f311da2b (refs #3934)
to disable resources with a boolean property.

Differential__Revision: https://code.wildfiregames.com/D625
Reviewed By: s0600204
This was SVN commit r19770.
 2017-06-13 03:11:43 +00:00
elexis
74512ef01c Remove emptyinit.xml workaround file for atlas introduced in abaea508ac that silenced an engine warning stating that the GUI page doesn't provide a JS init function. 
Still throw that error if the function exists but could not be called
with JS_CallFunction.

Differential Revision: https://code.wildfiregames.com/D620
This was SVN commit r19769.
 2017-06-13 02:50:41 +00:00
elexis
28de0fc775 Fix undefined resource warnings in 33b331f9fa / D23 (that occur in filter functions but not if statements) reported by fabio. 
Fixes #4629
Differential Revision: https://code.wildfiregames.com/D629
Reviewed By: s0600204
This was SVN commit r19768.
 2017-06-12 15:15:43 +00:00
elexis
f3a00b9e65 Train bireme at the briton crannog for consistency with the regular dock and allow researching the town phase at a captured one. 
Differential Revision: https://code.wildfiregames.com/D627
Reviewed By: mimo
This was SVN commit r19766.
 2017-06-11 16:46:08 +00:00
Imarok
707897e5af Correctly init the statistics sequences. 
Fixes #4620. refs 4a0673e44e, 31a41ab735. Reviewed by: elexis.
Differential Revision: https://code.wildfiregames.com/D616
This was SVN commit r19765.
 2017-06-11 16:06:07 +00:00
elexis
03550f7595 Fix whitespace and lineendings in few recent commits. 
This was SVN commit r19763.
 2017-06-11 00:51:11 +00:00
elexis
33b331f9fa Correct resource order in the GUI. 
Differential Revision: https://code.wildfiregames.com/D23
Reviewed By: s0600204
This was SVN commit r19762.
 2017-06-11 00:17:59 +00:00
mimo
e8008aa4fa fix error in 57fbcab3bf spotted by Sandarac, fixes #4627 
This was SVN commit r19761.
 2017-06-10 08:16:16 +00:00
elexis
561f66600c Actually display the gamesetup autocomplete tooltip string from D322 / b4e5858f6d. 
Reported by echotangoecho.

This was SVN commit r19760.
 2017-06-10 01:21:50 +00:00
elexis
f882bfd56a Remove lobby MapPlayerList style from bffe917914 which overshadows the duplicate theme from common/ (only difference was scroll_bottom which isn't helpful). 
This was SVN commit r19759.
 2017-06-09 22:04:30 +00:00
elexis
17e26fae99 Remove unused deprecated label styles following 0cd825e552 (that if ever used again, should be added to a directory for that specific theme). 
This was SVN commit r19758.
 2017-06-09 21:55:33 +00:00
Imarok
6de6ae66d3 Fix selected graphs in summary always reset, when switching tabs 
Patch by: mmoanis, Fixes: #4555
Differential Revision: https://code.wildfiregames.com/D599
This was SVN commit r19757.
 2017-06-09 17:08:49 +00:00
mimo
57fbcab3bf petra: fix a side effect of d5dcb0c61e 
Differential Revision: https://code.wildfiregames.com/D607
This was SVN commit r19756.
 2017-06-09 17:07:50 +00:00
mimo
395fe8a86d Petra: do not create trade route crossing enemy territory 
Differential Revision: https://code.wildfiregames.com/D600
This was SVN commit r19755.
 2017-06-09 17:04:50 +00:00
elexis
81088344cb Purge embarassing typo in 026dcf10eb / D204 that made gaia ships on Danubius ignore instead of focus players ships. 
This was SVN commit r19752.
 2017-06-09 00:06:45 +00:00
Imarok
b2801979c8 Fix typo in a397f9bccb. 
This was SVN commit r19751.
 2017-06-08 21:12:55 +00:00
elexis
1af6203b9c Stop spawning gaia attackers from civic centers if these were captured (not only upon destruction). 
Differential Revision: https://code.wildfiregames.com/D608
Refs D380 /d724347812
Reviewed By: fatherbushido
This was SVN commit r19750.
 2017-06-08 15:10:30 +00:00
elexis
bb3638a9b5 Always set the Seed property from autostarted games, because it is required and used to initialize the RNG of the simulation following 6eaf76d653. 
Differential Revision: https://code.wildfiregames.com/D592
Refs #4127, #3965

This was SVN commit r19749.
 2017-06-08 14:47:55 +00:00
elexis
1e1ba6e284 Alternative player placement on River Archipelago: left strip vs right strip. 
Differential Revision: https://code.wildfiregames.com/D610
Reviewed By: FeXoR
This was SVN commit r19748.
 2017-06-08 12:16:59 +00:00
elexis
5d4cff9ec4 Remove fake minimum attack distances. 
These structures can always attack near enemies because the minimum
attack range is within the building obstruction.
Thus prevent the minimum attack distance tooltip from D267 to show
misleading numbers, refs D111.
Remove the effective minimum attack distance of the hero cavalry archer
too for consistency with all other units following 5f78bb7318.

Differential Revision: https://code.wildfiregames.com/D611
Reviewed By: fatherbushido
This was SVN commit r19747.
 2017-06-08 11:39:45 +00:00
fatherbushido
6d9e9bc54c Fix a broken texture call in an atlas only actor. Follow up of 5f67763e97. Refs #3796. 
This was SVN commit r19746.
 2017-06-08 07:42:20 +00:00
mimo
9b7dfdaa23 remove some unused AI var and rename a function to better reflects its use 
This was SVN commit r19745.
 2017-06-07 18:26:15 +00:00
elexis
15408203b2 Reload gamesetup maplist each GUI update (as was the case before D322 / b4e5858f6d), fixes a bug reported by causative (the clients always showed Map: Unknown). 
This was SVN commit r19742.
 2017-06-05 20:57:43 +00:00
elexis
b19612c31a Fix whitespace and three refs instead of copies in the glooxwrapper/StunClient code identified by leper in 61261d14fc. 
This was SVN commit r19741.
 2017-06-05 20:44:00 +00:00
mimo
766f3ee8f5 petra: fix 72f6e02747 when a unit is promoted the same turn the attack is launched 
Differential Revision: https://code.wildfiregames.com/D601
This was SVN commit r19740.
 2017-06-05 14:13:31 +00:00
mimo
3a75da6008 petra: following d5db047c9a, avoid to choose a decaying structure as target 
Differential Revision: https://code.wildfiregames.com/D586
This was SVN commit r19739.
 2017-06-05 13:50:20 +00:00
Imarok
57b6e6a2bd Change toggle buddy button caption dynamically 
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D578
This was SVN commit r19736.
 2017-06-04 22:25:54 +00:00
Itms
b6beb07255 Improve the strings from 6b743e30b3. 
Reviewed by: scythetwirler, elexis
Differential Revision: https://code.wildfiregames.com/D603
This was SVN commit r19735.
 2017-06-04 21:47:36 +00:00
Itms
e59a304358 Reveal the Alpha 22 name! 
This was SVN commit r19734.
 2017-06-04 21:30:40 +00:00
Itms
4d31ff14eb Spelling corrections for Gauls. 
Rename Britomartus to Viridomarus.
Patch by Phormio.

Differential Revision: https://code.wildfiregames.com/D493
This was SVN commit r19733.
 2017-06-04 20:59:55 +00:00
Itms
2527aabd5d Fix hero selection rings becoming unsaturated when moving. Patch by Sandarac, refs 0a53c5e06a, #2627. 
Differential Revision: https://code.wildfiregames.com/D563
This was SVN commit r19732.
 2017-06-04 13:04:04 +00:00
mimo
a63d7cc430 fix tutorial not translated 
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D602
This was SVN commit r19730.
 2017-06-04 12:23:48 +00:00
mimo
ba10046350 revert some unwanted changes in previous commit 
This was SVN commit r19728.
 2017-06-03 19:01:38 +00:00
mimo
e9e7922b5d Don't send useless "Invalid command" debug warnings when regaining capture points 
Patch by Sandarac

Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D430
This was SVN commit r19727.
 2017-06-03 18:59:21 +00:00
Itms
db0570e71e String changes, based on feedback from translators. 
Reviewed By: Phormio
Differential Revision: https://code.wildfiregames.com/D561
This was SVN commit r19726.
 2017-06-03 16:30:18 +00:00
fatherbushido
67d0a6a2ad Cleanup of 8387195fd2: use relative templates and change prepare times. Noticed by elexis. 
This was SVN commit r19725.
 2017-06-03 16:14:26 +00:00
elexis
0a1d669a0b Reduce rabbit health from 100HP to 10HP to make them more realistically huntable and have them consistent with chicken (5HP). 
Increase footprint slightly for both artistic and gameplay reasons.

Differential Revision: https://code.wildfiregames.com/D562
Patch By: borg-
Refs #3786, D540

This was SVN commit r19723.
 2017-06-03 01:11:52 +00:00
elexis
ac6ca9d50a Prevent animals and resources on lava on Pompeii. 
Refs: https://code.wildfiregames.com/D588
Patch By: Phormio
This was SVN commit r19722.
 2017-06-03 00:49:36 +00:00
elexis
dd9a8706f9 Complete the move of random number helper functions from the random map library (0e0ed94926, refs #6) to globalscripts. 
Differential Revision: https://code.wildfiregames.com/D596
Patch By: bb
3c56638e8b introduced pickRandom and its petra chat application,
08fbf223f6 used the randFloat function more often, introduced randBool
and randIntInclusive/Exclusive
        to replace randInt (whose behavior and argument meaning depended
on the number of arguments) calls in the GUI and simulation,
ddfc985586 changed randInt to pickRandom for random maps,
da2b89583a introduced randBool with a probability and replaced
deprecated randInt calls for random maps,
175cded64a replaced randInt calls with randIntInclusive/Exclusive for
random maps except the Unknown,
a227a7f45b removed optional arguments of randFloat,
this commit replaces the remaining occurances in the Unknown maps,
thus fixes #4326 (old patch from refs #3102).

This was SVN commit r19721.
 2017-06-03 00:28:34 +00:00
elexis
467824e727 Fix JSdoc, a missing explicit return, a missing warning, a typo and a jshint redeclaration warning of one rmgen2 function. 
Fixes #4608
Differential Revision: https://code.wildfiregames.com/D593
Reviewed By: mimo
This was SVN commit r19720.
 2017-06-02 22:25:33 +00:00
elexis
01710cd0be Rename the late observer setting "no one" to "disabled". 
Revert the unintentional revert of 9b28ce3463 in 31d1536e52.

Differential Revision: https://code.wildfiregames.com/D583
Reviewed By: causative
This was SVN commit r19719.
 2017-06-02 22:11:05 +00:00
elexis
51f62818f7 Fix all broken checks for the absent (random-mapgen+simulation) Seed property in the engine, refs #3965. 
Hence display the originally intended useful warnings (instead of the
characterless JS "Script value conversion check failed" warning and
skipping the intended warnings).

This was SVN commit r19718.
 2017-06-02 15:07:58 +00:00