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

58952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ignacio R. Morelle
0e9f0a0ef0 Revert "create_symlinks: Make an exception for 1.10" 
This reverts commit d4f7ebc8edccb11c511f5199d81b0a24af43716c.
 2014-10-30 00:12:57 -03:00
Chris Beck
b449ac8aab Merge pull request #317 from cbeck88/patch_cmake_fribidi 
commit a patch to our fribidi cmake, from downstream (macports)
 2014-10-29 22:43:15 -04:00
Chris Beck
696f4daa24 Merge branch 'master' of https://github.com/wesnoth/wesnoth 2014-10-29 22:03:40 -04:00
Chris Beck
19548b4e5d add CheckPNG again to the SConstruct 2014-10-29 22:03:03 -04: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
Ignacio R. Morelle
d4f7ebc8ed create_symlinks: Make an exception for 1.10 2014-10-29 21:38:44 -03:00
Ignacio R. Morelle
11c1976a3b Fix thread count setting for 1.9 wesnothd and add one for 1.12 2014-10-29 21:31:36 -03: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
Chris Beck
3b9006f0d9 fixup cmakelists, they weren't adding the new libraries 2014-10-28 21:45:03 -04:00
Ignacio R. Morelle
bb28364d76 campaignd: Use a POSIX monotonic clock for scheduling config commits 
Only available on Linux and probably some BSD systems. For other systems
we issue a #warning and use time() instead (which will cause the
compiler to quit with -Werror, but that's the whole point).
 2014-10-28 22:06:00 -03:00
Ignacio R. Morelle
6fc02576ef campaignd: Write config to disk even if the clock is running backwards 2014-10-28 22:03:03 -03:00
Ignacio R. Morelle
995f680b5a campaignd: Emit debug messages when writing configuration to disk 2014-10-28 22:02:36 -03:00
gfgtdf
40c1448e67 fix start-of-scenario 1.13 compability (#22546) 2014-10-28 23:19:59 +01:00
gfgtdf
52fb059727 fix "time over" event in replays 2014-10-28 20:34:45 +01:00