upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-04 06:15:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,807 Commits 60 Branches 374 Tags
Commit Graph

524 Commits

Author SHA1 Message Date
Chris Beck
751ab8f025 use grand knight portrait for 'loyalists' help description 2014-10-23 15:31:41 -04:00
ln-zookeeper
d09ce1ca87 Fixed players not winning if last enemy is side 2 2014-10-16 21:31:19 +03:00
Ignacio R. Morelle
858239ace4 Replace U+0022 in the Undead faction description, add an em dash 2014-07-22 17:53:47 -04:00
Ignacio R. Morelle
20bcc6513a Replace U+0027 in the Rebels faction description, reword a link 2014-07-22 17:42:44 -04:00
Chris Beck
22e9081b30 add portraits to decorate mainline faction descriptions 2014-07-21 00:38:59 -04:00
Chris Beck
106ce90402 port faction description text from the wiki to the in-game help 
This commit ports the text I found as the introductions to wiki
pages like this http://wiki.wesnoth.org/Drakes into the in-game
help, preserving the links to race descriptions and eras.
 2014-07-21 00:12:54 -04:00
fendrin
12bad80fa6 Put the DEFAULT_SCHEDULE_* macros in use. 2014-07-14 18:25:49 -04:00
fendrin
046a7b66ca Fix two border tiles. 2014-07-14 18:02:31 -04:00
Nathan Walker
0b3499cc66 Create a blank era for sp 
Also, moved the "Custom" mp side to be loaded outside of the MULTIPLAYER define.
 2014-07-13 15:25:20 -05:00
Ignacio R. Morelle
b79e531bf0 wmlindent pass on data/multiplayer/ 2014-07-02 21:42:31 -04:00
Nathan Walker
be366af523 Implemented defines for largest mainline scenarios 2014-06-22 15:37:53 -05:00
Velensk
4746355da5 Update to RoTD along with a changelog note. 
The subject really says it all. Ruins of Terra-Dwelve got some tweaks.
 2014-02-05 17:56:01 -05:00
Ignacio R. Morelle
f5ad4be828 Disable wmllint translation mark check around inline Lua blocks 2014-01-04 12:51:08 -03:00
fendrin
10b56130b1 Replaced forest segments with those from the different climate zone. 
This is just an attempt to make the map look more like "Prairie".
 2014-01-02 10:44:19 +01:00
fendrin
03f33bfc30 Just 4 pieces of terrain to beautify the map. 2014-01-02 10:44:19 +01:00
fendrin
2dd6c62bbf More leaders for the Khalifate in the AoH era. 2013-12-28 17:11:06 +01:00
fendrin
4f15c07d7b Fix the misspelled id of the AoH Khalifate era. 2013-12-28 13:18:20 +01:00
fendrin
c2c8fab4ad Renamed the file holding the khalifte default era factiondefinitions. 
Just for consistency with the other files' names.
 2013-12-28 13:15:05 +01:00
fendrin
c44e5fe776 Age of Heroes + Khalifate 2013-12-28 11:39:40 +01:00
fendrin
2709197594 Refactored the time of day schedule related images and macros. 
This moves the after the fall schedule into core to grant that the
debian package wesnoth-editor does not depend on wesnoth-utbs.

Also, the images now life in their own subdirectories.

Wmllint has been updated to take care about the changed paths.
 2013-12-22 07:32:12 +01:00
Alexander van Gessel
c825dd0e72 Merge branch 'master' of github.com:wesnoth/wesnoth-old 2013-12-22 04:16:09 +01:00
Alexander van Gessel
47e311ab9b Fix some image references in ANL 
Found by wmlscope
 2013-12-22 04:15:10 +01:00
Ignacio R. Morelle
060c35d82c wmlindent pass on mainline 2013-12-21 23:06:43 -03:00
Boldizsár Lipka
88dda7bedd Khalifate era description by happygrue. 2013-12-22 03:45:12 +01:00
Alexander van Gessel
725f9e398e wmlindent run 2013-12-22 02:04:58 +01:00
Alexander van Gessel
7eea4c5fb9 Import khalifate from wesnoth-umc-dev r19414 2013-12-22 01:55:00 +01:00
David Mikos
9780a8a53f Fix missing background dragonguard image in mp map Aethermaw 2013-12-22 10:20:45 +10:30
fendrin
92a6d30ee7 Put the time schedule macros in use. 2013-12-18 00:46:57 +01:00
mattsc
1e7e791eb5 MP eras file: Fix indenting 2013-11-14 09:58:20 -08:00
Boldizsár Lipka
67aa875874 Era descriptions. 2013-11-06 22:37:32 +01:00
Andrius Silinskas
da65ff655b Revert "Added "controller_lock=no" for multiplayer maps." 
Reverting since "controller_lock" will be set to "no" by default.

This reverts commit 6e337de3780870ef024348425cca611f3981c8ac.
 2013-10-27 09:13:14 +00:00
Andrius Silinskas
6e337de378 Added "controller_lock=no" for multiplayer maps. 
These changes guarantees that it will be possible to select any kind of
controller in MP Connect screen in all multiplayer maps.
 2013-10-11 20:35:27 +01:00
Andrius Silinskas
77523d86d6 Refactor faction set up in multiplayer. 
The code has been improved to switch from index lookups to lookups by
ids. This makes the implementation more flexible for future improvements
and easier for maintenance.

The "Custom" faction has been added. It is automatically chosen and
locked for sides with a recruit list. The sides without recruit list
won't see it in their faction choice combo box.

The recruit list in side will be now be overriden by a faction if map
settings are not in use.
 2013-09-05 18:33:33 +01:00
Alexander van Gessel
38b224c1ff Revert "Revert "Merge branch 'master' of github.com:wesnoth/wesnoth-old"" 
This reverts commit 23b72d6956e6316f8b50a6accba607f66cf197a7.
 2013-08-09 00:13:46 +02:00
Thibault Févry
23b72d6956 Revert "Merge branch 'master' of github.com:wesnoth/wesnoth-old" 
This reverts commit 5fa5c034110c3c942d299c8fd440297c89aca037, reversing
changes made to 06374c64ba00977a4f720a44108593fc43d5c787.
 2013-08-08 18:50:46 +02:00
fendrin
5191331565 Grouped the map generators into a folder and added the yamg. 2013-07-20 15:59:29 +02:00
Eric S. Raymond
8c044a01db Mainline campaigns are wmllint/wmlscope clean again. 
Unfortunately, this required telling wmlscope to ignore all present
instances of new-style animation wildcarding. Some rather messy changes
to wmlscope will have to be considered if it gets more widely used.
 2013-03-28 11:33:43 -04:00
Ignacio R. Morelle
5412a4f81c mp: Add trailing newline at EOF to maps 2013-03-24 08:09:43 +00:00
J. Tyne
1edf9b8a97 Lost a "first_time_only=no" in 2013-02-02T02:38:46Z!jt_coding@verizon.net. 2013-02-02 03:53:41 +00:00
J. Tyne
fac47d0f34 Make sure the scenario-ending events actually fire; 
there was a chance of them not firing ever since WML division was
changed to floating point.

Also changelog entries for this and 2013-02-01T04:48:38Z!jt_coding@verizon.net.
 2013-02-02 03:02:20 +00:00
J. Tyne
c0a085108c Define the victory-defining event within the event that makes victory possible. 2013-02-02 02:57:45 +00:00
J. Tyne
5315735d81 Reduce calculations by subtracting 1... 
...before calling the REGULAR_RANDOM_SPAWNS macro.
 2013-02-02 02:48:10 +00:00
J. Tyne
08730dd872 Simplify the setting of the final turn limit. 2013-02-02 02:40:49 +00:00
J. Tyne
d6853fa5ad Simplify the event extending the turn limit and firing final spawns... 
...with more advanced event handling.
 2013-02-02 02:38:46 +00:00
J. Tyne
dcb69362ff Remove an unused variable. 2013-02-02 00:23:05 +00:00
J. Tyne
4582bd0e1c Simplify the victory check by nesting events and using [filter_condition]... 
...instead of [if].
 2013-02-02 00:19:32 +00:00
J. Tyne
3bfb51743b Also decrement the manually-tracked length when clearing a spawn group. 
(I forgot to copy that line when converting REMOVE to CLEAR.)
 2013-02-01 06:26:51 +00:00
J. Tyne
80caf8623e Use the simpler CLEAR_SPAWN_GROUP instead of the long REMOVE_SPAWN_GROUP. 2013-02-01 05:17:13 +00:00
J. Tyne
a4ced0614e Convert some {VARIABLE_OP X value Y}'s to {VARIABLE X Y}. 2013-02-01 05:06:29 +00:00
J. Tyne
370e7b5fbf Remove some stray dollar signs. 2013-02-01 04:58:07 +00:00