upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-03 12:59:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,130 Commits 60 Branches 374 Tags
Commit Graph

25259 Commits

Author SHA1 Message Date
Chris Beck
0e9dcfb3db fixup C++11 compilation, thanks to duncan_shriek/roland_ on irc 2014-11-04 11:40:10 -05:00
Fabian Müller
f15d6ef37f Display the campaign's icon in the create multiplayer dialog. 2014-11-04 02:01:57 +01:00
Chris Beck
ff857d1d2b move SDL_SavePNG to the wesnoth_sdl lib target 
This is to possibly fix issue shadowm reported, and keep all the
things that SDL depends on together.
 2014-11-03 18:52:21 -05:00
Chris Beck
55078504a9 Merge pull request #322 from cbeck88/boost_rng_squash 
use boost mersenne twister rng, add boost::random dependency
 2014-11-03 18:22:51 -05:00
Chris Beck
da9ea37266 rename IPF functions 2014-11-03 18:20:55 -05:00
Chris Beck
8dd10eb418 add ~Wipe_Alpha image path (mainly a diagnostic tool) 2014-11-03 17:51:08 -05:00
Chris Beck
3a947df480 add ~Alpha image path function 
Mainly useful as a diagnostic tool
 2014-11-03 16:34:09 -05:00
Chris Beck
50515131b5 add ~SCALE_SHARP image path function, analogous to ~SCALE 
The syntax is the same but it uses nearest neighbor instead of
bilinear interpolation
 2014-11-03 16:00:35 -05:00
Chris Beck
da4074e882 use boost mersenne twister rng, add boost::random dependency 
This is a squash of work done in april, see closed github pull
request. #160
 2014-11-03 11:24:24 -05:00
Chris Beck
d208c72998 fixup 43c54fc75a09d60f8feeb83205a3a02b519a7025, save png segfaults 
Our filesystem functions are for reading, not writing.
 2014-11-02 21:33:36 -05:00
Nils Kneuper
c25de4bd87 apply fixes for building the pandora port with cmake to master 2014-11-02 23:54:16 +01:00
Nils Kneuper
47fb0c6199 fixed building wesnothd using cmake 
the server seems to need to link against Boost_SYSTEM_LIBRARIES after
the change to boost filesystem
 2014-11-02 21:35:34 +01:00
Nils Kneuper
d263e46b34 fixed building clipboard.cpp with cmake 
the file was moved but the recipe not updated correctly
 2014-11-02 21:34:43 +01:00
gfgtdf
081cb8f6cc add a comment. 2014-11-01 22:37:16 +01:00
gfgtdf
cbead26ffe add log messsage 2014-11-01 20:46:23 +01:00
gfgtdf
83a4b08e72 move replay init to playcampaign.cpp 2014-11-01 20:46:22 +01:00
Boldizsár Lipka
af16f96961 Make the GUI2 lobby respect the require_modification attribute. 
Fixes bug #22877.
 2014-11-01 16:07:09 +01:00
Boldizsár Lipka
7ed5bb1a6e Fix CMake build. 2014-11-01 15:56:11 +01:00
Chris Beck
9c6ad9c9d3 Merge branch 'master' of https://github.com/wesnoth/wesnoth 2014-10-31 23:19:39 -04:00
Chris Beck
3a8cad8ad2 fix gcc compilation 2014-10-31 23:19:22 -04:00
gfgtdf
b0e6b23a91 move code to game_initialization folder 2014-11-01 03:03:11 +01:00
Chris Beck
246abc6381 rename some macro constants to less common names in SDL_SavePNG cpp 2014-10-31 21:16:59 -04:00
Chris Beck
841dcc32de remove unneeded include 2014-10-31 21:11:21 -04:00
Chris Beck
43c54fc75a fixup SavePNG uses to use our filesystem functions 2014-10-31 21:07:49 -04:00
gfgtdf
c2d61b3595 fix some copyright notices 2014-10-31 22:35:45 +01:00
gfgtdf
18d767e3ff fixed unused variable warning 2014-10-31 22:07:54 +01:00
gfgtdf
ff9f9ceb3a rename game_board::all_survivors_to_recall 2014-10-31 22:07:52 +01:00
gfgtdf
9d52c08039 remove outcommented code 2014-10-31 22:07:51 +01:00
gfgtdf
89ab65a3e2 remove outcommented code 2014-10-31 20:56:46 +01:00
gfgtdf
1869bad562 add a comment 2014-10-31 19:48:18 +01:00
gfgtdf
781d7c813e uint32_t -> boost::uint32_t 
uint32_t is new in C99 or C++11. So msvc 2008 doesn't support it.
 2014-10-31 19:37:55 +01:00
Chris Beck
ea887c48cb add remarks on licensing to xBRZ headers 2014-10-31 13:11:07 -04:00
Chris Beck
fddb0ac8a9 remove xBRZ's included copy of GPL (we already have such) 2014-10-31 12:55:40 -04:00
Chris Beck
d4f05fd5ae fixup SDL mixer version check 
fixes up commit 972ae8d78a318e1dece92bf57a4d77672373c60a
 2014-10-31 09:16:08 -04:00
Chris Beck
22b7a3932e Merge branch 'save_png' 
Conflicts:
	CMakeLists.txt
 2014-10-31 09:00:26 -04:00
Chris Beck
0442e6514a Merge branch 'xBRZ' 2014-10-31 01:39:48 -04:00
Chris Beck
a28082c03a add a TODO regarding improving alpha blending 2014-10-31 01:38:15 -04:00
Chris Beck
774cafc2be Merge branch 'master' of https://github.com/wesnoth/wesnoth 2014-10-30 23:14:42 -04:00
Chris Beck
972ae8d78a fixup preprocessor symbols controlling SDL MIXER min version 
Previously, the code that requires SDL_mixer v 1.2.12 was guarded
by #ifdef PANDORA, since this was the only platform intended to
use this. However, it turns out that OS X < 10.5 has a hard time
getting this library as well.

Instead of branching by platform, here we just check the version
defind by the SDL_mixer header, and include the code appropriate.

We rely on the scons / cmake / project file to fail any build which
should be done with the recent version.
 2014-10-30 23:11:43 -04:00
gfgtdf
2d8807357a remove unused and undefined variable 2014-10-31 03:18:37 +01:00
gfgtdf
3d7cd48e65 simplyfy win32 specific code 
by unicode casting to std::wstring directly instead of using a
utf16::string temporary.
 2014-10-30 21:45:26 +01:00
Ignacio R. Morelle
e5744562cc Remove this null pointer comparisons 
It appears the standard specifies that `this` being null is undefined
behavior. Compilers may choose to optimize taking UB into account; in
particular, the null pointer check in question can be optimized out.
clang 3.5 has a new warning flag -Wtautological-pointer-compare which
warns against that particular case, among others.

http://llvm.org/releases/3.5.0/tools/clang/docs/ReleaseNotes.html

This fixes the following warnings with clang 3.5:

  src/actions/../game_data.hpp:66:5: error: 'this' pointer cannot be null in well-defined C++ code; comparison may be assumed to always evaluate to true [-Werror,-Wtautological-undefined-compare]
  src/actions/../game_data.hpp:74:5: error: 'this' pointer cannot be null in well-defined C++ code; comparison may be assumed to always evaluate to true [-Werror,-Wtautological-undefined-compare]
  src/actions/../game_data.hpp:130:5: error: 'this' pointer cannot be null in well-defined C++ code; comparison may be assumed to always evaluate to true [-Werror,-Wtautological-undefined-compare]
 2014-10-30 06:14:38 -03:00
Ignacio R. Morelle
58f7622db7 campaignd: Fix abs() value truncation warning on clang 3.5 2014-10-30 05:57:23 -03:00
gfgtdf
030470282d add a warning log message. 2014-10-30 02:43:57 +01:00
gfgtdf
05afcd4dff remove saved_game operator = 
this assignment operator is not better than the defult operator.
 2014-10-30 02:32:57 +01:00
gfgtdf
3098c60aef fix mp wrong defautl controllers 
the old code resulted in human sides beeing ai by default for
stat-of-scenaro saves in the mp connect dialog.
 2014-10-30 02:25:22 +01:00
gfgtdf
cc526e9737 remove unused function 2014-10-30 01:46:06 +01:00
gfgtdf
c9a9d3e4d4 add a comment 2014-10-30 01:46:05 +01:00
gfgtdf
97fc1ad96a remove unused attributes from carryover sides 2014-10-30 01:46:04 +01:00
Chris Beck
35a72fa9ae fixup missing includes in X11 clipboard code 
This was broken for homebrew it seems by not having the includes.
 2014-10-29 01:12:31 -04:00