upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-06 01:17:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,732 Commits 60 Branches 374 Tags
Commit Graph

947 Commits

Author SHA1 Message Date
josteph
093fbc82fd Help: Show special notes one per line. 
https://forums.wesnoth.org/viewtopic.php?f=12&t=49621
 2019-03-25 22:40:00 +00:00
josteph
5502f7abe0 Fix #2677: Make SUMMER_SCHEDULE and WINTER_SCHEDULE use {MIDDAY} and {MIDNIGHT} images of the same graphic style as the images of the other times of day. 
Images by @beetlenaut https://forums.wesnoth.org/viewtopic.php?p=633042#p633042
 2019-03-24 15:15:26 +00:00
newfrenchy83
550c686e7b fix value={CTH_NUMBER} forget in force CTH macro 2018-12-14 08:28:12 -06:00
mattsc
afb394c4b1
Merge pull request #3723 from mattsc/rca_ai_changes 
Default AI changes
 2018-12-02 08:42:42 -08:00
mattsc
c0bc8c548c AI: deprecate ai_depth related macros 2018-11-16 06:47:54 -08:00
Celtic Minstrel
866420adf8 Redesign force cth macro 
Closes #3707
 2018-11-15 21:17:04 -05:00
mattsc
8c8cafaa70 Deprecate EXPERIMENTAL_AI macro 2018-11-15 06:46:41 -08:00
Celtic Minstrel
639787e1c9 Merge pull request #2562 from wesnoth/schema 2018-11-11 13:52:19 -05:00
newfrenchy83
5d6a6c0de1
Fix grammar in cth macro 
Also fix whitespace errors from edab243b9d4e5bbac8b10e28fb0237e201392071 -- GL

Closes #3694
 2018-11-07 15:32:22 -06:00
newfrenchy83
edab243b9d
Fix rare bug in FORCE_CHANCE_TO_HIT 
If in attack end in FORCE_CHANCE_TO_HIT macro, unit or second unit doesn't exist anymore because rare case where unit disapear before attack end event was calledthen we have an error message like "Invalid WML found: [unstore_unit]: variable 'second_unit' doesn't exist" because presence of unit not condition of execution of event.
 2018-11-06 15:15:40 -06:00
josteph
801e1c6234 WML: {REMOVE_LABEL} now takes an optional EXTRA_WML argument. 2018-11-03 18:16:43 +00:00
Celtic Minstrel
420afdf88e Deprecate {AI_CONTROLLER} and related macros (addresses #3668) 2018-11-02 23:54:53 -04:00
Celtic Minstrel
bd2bf467a3 Add missing deprecation messages for deprecated macros 
This also bumps ON_SIGHTING to level 2.
(cherry picked from commit f550f2d6f54778ae44560b3e1e2602064d63a9de)
 2018-10-28 02:53:03 +00:00
Celtic Minstrel
fb7dce076f Use WFL instead of Lua code for {SCATTER_EMBELLISHMENTS} 2018-10-23 22:41:52 -04:00
Celtic Minstrel
ea9d483149 [effect]apply_to=new_animation does not support name 
It does support id though, which is used as a sort of caching mechanism
in case the same effect is applied many times, so use that instead of name.
For good measure, also use an id on the sceptre of fire animation
 2018-10-23 22:41:48 -04:00
Celtic Minstrel
0fba06c977 Remove animate=no from {GUARDIAN} 
This is the default in [unit] anyway, and if the user specified
animate=yes explicitly then we should not override that.
 2018-10-23 22:41:38 -04:00
Celtic Minstrel
e2bc73b27b Add omitted final [] to [modify_ai] paths in core macros and UtBS 2018-10-23 22:40:01 -04:00
Celtic Minstrel
c2c540fa15 Fix error in AI control core macros 2018-10-23 22:39:49 -04:00
Celtic Minstrel
703d0c3cf4 Fix erroneous/useless [event] in [titlescreen_music], [lobby_music], [editor_music] 
The playlist macros set the music list twice, once before the
story screen and again in prestart, but the order of tracks is different.

This means that the track order at the titlescreen and in the lobby is now the same
as the track order in a scenario using the default playlist, which previously was not the case.

Similarly, the track order in the editor is now the same as the track order
in a scenario using the full playlist.

Whether that actually matters? I have no idea. I doubt it.

In any case, as of this commit, there are no schema validation errors
at the title screen, when entering the MP Create screen, or in the map editor.
 2018-10-23 22:38:19 -04:00
Severin Glöckner
c48735c0fb Core Macro Reference: Fix hint 
[ci skip]

(cherry-picked from commit 00e41b9857e8dfdb5f603fe7d91a1a6e0725b8c7)
 2018-10-07 03:25:00 +00:00
Severin Glöckner
5ad321654b core macros: don't clear nonexistant variable 
A leftover from the switch from {FOREACH} to [foreach]

[ci skip]

(cherry-picked from commit 001b444b10977051962572a991233553bd605384)
 2018-10-07 03:24:59 +00:00
mattsc
800947594c Experimental AI: convert to using external CAs 
(cherry-picked from commit 547478571871ffe59c5cf7ff59339a72a61c07dc)
 2018-10-07 03:24:44 +00:00
Elvish_Hunter
0ccf6ae1ea Prevent wmllint from converting Dunefolk names similar to Khalifate units 
(cherry-picked from commit de99a381723dad41153917696e5468b5e0a99894)
 2018-10-07 03:24:04 +00:00
Severin Glöckner
aedd9b88b5 Macro reference: Add hint to clear variable afterwards 
[ci skip]

(cherry-picked from commit 0ca460efcdad42b5bce93a420fac725cd0105993)
 2018-10-07 03:23:38 +00:00
Severin Glöckner
e4418de7ff Change campfire timezones in UtBS S3 
Instead of having another ToD, the image of the current ToD is used,
but illuminated. This is a visual change, no gameplay changes included.

The ToD shifting for 'dawn' looked better than for 'dusk', and was
conidered better looking than having no ToD shift compared to the
surrounding.

part of #3056

[ci skip]

(cherry-picked from commit c7d8d232563e665cdfc0bcde201d780a511a4d93)
 2018-10-07 03:23:12 +00:00
Steve Cotton
1aa974a250 Prose: the Storm Trident's description uses "merfolk" (issue #2936) 
Also update Dead Water's copy of it to use race= instead of a
list of unit types (as done for the core object in 613dd431).

(cherry-picked from commit ad7bc19dd98990b443bd5037952ff612dce502af)
 2018-10-07 03:22:37 +00:00
Severin Glöckner
13e16b473f name generators: update translation hint 
[ci skip]

(cherry-picked from commit 69f17c775d0fc73207f24cdac8db565c71b11ef2)
 2018-10-07 03:21:32 +00:00
pentarctagon
0c69e40d52 Remove deprecated Khalifate references. 
(cherry-picked from commit 994e6efa796681e0952d4aeb623adcf3cf75d1ef)
 2018-10-07 03:18:07 +00:00
Charles Dang
1340c005b3 Fixed minor text errors reported on the wiki 
[ci skip]

Added all to pofix except the extra space added before the Initiative ability's special note.
 2018-03-13 04:11:54 +11:00
Charles Dang
3a90f86674 Addressed more whitespace issues from #2613 
[ci skip]
 2018-03-12 03:48:59 +11:00
Celtic Minstrel
1cbe8d9170 Generalize the deprecated unit macro used for the khalifate 
This moves a string from one file to another, but I checked:
the textdomain was the same in both files.

So, it doesn't break the string freeze.
 2018-03-04 22:03:17 -05:00
Charles Dang
0d0bb91d99 Added a CREDITS_SEPARATOR macro 
[ci skip]

This way, UMC can use the default credit's separator in their credits sections.
 2018-03-04 02:16:53 +11:00
Charles Dang
91e0bb4911 Fixed some remaining uses of deprecated Khalifate names 
[ci skip]

Also "colour"->"color"
 2018-02-13 05:45:31 +11:00
Celtic Minstrel
ae50be5bbe Add #deprecated preprocessor directive for marking macros deprecated 2018-02-12 00:09:48 -05:00
Matthias Krüger
b11d3fdcbe fix a bunch of typos found by codespell in data directory. 
https://github.com/lucasdemarchi/codespell
 2018-02-06 23:03:06 +11:00
sigurdfdragon
264167edcf Macros: Fixup DEPRECATE_ACTION_MACRO 2018-02-03 12:39:03 -05:00
pentarctagon
5b31b87f6a MP: Renames the Khalifate to Dunefolk. 
Part of an effort to make the faction better fit into Wesnoth. See:
https://forums.wesnoth.org/viewtopic.php?f=12&t=47643
https://forums.wesnoth.org/viewtopic.php?f=12&t=47703
 2018-01-19 17:28:40 -05:00
Jeffrey 'Sigurd' Westcoat
aceabbe018 Macros: Tweak sceptre damage for story reasons (#2220) 
Sceptre (15x4) is now stronger than the uncut ruby of fire (14x4) for
regular mainline users Thursagan and Konard II. Level 3 Konrad & Li'sar
in HttT are still exceptional users of the sceptre (18x4 & 16x4).

From discussions with zookeeper in irc.
 2017-11-27 13:46:57 +02:00
Severin Glöckner
725815afa2 add an "optional objective" caption 
In case of tsg7a neither alternative nor bonus objective fits

[ci skip]
 2017-11-01 12:45:21 +11:00
sigurdfdragon
81ea433117 Macros: Fix typo 2017-10-12 20:26:33 -04:00
Charles Dang
a2653980b7 Core: wmlindent pass 
[ci skip]
 2017-09-12 19:52:10 +11:00
Celtic Minstrel
c734f56922 Update the DEPRECATED macro and [deprecated_message] ActionWML to understand deprecation levels 2017-08-14 12:36:10 -04:00
gfgtdf
e859c1da00 update mainline for [cancel_action] 2017-07-25 21:19:05 +02:00
Severin Glöckner
a31858124c removed inactive ability descriptions, since they are the same 
[ci skip]
 2017-06-28 19:26:05 +02:00
Severin Glöckner
5da21fc8ef Revert "disallow submerge on bridges and rails" 
Skeletons could hide under the bridge and climb up the moment you cross it.

This reverts commit 9ed38aab619cb66e5e8fa896496bb328172a77e9.
 2017-06-28 18:41:09 +02:00
Severin Glöckner
9ed38aab61 disallow submerge on bridges and rails 
[ci skip]
 2017-06-28 18:09:48 +02:00
Celtic Minstrel
c47b3f3208 Simplify leadership (and THoT inspire) using new ability formulas 2017-06-25 00:37:56 -04:00
Celtic Minstrel
bdb42b2848 Use WFL to implement backstab, to avoid needing delayed variable substitution 2017-06-25 00:37:50 -04:00
Celtic Minstrel
88ad4ab4cd Use WFL for teleport ability to avoid requiring delayed variable substitution 2017-06-24 19:07:56 -04:00
Celtic Minstrel
4fb25532f2 Use WFL for leadership to avoid needing delayed variable substitution 
(Similarly, also use WFL for the inspire ability in THoT)
 2017-06-24 19:07:14 -04:00