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

615 Commits

Author SHA1 Message Date
Charles Dang
4f68df28ff ANL: added team and enemy leader names (fixes #2442) 
[ci skip]

Also made side 9 hidden. Sevu/shiki's nicknames used with permission.
 2018-02-05 16:44:55 +11:00
Severin Glöckner
12039f3bfc MP: added some keys to scenarios with AI sides 
Namely disallow_observers and user_team_name which is displayed in debug mode

The prisoners in ANL are now allied with the player

[ci skip]
 2018-02-05 00:57:28 +01:00
Severin Glöckner
9cdd0242d5 ANL: disallow observers for AI sides 
[ci skip]
 2018-02-05 00:05:22 +01:00
Severin Glöckner
e260fe9543 6p Team Survival: fix terrain mask 
This one has been overlooked in an earlier change

(closes #2440)

[ci skip]
 2018-02-04 23:02:30 +01:00
Charles Dang
36bd8dba8a Multiplayer: wmlindent run 
[ci skip]
 2018-02-05 04:00:09 +11:00
Charles Dang
1b79cb65f2 ANL: removed a bunch of duplicate allow_player= keys 
[ci skip]
 2018-02-05 04:00:08 +11:00
Severin Glöckner
02c79cf176 Dark Forecast: lock team selection 
[ci skip]
 2018-02-04 16:27:17 +01:00
Severin Glöckner
762ec56e06 Dark Forcast: reanable solo playmode 
force_lock_settings did also force controller_lock=yes

[ci skip]
 2018-02-04 02:40:21 +01:00
pentarctagon
dc21c42683 Renames the Dunefolk(formerly Khalifate) units based on forum discussions. 
See this thread, along with a few linked within:
https://forums.wesnoth.org/viewtopic.php?f=12&t=47704

The purpose of this is both to:
a) Make the unit names more descriptive, so new players especially will have an easier time learning them and knowing what they do.
b) Make them eligible for translation, like the units of other factions are.

This commit only renames the files, along with the faction/AoH faction and wmllint.
 2018-02-04 11:46:50 +11:00
sigurdfdragon
e288be9302 MP: Simplify Dunefolk faction and era description 
Other factions lack magic users, so mentioning here it is superfluous
information. Also associated with the previous identity of the faction.
 2018-01-30 10:16:27 +11: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
ln-zookeeper
34c6fcd0fd Dark Forecast: Fix broken leader/faction/color selection, fixes #2147 2017-11-13 21:09:52 +02:00
Charles Dang
5f0bdb4c28 Made Hornshark Island Lua file an actual Lua file 
[ci skip]

Also simplified the Lua contained within. No need to create a local function just to immediately invoke it.
 2017-10-31 09:35:27 +11:00
Alexander van Gessel
523f61c6e7 Set a fallback color 
It will be used only if there are no sides, which shouldn't happen, but can.
See issue #2063.
 2017-10-04 14:24:46 +02:00
sigurdfdragon
3e9515c1d4 MP Silverhead Crossing: Fix issue #1666 2017-09-07 23:01:31 -04:00
sigurdfdragon
5c4d4896c2 MP Silverhead Crossing: Fix image not found error 2017-09-07 23:00:04 -04:00
gfgtdf
304f480813 update mainline for #1846 2017-07-26 16:43:49 +02:00
ln-zookeeper
0c92fbd10b Added force_lock_settings=yes to "A New Land" and "Dark Forecast" 
Without it, it was possible to uncheck "Use Map Settings" and make choices (such as factions, teams, turn limits) which can break the scenarios.
 2017-07-04 15:02:26 +03:00
Matthias Krüger
3ec26df495 multiplayer maps: descriptions: cleanup 
don't include mape size in the description since map selection screen already displays map size by itself.
canonicalize "XvsY" and "X vs Y" to "X vs. Y".
work around pango_text::set_markup_helper warnings about unescaped ampersands.
 2017-05-10 11:11:51 +11:00
Celtic Minstrel
8d4cf3cf62 Shorten requires where possible 2017-05-03 02:42:25 -04:00
ln-zookeeper
3f308b2f4b Used fake map border instead of void for the edges 2017-03-16 13:59:09 +02:00
ln-zookeeper
6ee43d496c Used fake map edge for the borders and thinned the cavewalls a bit 
As a result, the map size has been reduced from 40x40 to 39x38.
 2017-03-16 13:53:42 +02:00
ln-zookeeper
6be1b807ff Added one extra hex column to the right edge to make the map symmetric 2017-03-16 13:45:00 +02:00
ln-zookeeper
57cee6b09b Used the fake map border for the impassable corners of Hornshark Island 2017-03-16 13:07:12 +02:00
ln-zookeeper
a463ad7272 Improved borders of Swamp of Dread and The Walls of Pyrennis 2017-03-16 10:51:15 +02:00
sigurdfdragon
9a6663f3ec MP Aethermaw: Move message info into objectives notes 2017-03-03 01:41:03 +02:00
Charles Dang
42b53e6953 MP/Swamp of Dread: fixed incorrect case in map path (bug #25546) 
Doesn't affect all OSes, but still a problem.
 2017-02-28 16:12:26 +11:00
ln-zookeeper
a6cb91e1d7 Used the brazier embellishment terrain instead of ANIMATED_BRAZIER 2017-02-27 19:59:36 +02:00
ln-zookeeper
c599627ab9 Map update for Fallenstar Lake 
From Horus2.
 2017-02-27 19:51:58 +02:00
ln-zookeeper
fafce20db4 Added several new multiplayer maps 
Received from Horus2, with various WML changes by me. Maps by Horus2, Rigor, Mint, Dreadnough and Doc Paterson.
 2017-02-27 19:45:26 +02:00
Charles Dang
5b4482f7a8 Merge pull request #926 from sigurdfdragon/mp_knalgan_cleanup 
MP: Change handling of recruitment_pattern to match other factions
 2017-02-17 05:18:38 +11:00
gfgtdf
e1045f9b46 cleanup turn_over_advantage lua code 
- removed ugly hack to convert 'break' into 'continue'
- fixed 'color' global varible leaked
 2017-02-14 18:24:54 +01:00
sigurdfdragon
f589c4d957 MP: Change handling of recruitment_pattern to match other factions 2017-02-07 12:57:51 -05:00
ln-zookeeper
6638df53a4 Removed request to e-mail Team Survival replays to Roze 2017-01-13 11:57:18 +02:00
gfgtdf
45ce94aae3 fix unit id conflict in 2p_Hornshark_Island.cfg 
http://gna.org/bugs/?24722
 2016-11-26 14:54:21 +01:00
Gregory A Lundberg
874e568e99 Workarround MP work incomplete 2016-10-21 23:09:51 -05:00
Gregory A Lundberg
89aee83bbf 2p_Dark_Forecast Fix bugs 2016-10-21 23:09:51 -05:00
Gregory A Lundberg
edacf922fb Lua upgrade: integer indices 
As of version 5.3, Lua converts a number which as an integer value to add ".0" to the end.

Updating mainline to avoid the issue.
 2016-10-21 23:09:51 -05:00
Charles Dang
b19443483c Aethermaw: removed some excessive newlines in starting message 2016-10-13 19:32:32 +11:00
gfgtdf
60d114b606 finish moving cavegen (cave_map_generator.cpp) to lua. 
This map generator is used in HttT 17 and SoF 4. which needed to be updated aswell.

With this we finally have a lua generator that is used in mainline and that
can be used an an example by wml authors who want to write other map generators.

Unfortunateley there are still umc add ons in 1.12 that use
scenario_generation=cave so i didn't remove the cpp implementation yet.
 2016-09-17 20:52:49 +02:00
Charles Dang
659e482e01 Moved eras files back to multiplayer/ since its movement caused errors in replays pre-move 2016-09-11 10:23:53 +11:00
Charles Dang
3cb8878b9a Fix duplicate loading of eras in mp 
This fixes warnings about the era macros being redefined without being #undef-ed when
loading MP.
 2016-08-30 19:39:00 +11:00
fendrin
84bab7ad19 Replace FOREACH 2016-08-06 06:20:41 +02:00
Celtic Minstrel
b295aab4ba Deprecate {MAGENTA_IS_THE_TEAM_COLOR} 
The magenta colour is now the default flag_rgb colour if one is not specified.
 2016-08-05 00:49:39 -04:00
Gregory A Lundberg
010f943a40 [option]message= deprecated, use label= 
According to the Wiki, since 1.13.2 message= is an alias for label=.

Using message= provokes a warning about it being deprecated.

This replaces message= with label= in the entire mainline (where it had not already been changed).
 2016-07-03 13:41:44 -05:00
sigurdfdragon
87b55feb59 MP Random map (Desert): Use new desert mountains. 2016-06-08 00:30:03 -04:00
Charles Dang
d6b48759dc Hornshark: remove unit ids from Clockwork Boy units (bug #24722) 
This prevents ID conflicts resulting in certain units disappearing. They weren't
used anywhere in the scenario anyway.
 2016-06-04 00:15:56 +11:00
sigurdfdragon
80e81cdc3a MP - Aethermaw: Fix image not found errors. 
Due to Revenant & Skeleton Archer animations moved to subdirectories.
 2016-06-02 14:08:00 -04:00
gfgtdf
6f29960e95 Merge pull request #659 from spixi/master 
Make the multiplayer faction accessible via Lua and simplified Hornshark Island
 2016-05-22 21:08:52 +02:00
gfgtdf
2fa8bc0350 cleanup lua feeding implementation. 2016-05-22 19:41:54 +02:00