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 556331ac3f
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 9f386ed563
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 e50a63927b
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
sigurdfdragon
b8c90c0fad
Fixup 61c33f9
...
The sergeant's stats are in two places.
2017-11-12 22:35:54 -05:00
josteph
408163e598
AToTB S03: Tweak hint to not assume the AI will make mistakes
2017-11-12 22:31:37 -05:00
Gregory A Lundberg
44526a4bad
Do not lua_next on userdata.
...
Ever.
Really.
YOU HAVE BEEN WARNED!
Closes #2171
2017-11-12 20:48:57 -05:00
Gregory A Lundberg
fc21ebf1be
Respect lua_next constraints
...
The key value returned by lua_next, on the Lua stack, cannot be modified.
Certain tests such as lua_isstring will convert the value.
The solution is, instead of testing if they key can be converted to a string, test if it actually is a string by using lua_type.
2017-11-12 20:48:57 -05:00
doofus-01
70e1447366
more changes to castle to wall layering
...
further attempt to fix #2190
2017-11-12 17:30:27 -08:00
Charles Dang
b56fb67c4f
GUI2: moved some listbox-specific code out of scrollbar_container and into listbox
2017-11-13 12:17:46 +11:00
doofus-01
0857a5a01e
changing castle-wall layering when next to Xos
...
to address issue #2190
2017-11-12 16:32:27 -08:00
Charles Dang
25eb7a69be
Fixed context menus not working in the editor ( fixes #2183 )
...
Turns out after moving the menu handling to right-button-up, I didn't add a call to the base
method here, which meant the show-context-menu code was never called.
2017-11-13 10:49:33 +11:00
doofus-01
a59965c591
clipping upper tips of diagonal borders to deal with overlap
2017-11-13 10:33:18 +11:00
doofus-01
58ff9c42c8
hack to keep carpets from spilling into castles
2017-11-13 10:33:18 +11:00
doofus-01
e02c4a140d
adjust outer edges to avoid borders overlapping interior
2017-11-13 10:33:18 +11:00
mattsc
e0899d5b81
Update Xcode project
2017-11-12 09:30:24 -08:00
