upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-16 18:31:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,008 Commits 51 Branches 374 Tags
Commit Graph

59008 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Beck
2885a3a9b3 don't catch game::error in playcampaign.cpp 2014-11-04 15:59:06 -05:00
Chris Beck
7e5632d36c button ctor throws game::error when it can't find its image 
This partially reverts an earlier commit
28fe7e44

instead of changing the exception type to game::game_error,
(which I assume is meant for in-game errors?), we go back to
game::error which is now handled properly in playcampaign.cpp
and game_launcher.cpp

Tested that this does not reintroduce bug 22611.
 2014-11-04 15:53:24 -05:00
Chris Beck
9e801244ea add game::error handler to game_launcher.cpp, also mapgen errors 
Put the same handlers I added to playcampaign also for
game_launcher. It can't be good that we weren't catching
game::error anywhere...
 2014-11-04 15:53:24 -05:00
Chris Beck
6c5b43f3be fixup exception handler for replays 
For some reason I had apparently set it up to skip writing errors
to stderr unless it was a unit test...
 2014-11-04 15:53:24 -05:00
Chris Beck
cbb28fd5b0 add exception handlers for "game::error" in playcampaign.cpp 
I also add one for mapgen_exception, but this doesn't make so much
difference. It seems to be a big problem that we don't catch
game::error anywhere, I observed a similar bug being caused by
game::error being thrown directly by a button when it couldn't
find its image. The report was that it caused the game to crash
to desktop immediately (I think it was caught only in void main.)
 2014-11-04 15:53:23 -05:00
Chris Beck
49d3653ed9 fixup commit which eliminated image::tile_size 
It was redundant copy of game_config::tile_size

Fixes up 5a8485d22568b5478f448810c8a8a014d58c00de
 2014-11-04 13:34:43 -05:00
Chris Beck
e8698e49be refactor gitignore: ignore all build scripts (*build*.sh) 2014-11-04 12:57:09 -05:00
Chris Beck
1401bc8d17 fixup travis 2014-11-04 12:47:47 -05:00
Chris Beck
8bf3a0ddd7 make the c++11 build non-strict 
There's too much warnings for now
 2014-11-04 12:45:40 -05:00
Chris Beck
5a8485d225 fixup a warning (c++11 unused variable) 2014-11-04 12:45:25 -05:00
Chris Beck
2f160de8a5 show scons parameters in .travis.yml 2014-11-04 12:26:52 -05:00
Chris Beck
2474c37659 fixup travis 2014-11-04 12:11:28 -05:00
Chris Beck
f7dd05a071 fixup .travis.yml 2014-11-04 12:01:40 -05:00
Chris Beck
37ca01a9f7 fixup travis 2014-11-04 11:55:59 -05:00
Chris Beck
043fe01c42 add a CXX11 build to travis 2014-11-04 11:42:31 -05:00
Chris Beck
0e9dcfb3db fixup C++11 compilation, thanks to duncan_shriek/roland_ on irc 2014-11-04 11:40:10 -05:00
Chris Beck
1bf85228da move cxx version check to after we install compiler upgrade 2014-11-04 11:39:52 -05:00
Chris Beck
ee79fd9730 Merge branch 'master' of https://github.com/wesnoth/wesnoth 2014-11-04 10:37:11 -05:00
Chris Beck
54c602c056 output compiler version info in the travis logs 2014-11-04 10:36:41 -05:00
mattsc
653282b584 Update Xcode project file with new libboost_random dependency 
This also requires a new version of the Mac compile package.
 2014-11-03 17:53:12 -08: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
0c5ceea3f1 update changelog 2014-11-03 19:01:24 -05:00
Chris Beck
3a32e1e098 update RELEASE_NOTES to contain the resolution of the BFS saga 2014-11-03 19:00:08 -05:00
Chris Beck
d34a1bf9ad mention boost random in release notes 2014-11-03 18:58:00 -05: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
23674d93d1 update changelog 2014-11-03 16:02:07 -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
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