upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-25 17:29:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,409 Commits 56 Branches 373 Tags
Commit Graph

70409 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pentarctagon
e45e824499 Have scons and cmake link against same static libraries. 2017-11-20 07:38:18 +02:00
Jyrki Vesterinen
17c0fd97a8 Fix MSVC compiler warning about overriding a function 
Visual Studio 2013 omits a warning if a parameter is const-qualified in the
original function but not the overriding one (or the reverse).
 2017-11-20 07:38:18 +02:00
Jyrki Vesterinen
5535b36395 Fix build with TDM-GCC 
@newfrenchy83 said that the build is failing:
37225d24ea (commitcomment-25629052)

It looks like TDM-GCC uses Windows XP development headers, unfortunately.
However, the problem is easy to work around by simply #defining the missing
value ourselves. We should consider dropping TDM-GCC support after the 1.14
release, though.
 2017-11-20 07:38:18 +02:00
pentarctagon
c8b37856c5 Add explanation comment. 2017-11-20 07:38:18 +02:00
pentarctagon
f1b4f79afc Fix the scons Wesnoth Windows executable icon. 2017-11-20 07:38:18 +02:00
Charles Dang
f7f2da45d4 Fixup f626a2d (more expansive _WIN32_WINNT value check) 
Just in case _WIN32_WINNT doesn't exactly match _WIN32_WINNT_WINXP (0x0501) when building.
 2017-11-16 18:26:10 +11:00
Charles Dang
f626a2dd31 Only define BOOST_ASIO_DISABLE_IOCP on Windows XP 
That define allows boost::asio::ip::tcp::socket::cancel to work on Windows XP, but there's no
reason to have it enabled on other Windows versions.
 2017-11-16 17:25:22 +11:00
Charles Dang
bc3c79a3e0 Campaignd/Network Asio: formatting cleanup 2017-11-16 16:42:07 +11:00
sigurdfdragon
ac2c6e6e6d DM S08: Use simpler way to keep leader on his keep 
He won't attack, but that's not a big deal here.
 2017-11-15 20:31:31 -05:00
gfgtdf
073a4ebcf6
fix build 2017-11-16 02:07:43 +01:00
gfgtdf
1c44296b22
round instead of floor to fitting value in slider::set_value 2017-11-16 02:06:44 +01:00
gfgtdf
8c1f07f607
add debug output on slider error. 2017-11-16 01:53:43 +01:00
Charles Dang
ff672fd69f Merge branch 'master' of github.com:wesnoth/wesnoth 2017-11-16 10:59:30 +11:00
Charles Dang
c7ff94f434 MP Create Game: replaced a hack with a proper solution 2017-11-16 10:59:04 +11:00
Charles Dang
0d166750ec MP Create Game: some minor cleanup from recent changes 2017-11-16 10:53:42 +11:00
Alexander van Gessel
ca0b5033f0 Don't break recall/traitless-recruit undo (Fixes #2196) 2017-11-16 00:52:16 +01:00
gfgtdf
320bdd9d40
Merge pull request #2193 from gfgtdf/depcheck 
fix mp depckeck 
fixes #1887 
fixes #2092
 2017-11-15 23:49:07 +01:00
Jyrki Vesterinen
b0c139c16a Chatbox tabs can no longer shrink vertically 2017-11-15 21:03:44 +02:00
Jyrki Vesterinen
7d1991a8d8 Fix #2153: crash in MP lobby chat with low horizontal window size 
[size_lock] could cause layout_exception_width_modified while shrinking
the widget, and it didn't catch the exception. Now it does.
 2017-11-15 21:02:25 +02:00
Jyrki Vesterinen
506ee85d2d Revert "GUI2: implemented fixed_width and fixed_height keys for all widgets" 
This reverts commit 556331ac3f53f2fd58fd4e137cf86af71d5c064b.

Since the keys aren't working, the implementation shouldn't be in the
Git repository. Otherwise some poor soul will attempt to use them and
face additional work afterwards.
 2017-11-15 19:04:47 +02:00
Jyrki Vesterinen
18e208e07c Revert "GUI2: removed GUI_FORCE_WIDGET_SIZE macro in favor of fixed_width/fixed_height keys" 
This reverts commit 9f386ed563e84e355130a940be804d13bf5b3d9c.

fixed_width/fixed_height are broken and completely fail to block the
widget from growing.
 2017-11-15 19:04:03 +02:00
gfgtdf
4cc854e9ea fix ub in mp create 2017-11-15 17:45:07 +01:00
gfgtdf
bdcada31bb mp create: add debug output 2017-11-15 16:49:31 +01:00
gfgtdf
7617863d95 fix unisgned comparision warning 2017-11-15 16:43:42 +01:00
gfgtdf
d20dcc2caa fix mod_list/eras not found in mp create 2017-11-15 16:43:41 +01:00
sigurdfdragon
84e205382f TSG S07b: Prevent Mal M'Brin from leaving his keep 
With this, the player should be unable to reach and attack him.
 2017-11-15 14:46:15 +02:00
sigurdfdragon
cc38b24c42 TSG S07b: Have undead use encampments instead of castle 
Fits the story better.
 2017-11-15 14:46:15 +02:00
sigurdfdragon
78d3cb6391 TSG S07b: Fix erroneous dialog 2017-11-15 14:46:15 +02:00
sigurdfdragon
0119f487a8 TSG S07b: Make it explict when the defenses of Westin are strengthened 2017-11-15 14:46:15 +02:00
sigurdfdragon
08ea513130 TSG: Remove redundant title in unit names 2017-11-15 14:46:15 +02:00
sigurdfdragon
431fc60e1b TSG S03: Have elves be on their own side when appearing 2017-11-15 14:46:15 +02:00
gfgtdf
775970f920 fix recrision in gui2 mp create depckeck 
selectable::set_value now takes an optional fire_vent parmeter

also we fix a case where display_games_of_type always invoked a
on_game_select for the first element in the list before the correct
level was selected.
 2017-11-15 11:58:51 +01:00
gfgtdf
fe253d5779 small create_engine simplification 2017-11-15 11:58:46 +01:00
gfgtdf
2f1c1e3836 fix mp depckeck 
just like in the gui1 version of mp create we just call a 'sync'
function whenever the user changed the selected era/scenario/mod.
 2017-11-15 11:56:59 +01:00
Celtic Minstrel
f759e4ecd1 Remove the useless (and dangerous) semicolons from the WFL macro definitions 2017-11-14 23:16:58 -05:00
Charles Dang
184cdd8afc Fixed our README license badge linking to its own icon 
[ci skip]

*facepalm*
 2017-11-15 13:44:03 +11:00
Charles Dang
fcb62858f3 MP Lobby: allow filtering by active mod names (fixes #2195) 2017-11-15 10:58:36 +11:00
gfgtdf
320255868d
fix 2198 : dead condition found by cppcheck 
this doesn't change the behviour since `std::string::npos` is defined as the largest size_t value, so `pos2 < pos` would in particular imply `pos2 != std::string::npos`
 2017-11-15 00:40:31 +01:00
Jyrki Vesterinen
468437666e Use std::move() instead of std::forward() 
Std::forward() is intended to be used in reference-collapsing contexts
(i.e. templates). @Vultraz said in Discord that the code doesn't compile
with std::move(), but it compiles just fine for me with Visual Studio 2017.
 2017-11-14 20:48:35 +02:00
pentarctagon
3b81f06953 Remove a list of 1. 2017-11-14 19:52:12 +02:00
pentarctagon
fd00a4be81 wesnoth_objects -> libwesnoth_objects 2017-11-14 19:52:12 +02:00
pentarctagon
52f84df4b5 Minor code cleanup. 2017-11-14 19:52:12 +02:00
Alexander van Gessel
5c0ec4cf87 Merge branch 'master' of github.com:wesnoth/wesnoth 2017-11-14 17:36:18 +01:00
Alexander van Gessel
ee10e333da Fix unused variable warning 2017-11-14 17:32:45 +01:00
Alexander van Gessel
133eb2af69 Don't concatenate int arguments 2017-11-14 17:32:22 +01:00
gfgtdf
138faa9464
give an error if two mods/era with the same id exist. 2017-11-14 16:53:48 +01:00
Charles Dang
608de6a42d WFL/Formula: some minor code refactoring and build fix from e50a63927bd1 2017-11-15 00:53:53 +11:00
Charles Dang
e50a63927b WFL/Formula: cleaned up formatting and greatly reduced code duplication 
I added a helper macro to define the various function classes.
 2017-11-14 16:43:15 +11:00
gfgtdf
6713070cc5
fix crash when selecting a random scenario in mp create 
previously the game would crash (manditory child missing) in depcheck.cpp if the id of the generated scenario is not the same as the id of the outer scenario.
 2017-11-13 20:47:27 +01:00
ln-zookeeper
34c6fcd0fd Dark Forecast: Fix broken leader/faction/color selection, fixes #2147 2017-11-13 21:09:52 +02:00