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

59075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nils Kneuper
c25de4bd87 apply fixes for building the pandora port with cmake to master 2014-11-02 23:54:16 +01:00
Nils Kneuper
73ad809290 updated Hungarian translation 2014-11-02 22:29:06 +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
Nils Kneuper
11790ed559 updated Italian translation 2014-11-02 11:50:24 +01:00
Nils Kneuper
ee9e7a844a updated Galician translation 
images in data/ need to be added to tracking file
 2014-11-02 11:44:28 +01:00
Nils Kneuper
7da9bfbaa3 updated Scottish Gaelic translation 2014-11-02 11:38:53 +01:00
Nils Kneuper
77df3d152c updated Spanish translation 2014-11-02 11:36:31 +01:00
Nils Kneuper
93c655eee3 updated German translation 2014-11-02 11:34:51 +01:00
Nils Kneuper
d5cc6a2d39 updated Slovak translation 2014-11-02 11:30:57 +01:00
Nils Kneuper
16919f7c22 updated Portuguese translation 
image needs to be added to translation tracking file
 2014-11-02 11:29:13 +01:00
Chris Beck
a2aff0d5af Merge pull request #319 from cbeck88/test_to_fix_travis 
test to fix travis
 2014-11-02 01:45:56 -05:00
Chris Beck
8e2191efd9 Revert "scons: don't ignore PKG_CONFIG_LIBDIR environment variable" 
This reverts commit 9f93831a2397d45560a9f1e36a40aac38d4affc3.
 2014-11-02 01:43:14 -04:00
Chris Beck
20dbcff99c fixup SConstruct in case there is no terminal in the environment 2014-11-02 01:08:06 -04:00
Chris Beck
1a693ef8f1 Merge branch 'master' of https://github.com/wesnoth/wesnoth 2014-11-01 23:15:52 -04:00
Chris Beck
8f93e0ebb0 scons: add OS_ENV option, to forward all of OS environment to scons 2014-11-01 23:13:23 -04:00
Chris Beck
9f93831a23 scons: don't ignore PKG_CONFIG_LIBDIR environment variable 
This is an attempt to fixup our scons pkg-config code, following
issue raised here:

https://github.com/Homebrew/homebrew-games/pull/165#issuecomment-61391362
 2014-11-01 22:35:15 -04: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
Chris Beck
d9ecc0a9f7 scons: don't depend on libintl if boost filesystem enabled 
since we use boost locale instead then.
 2014-11-01 13:30:02 -04: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
mattsc
ada80cfd34 Micro AIs: only display on-screen error messages when in debug mode 2014-11-01 07:45:15 -07:00
mattsc
f890aa00a0 Configure Xcode project to use SDL_SavePNG 
This requires downloading a new version of the Mac compile package
because new headers were added.
 2014-11-01 07:28:52 -07:00
Chris Beck
72ad9500b6 Merge branch 'master' of https://github.com/wesnoth/wesnoth 2014-11-01 02:03:18 -04:00
Chris Beck
e243285aba change undead help portrait to spectre, it fits better here 2014-11-01 02:02:56 -04:00
mattsc
71f89f31b7 Update Xcode project file 2014-10-31 21:06:43 -07: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
Chris Beck
afa7af6cdb update changelog 2014-10-31 16:27:04 -04: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