upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-20 23:46:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,529 Commits 52 Branches 374 Tags
Commit Graph

604 Commits

Author SHA1 Message Date
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
Spixi
a8f625fc8a Make the multiplayer faction accessible via Lua and simplified Hornshark 
Island
 2016-05-22 00:51:09 +02:00
ln-zookeeper
eaa7dac9c2 Disabled ellipses of the statues 2016-05-19 23:58:19 +03:00
Wedge009
eda30529c2 Spelling correction: perentage -> percentage 2016-05-02 19:06:43 +10:00
ln-zookeeper
0eed39ff23 Changed terrain code of desert mountains from Mdy to Mdd 
This is because 'y' is reserved for UMC use.
 2016-03-29 14:48:25 +03:00
Elvish_Hunter
2cd4298f7b wmllint run on core, campaigns and multiplayer directories 2016-03-24 20:26:44 +01:00
ln-zookeeper
f3d5092534 Replaced regular mountains with desert/snowy mountains in a few places 2016-03-08 11:47:58 +02:00
Charles Dang
a87939acb0 Run wmlindent 2016-02-24 16:27:08 +11:00
Charles Dang
c40c2cd9af ANL: strip unnecessary wmltools guards and ran wmlindent 2016-02-24 09:06:32 +11:00
Robert Wallace
afd53cf6a1 Fixed deprecated code in ANL 2016-02-23 14:17:56 -05:00
gfgtdf
439ded53ee 2p dark forecast: don't store unit pool types in savefiles 
instead of storing the poolypesin savefiles we now have them as 'const'
lua array and store only the indexes to this array in the savefiles.
this has some advantages:
1) It makes the savefiles smaller
2) It simplyfies the lua code becasue we don't have to convert the wml
tables to lua tables anymore.

This also changes the scenario so that the spawned unit types are now
calculated at the beginning (they will be the same when reloading from a
savefile.)
 2016-02-18 23:34:50 +01:00
gfgtdf
39eb8feaf1 add difficulcy level slider to dark forecast mp scenario 
unfortunateley the 'description' (the tooltip of the widget in the mp
configure dialog) doesn't show in current master. This is likeley to be
a bug related to gui internals.
 2016-02-18 23:08:44 +01:00