57079 Commits

Author SHA1 Message Date
Charles Dang
2af8c75e92 TSG S3: "foul undead" -> "foul creatures", since there are no undead on EASY 2014-06-05 22:02:08 +11:00
Charles Dang
74bbe0f76d AToTB S3: fixed story date inconsistency 2014-06-05 21:56:29 +11:00
ln-zookeeper
3229949ef1 Return Grüü's gold to Kapou'e only if positive 2014-06-05 12:36:08 +03:00
Ignacio R. Morelle
7435f341c4 campaignd: Remove dead code 2014-06-04 22:35:25 -04:00
Ignacio R. Morelle
33503f2f57 campaignd: Use utf8::lowercase() instead of a direct call to libc tolower()
Note that the next loop in the same chunk of code already uses
utf8::lowercase() even though both strings are really of the same
nature.
2014-06-04 22:30:25 -04:00
Ignacio R. Morelle
fed57b0f71 Test a few counterintuitive wildcard_string_match() border cases
It's probably best to leave them alone for now, though.
2014-06-04 14:39:02 -04:00
Ignacio R. Morelle
f09fd42645 Add test cases for utils::wildcard_string_match() 2014-06-04 14:13:21 -04:00
Ignacio R. Morelle
f5aa542671 campaignd: Forgot to add a Doxygen comment to the last commit 2014-06-04 14:12:48 -04:00
Ignacio R. Morelle
344fa792c2 campaignd: Quick-and-dirty implementation of upload-time blacklisting
A path to a blacklist WML file may be provided in the campaignd
configuration file (server.cfg). The BL file, in turn, may contain
attributes for comma-delimited lists of wildcard patterns, accepting
shell-style '*' and '?', by leveraging utils::wildcard_string_match()'s
functionality.

The following lists of patterns are recognized at this time:

  ip=<numeric IPv4 address masks>
  email=<add-on author email masks>
  name=<add-on id/name masks>
  title=<add-on title masks>
  author=<add-on author masks>
  description=<add-on description masks>

Currently, the IP address mask list also takes '*' and '?' wildcards. My
intention is to use CIDR subnet masks instead of or in addition to this.

The blacklist WML file is only read by campaignd once at startup and
it's never written to, thus allowing to preserve any WML comment lines
that may be included in the file by admins for convenience.

The IP, email, name, title, author, and description of a (new or
existing) uploaded add-on are matched against the blacklist in that
order. If the add-on matches, the upload is aborted and the user is
shown a generic message in English, just like with every other possible
campaignd-side error (on the plus side, this means it can be backported
to 1.12).

All matches (except for IP matches, which only contain digits and
punctuation) are done case-insensitively.

Because of campaignd protocol limitations, the upload is only checked
and aborted after the client has already uploaded a weighty WML document
including the add-on archive. Such is life, I guess.
2014-06-04 13:23:26 -04:00
Ignacio R. Morelle
f3b87a9366 campaignd: Tiny variable refactoring 2014-06-04 13:23:26 -04:00
Chris Beck
e6ebc74ef2 move utf8::lowercase tests to the right test file
fixes up b6508091a23c92b6752e9f8e5257aaa58cdc2cde
2014-06-04 11:14:23 -04:00
Chris Beck
b6508091a2 Fix utf8::lowercase (bug #22139)
As ucs4::char is unsigned, we don't need to compare against the min value of
the type. Worse, we cast the (possibly signed) min value to ucs4::char, which
on plenty of systems, results in 2^31, excluding all valid unicode codepoints.

Fix by gfgtdf.
Patch by iceiceice. (PR #189)
Commit message by ai0867.
2014-06-04 11:10:14 +02:00
Alexander van Gessel
c73f236e55 Don't let :show_var create variables
Reported at http://r.wesnoth.org/t40533
2014-06-04 10:18:13 +02:00
Ignacio R. Morelle
c7d22b086f CodeBlocks project update 2014-06-03 20:11:45 -04:00
Chris Beck
94b057f231 Merge branch 'move_temp_unit_structs_to_game_board' 2014-06-03 15:35:31 -04:00
Chris Beck
1ec273c882 move temporary unit movers to game_board, adapt slightly. 2014-06-03 15:17:54 -04:00
Boldizsár Lipka
7f499f7f50 Add fill_rect and draw_rect for SDL_Renderer. 2014-06-03 20:43:45 +02:00
Boldizsár Lipka
51095a3df1 sdl_fill_rect -> fill_rect.
As the function is now part of the sdl namespace, the sdl_ prefix is
quite redundant.
2014-06-03 20:43:45 +02:00
Boldizsár Lipka
c441630467 Move fill_rect to sdl/rect.hpp. 2014-06-03 20:43:44 +02:00
Alexander van Gessel
eb9076af9a Merge pull request #186 from cbeck88/fixup_statue_orbs
no movement orbs for enemy statues
2014-06-03 19:44:21 +02:00
Chris Beck
79f1e2e836 travis, don't run wml unit tests with gcc
To help prevent timeouts. Just running them with clang should be
fine.
2014-06-03 12:40:12 -04:00
Chris Beck
315152d116 Merge branch 'master' of git://github.com/wesnoth/wesnoth 2014-06-03 12:33:30 -04:00
Chris Beck
f364f217be fixup c8699e2f057b14b19ba60dbd4e71f4647b45ca78
When I removed the wesnoth built-in timeouts, I didn't completely
revert some of the changes, I left and include and didn't change
a shared_ptr back to scoped_ptr.
2014-06-03 12:32:24 -04:00
Chris Beck
0f2777e167 no movement orbs for enemy statues
Putting a movement orb on an enemy petrified unit is rather
redundant, so this commit prevents that behavior. Statues owned
by the viewing team will still have orbs, which seems acceptable.
2014-06-03 10:38:10 -04:00
Boldizsár Lipka
bc21430640 Added doc comments in sdl/rect.hpp. 2014-06-03 10:30:13 +02:00
Boldizsár Lipka
5a821a4d76 Correct a typo. 2014-06-03 10:30:13 +02:00
Boldizsár Lipka
7ca6ad8ad1 Move sdl_utils to sdl/utils. 2014-06-03 10:30:12 +02:00
Boldizsár Lipka
ac96a2b91b Move some functions to sdl/rect. 2014-06-03 10:30:12 +02:00
Chris Beck
deeaaa7168 Merge pull request #183 from aquileia/VC_update
Update VC project
2014-06-02 19:11:12 -04:00
aquileia
cd4dcbff43 Windows WML tests: Keep account of executed tests
The final report now includes the number of
 - tests that were executed
 - tests thereof that failed
2014-06-02 21:24:56 +02:00
aquileia
be3a1fe1b1 Add missing source files to VC project
These files were added by 9687383d0 and 954e068a5
2014-06-02 21:24:35 +02:00
Chris Beck
dd1f1cc748 Merge branch 'restrict_game_map' 2014-06-02 01:19:53 -04:00
Chris Beck
ac59b0d0e7 resources::game_map is const *, move functionality to game_board
This commit changes the resources::game_map pointer to a const *,
so that changes to the game_map coming from lua or wml apis must
go through the game_board. Three functions were moved into the
game_board -- although substantively they did not change, there
were minor changes, in terms of the kind of error reporting done,
and also in how gui refresh orders are issued afterwards. In
testing the differences due to this refactor don't seem to be
noticeable.
2014-06-02 01:16:29 -04:00
Ignacio R. Morelle
2349cf1981 Revert "Prevent minimap scrolling if viewport is locked"
This reverts commit 2f8b997cb8a093b71a54a64e47b3c9d4a826885f.

This needs to be redone in a less sloppy way that doesn't functions not
returning an actual value per their declaration or mass code
reindentations.
2014-06-01 23:39:58 -04:00
Charles Dang
2f8b997cb8 Prevent minimap scrolling if viewport is locked 2014-06-02 14:34:32 +11:00
Chris Beck
a706e059fa Merge branch 'master' of git://github.com/wesnoth/wesnoth 2014-06-01 22:12:12 -04:00
Chris Beck
4d188449be update changelog 2014-06-01 22:11:59 -04:00
Chris Beck
508f0540fb fix bug #22123, by rebuilding screen on reset, in replay viewer
This, together with this commit, fix the problem on master.

471e7ab865
2014-06-01 22:08:55 -04:00
mattsc
ac04662e95 Update Xcode project 2014-06-01 17:25:14 -07:00
Alarantalara
1b7fc80133 UtBS: Clear a variable not used later 2014-06-01 20:05:22 -04:00
Alarantalara
31d459620d UtBS: Make assassin appear in scenario 5
Event name was improperly identifying variable names.
2014-06-01 20:05:22 -04:00
Alarantalara
44c993ef0c UtBS: Increase difficulty of scenarios 1 and 3
Slightly fewer units in scenario 1 on hard
Deep One has more hp/attacks depending on difficulty
Less income available to player on hard in scenarios 1 and 2 to
decrease gold available in scenario 3
Added a define to make it easier to make Garak killable in scenario 3
2014-06-01 20:05:22 -04:00
Alarantalara
a5974b367b UtBS: Provide a partial path between enemy keeps
Should slightly encourage them to fight each other and reduces the
amount of sand slightly, making interference/attacking the keeps
somewhat harder.
2014-06-01 20:05:22 -04:00
Alarantalara
0221553030 UtBS: Make the final fight harder
Increase hp and damage of all units unique to the fight, and make the
amounts scale with difficulty level.
2014-06-01 20:05:22 -04:00
Charles Dang
4a24cce3f9 Merge pull request #182 from sigurdfdragon/CB_Update_2014-06-01
Update CB project file.
2014-06-02 11:05:16 +11:00
sigurdfdragon
3b5be89193 Update CB project file.
Adds new file from 6a8827a071845594cc8e0ed2da298c3060e531fb.
2014-06-01 19:34:47 -04:00
Chris Beck
1c2dcdb6bc Merge branch 'master' of git://github.com/wesnoth/wesnoth 2014-06-01 18:58:48 -04:00
Chris Beck
a21baf01ef add a check that unit_map.end() is invalid for dereference 2014-06-01 18:58:25 -04:00
gfgtdf
6a8827a071 Merge pull request #181 from gfgtdf/gamestate_refactor
game_state refactor
2014-06-02 00:56:33 +02:00
gfgtdf
1a03e61165 move next_scenario_append/setting to carryover 2014-06-01 23:59:16 +02:00