upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-08 07:47:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,576 Commits 60 Branches 374 Tags
Commit Graph

300 Commits

Author SHA1 Message Date
Mark de Wever
e35f4bb501 Strip trailing whitespace. 2014-06-09 15:26:19 +02:00
Chris Beck
f09d405629 cleanup previous two find and replace results 
Just wanted to remove the empty strings that got created:

find . -type f -exec sed -i 's/<< "" <</<</g' '{}' \;

find . -type f -exec sed -i 's/<<"" <</<</g' '{}' \;

I also unstaged tools/schema/tags.cpp, since I don't think I changed
that.
 2014-05-20 15:54:16 -04:00
Chris Beck
3c9844889b Make sure all error logs flush with std::endl, so we get on travis. 
This is the result of running this command in directory src/

find . -type f -exec sed -i 's/\(ERR.*\)\\n\"\;/\1\" << std::endl\;/g' '{}' \;

and carefully inspecting the results.
 2014-05-20 15:37:52 -04:00
Chris Beck
7b6a1ec74d fixup messed up whitespace and similar 2014-05-15 22:12:59 -04:00
fendrin
1e5d58af6a Made the orb and minimap colors configurable by the preferences. 2014-03-15 14:37:16 +01:00
Mark de Wever
2ab7d78cdf Remove AmigaOS support. 
It is unknown whether the platform still works with the current Wesnoth
code. To ease the SDL 2.0 transition support is removed. If a maintainer
steps up support can be added again.
 2014-03-08 14:10:49 +01:00
Chris Beck
21e167f6eb add a sound played when the host clicks "begin" in an mp game 2014-02-21 23:33:06 -05:00
Ignacio R. Morelle
a4f47a63c7 New Year copyright update 2014-01-01 02:08:52 -03:00
Alexander van Gessel
2b22f942e0 Get rid of an unnecessary variable 2013-12-27 21:30:10 +01:00
Ignacio R. Morelle
7e965dbdd2 Fix vague/misleading error messages for non-existent color palettes 
Fixes bug #20439.
 2013-12-19 23:15:11 -03:00
Ignacio R. Morelle
11c038214e Merge pull request #85 from cbeck88/party-full-bell 
Party full bell
 2013-12-11 16:30:51 -08:00
Chris Beck
880d9f68a9 added game_config::sounds::party_full_sound, defaults to turn bell 
and switched multiplayer_connect.cpp to use this sound
changed debugging output message
 2013-12-08 02:40:58 -05:00
Alexander van Gessel
62b17ea33f Assert that the game_config-provided version_info objects are good 2013-12-05 19:43:10 +01:00
Alexander van Gessel
a7b99d3d83 Make game_config::test_version a version_info object 2013-12-05 19:42:41 +01:00
Andrius Silinskas
758fc8c5da Goto mp::connect/wait only if "allow_new_game=yes". 
The "--campaign-screens" command line option has been removed since it
is no longer useful.
 2013-09-05 18:33:43 +01:00
Andrius Silinskas
f7fa3c59b5 Display mp::wait (temporary dummy) in between mp::scenarios. 
The screen is displayed only if '--campaign-screens' command line
option was specified. The same now goes for mp::connect screen for the
game's host.

Server has been modified to not immediately start the game after
'store_next_scenario', but to wait for explicit 'start_game'.

Minor changes to parameter passing inside multiplayer.?pp have been
made as well.
 2013-09-05 18:33:34 +01:00
Andrius Silinskas
74bf86cd91 Remove --new-syntax command line option. 2013-06-19 13:59:26 +01:00
fendrin
2dff1967bf New orb image wired in. 2013-06-09 08:47:10 +02:00
fendrin
725634eae3 Variables pointing to the radiobutton images. 2013-04-29 10:19:29 +02:00
Mark de Wever
7625b1e079 Remove an unused include. 2013-03-30 19:37:43 +01:00
Eric S. Raymond
043c4f9fd3 Remove $Id$ cookies. 2013-03-26 21:41:37 -04:00
Sergey Popov
45a073d033 Made the version string from autorevision... 
...also include base version from wesconfig.h
 2013-03-17 00:38:08 +00:00
Mark de Wever
43f617179e Adds autorevision based revision numbers. 
This commit adds the support for CMake.
 2013-03-15 20:28:52 +00:00
Boldizsár Lipka
9575893446 Wire in the new wooden background as game_title_background. 2013-03-03 20:54:22 +00:00
Jérémy Rosen
0562337892 syntax simplification for sounds in animations 2013-01-30 21:52:46 +00:00
Mark de Wever
43b71f2ff0 New year copyright update. 2013-01-01 09:22:03 +00:00
J. Tyne
7178438765 Remove vestiges of the --smallgui command line parameter, 
...which was made unnecessary in 1.9.5.
 2012-12-26 19:29:38 +00:00
Fabian Müller
c975dd6d1a Made the hex field size and the default terrain wml configurable. 2012-09-08 20:15:39 +00:00
Sergey Popov
6b6eafb213 Use BOOST_FOREACH directly instead of #define foreach BOOST_FOREACH 
The define is extremely unreliable, will break compile with boost >=
1.50 and upstream can't fix issues with it, see
https://svn.boost.org/trac/boost/ticket/6131
 2012-07-07 00:49:45 +00:00
Dmitry Kovalenko
57aa197583 LuaAI: 
(1) Lua CA_wrapper slightly refactored, in preparation for adding CA
definitons using external files

(2) --debug_lua command line argument added. Unused at the moment, but
will be used for Lua debug mechanisms
 2012-06-01 12:57:14 +00:00
Silas Brill
f806b61e80 Applied patch #1381: Configurable village support 
This differs from the original patch in that the minimum village
support for multiplayer is 0, not 1.
 2012-04-30 21:52:38 +00:00
Jérémy Rosen
9ec70dabc5 patch #3092 : Allow to specify default system-wide preferences by lipk 2012-03-05 22:36:26 +00:00
Ignacio R. Morelle
6ca69b2df5 New year copyright update 2012-01-07 02:35:17 +00:00
Ali El Gariani
98ec7151a2 Fix lingering dead code for brightened hexes. 
It was disabled since the new golden hex cursor. Also rename
"semi-brightened" (still used for editor selection) as "brightened"
 2011-12-11 17:04:30 +00:00
Anonymissimus
5ffabe7d14 made strin2rgb unthrowing (fix for bug #19052) 
Updated all callers.

Some callers were calling it without catching the bad_lexical_cast it
could throw.
 2011-11-25 22:54:24 +00:00
Alexander van Gessel
81e0a2007f Revert token t_token commits from 2011-09-08T19:15:40Z!thonsew@yahoo.com on. 2011-10-10 03:43:29 +01:00
Fabian Müller
beb7fde5e9 Copy and pasted a method similar to red_to_green, called blue_to_white. 2011-09-29 23:32:56 +00:00
Mark de Wever
789bc09769 Fix a compilation issue in c++0x mode. 2011-09-26 20:27:02 +00:00
Thonsew
cdb129508d Fix implicit static cast... 
...of config::attribute_value & to tstring & or t_token reference
causes crashes.  Some compilers were generating a temporary object and
binding a reference to the temporary when creating an implicit cast to
an attribute value.  I removed the implicit cast and replaced all (I
think) instances of the implicit cast with explicit 2 step operation.
This fixes bugs like bug #18663, bug #18684
 2011-09-20 21:20:54 +00:00
Thonsew
7e99017fa4 Updated image.cpp to 
1. Use t_token in place of std:string to save on string construction

2. Use boost::unordered_map in place of std::map as per todo by silene
 2011-09-08 19:17:41 +00:00
Lukasz Dobrogowski
80bec3a048 added commandline option --new-syntax 2011-05-23 17:52:27 +00:00
Mark de Wever
16b7fdea0c Remove some dead title screen code. 
Ivanovic spotted it while evaluting the small gui code.
 2011-02-13 18:41:38 +00:00
Mark de Wever
ecbabea838 New year copyright update. 2011-01-01 15:57:50 +00:00
Guillaume Melquiond
0188250ece Fixed game configuration not being reset when starting a new game. 2010-12-28 19:49:07 +00:00
Mark de Wever
59e3676759 Remove unused game_logo variable. 2010-10-08 19:45:32 +00:00
Ali El Gariani
a47218be5a unhardcoding missing-image to game_config.cfg 2010-09-09 15:04:17 +00:00
Guillaume Melquiond
eeb047de55 Fixed file headers so that they match the content of the COPYING file. 2010-09-01 21:12:38 +00:00
Ali El Gariani
037b79e36b New advanced preference to use a local ToD color-shift 
Because the memory cost is now acceptable (and only there when playing
maps with big caves using special ToD)
 2010-08-16 07:07:51 +00:00
Ali El Gariani
30c52fc7c5 Safer window-icon handling. 
Kill set_wm_icon function, since SDL_WM_SetIcon can be called safely
only at one place. Clearly hardcode the image's url instead of
pretending that we use game_config. Rename the image to
"game-icon.png" (since you are forced to use it).
 2010-08-08 18:33:48 +00:00
Ali El Gariani
b741019b80 Fix bug #16347 (broken big editor brush area) 
Now use a repeated overlay similar to the mouseover overlay.
 2010-08-06 18:26:45 +00:00