upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-18 20:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,937 Commits 52 Branches 374 Tags
Commit Graph

14937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark de Wever
bc1a36b560 converted the custom terrains in Utbs (untested) 2007-01-27 21:01:19 +00:00
Mark de Wever
3046af86d6 Removed some debug code which gives villages the wrong name 
thanks to salty-horse for finding the problem
 2007-01-27 19:29:37 +00:00
Mark de Wever
ae646428de moved the Utbs rubble and crater terrain to mainline, 
...will be tested when testing Utbs
 2007-01-27 18:37:39 +00:00
Mark de Wever
3194733752 Added myself to the developers section. 
This was the final part of the merge of the terrain branch. 

This means trunk is thawed again.
 2007-01-27 14:51:45 +00:00
Mark de Wever
ba6611e024 converted scenario-test.cfg 2007-01-27 14:33:05 +00:00
Mark de Wever
4f706617eb converted 6p_Team_Survival.cfg 
can't totally check since I'm not familiar with the scenario
 2007-01-27 14:31:55 +00:00
Mark de Wever
3f48b90ac5 converted the multiplayer scenarios except 6p_Team_Survival.cfg 2007-01-27 12:40:21 +00:00
Mark de Wever
c131fecc5b converted the multiplayer maps 2007-01-27 12:21:02 +00:00
Mark de Wever
1688f32e63 Updated the changelog with changes merged from the terrain branch. 
put the players_changelog main chapters in alphabetic order
 2007-01-27 12:12:28 +00:00
Mark de Wever
78d8e4e12b merged src 2007-01-27 11:34:27 +00:00
Mark de Wever
0c0da57a43 copied terrain-graphics.cfg 2007-01-27 10:34:25 +00:00
Mark de Wever
19483335f7 merged the last files of data except terrain-graphics.cfg... 
...since it has to much conflicts
 2007-01-27 10:33:38 +00:00
Mark de Wever
17142a0328 merged data/campaigns/Two_Brothers 2007-01-27 10:23:11 +00:00
Mark de Wever
8ac386b3db merged data/campaigns/The_South_Guard 2007-01-27 10:21:24 +00:00
Mark de Wever
0a3ec4f2f1 merged data/campaigns/The_Rise_Of_Wesnoth 2007-01-27 10:18:53 +00:00
Mark de Wever
e404b7f460 merged data/campaigns/Heir_To_The_Throne 2007-01-27 10:09:59 +00:00
Mark de Wever
d32661f198 merged data/campaigns/Eastern_Invasion 2007-01-27 10:04:28 +00:00
Mark de Wever
314b6ca298 merged utils but from 2007-01-05T23:46:27Z!koraq@xs4all.nl since the directory was later created 2007-01-27 09:57:34 +00:00
Mark de Wever
25fcbb6d7a merged data/tutorial 2007-01-27 09:52:09 +00:00
Mark de Wever
5b6e3b5f6c merged data/terrain-graphics 2007-01-27 09:49:15 +00:00
Mark de Wever
9b3e404f26 merged data/scenarios... 
note the MP scenarios will be converted later in the trunk
 2007-01-27 09:43:37 +00:00
Mark de Wever
1b81bcad0e merged data/factions 2007-01-27 09:35:20 +00:00
Mark de Wever
ea2b261a5d Removed the obsolete code from the terrain files, 
...it only existed to ease merging from trunk
 2007-01-27 09:32:08 +00:00
Mark de Wever
c7c47439d7 merged the tools directory 2007-01-27 09:03:04 +00:00
Mark de Wever
1b548076b5 SVN merge has some problems so some files will be copied manually... 
...instead of properly merged. This is the beginning of the merge of
the terrain branch.

Copied the new keep images.
 2007-01-27 08:57:30 +00:00
Mark de Wever
66ca1005b2 merge trunk 2007-01-24T19:19:50Z!koraq@xs4all.nl..2007-01-26T19:51:38Z!crazy-ivanovic@gmx.net 2007-01-27 00:13:47 +00:00
Nils Kneuper
ec357584c2 added new polish translation maintainer to about.cfg 2007-01-26 19:51:38 +00:00
Mark de Wever
f316141b8c remove more dead code 2007-01-26 17:51:35 +00:00
Mark de Wever
4f1bad4ac1 Removed some dead code 2007-01-26 17:35:15 +00:00
Elias Pschernig
3e33922e94 Added a comment what it does to the unused functions script committed before. 2007-01-26 16:39:17 +00:00
Elias Pschernig
2b6f124c1e Corrected a typo. 2007-01-26 16:24:39 +00:00
Elias Pschernig
643e4073cf Added a small script to use gcc and nm to find possibly unused functions. 2007-01-26 16:19:10 +00:00
Gunter Labes
13dc48fe61 new map 2007-01-26 16:02:20 +00:00
Richard Kettering
4b21a29f9b New, TC images for the arch and great mages. 2007-01-26 15:59:40 +00:00
Gunter Labes
520b058721 new map 2007-01-26 15:56:29 +00:00
Richard Kettering
5d743af1b3 New, TC images for the silver mage. 2007-01-26 15:49:59 +00:00
Richard Kettering
dcc702b23d New, TC images for the Silver Mage. 2007-01-26 15:48:48 +00:00
Richard Kettering
8e8385d85e New, TC images for the mage of light. 2007-01-26 15:42:41 +00:00
Richard Kettering
87a3bdad5c New, TC images for the mage of light. 2007-01-26 15:40:03 +00:00
Richard Kettering
1559d528b8 New, TC images for the mages. 2007-01-26 15:32:02 +00:00
Richard Kettering
68f23e1c0e New, TC images for the mages. 2007-01-26 15:30:56 +00:00
Benoît Timbert
a0f59d0949 Updated french translation 2007-01-26 15:13:17 +00:00
J.W. Bjerk
b1b418959e added dborg to the about 2007-01-26 01:13:43 +00:00
J.W. Bjerk
6c858dc9f1 added icons for flags to allow display in the top bar without distortion. 
this feature has not yet been coded.
 2007-01-25 23:26:28 +00:00
Nils Kneuper
c5adf1d083 updated Polish translation 2007-01-25 23:13:45 +00:00
J.W. Bjerk
1a80b51ed9 improved logo. better kerning i.e letterspacing 2007-01-25 22:46:21 +00:00
Benoît Timbert
190d5ca312 Updated French translation 2007-01-25 21:37:27 +00:00
Mark de Wever
755d50d50a Previous commit causes the branch to no longer compile 2007-01-25 21:26:47 +00:00
Mark de Wever
ff93186fee merged 2007-01-25T18:39:41Z!koraq@xs4all.nl from trunk 2007-01-25 21:02:04 +00:00
Mark de Wever
f35d4cee27 The blue shield image is replaced with a silver crown. 
Committed here only will be ported to trunk with the branch merge.

(1.2 still has the shield.)
 2007-01-25 18:53:18 +00:00