70863 Commits

Author SHA1 Message Date
ln-zookeeper
c7bbb809b8 Changed resistances and hitpoints for Tentacle of the Deep
Based on forum discussion: https://forums.wesnoth.org/viewtopic.php?t=46922
2018-02-04 21:30:16 +02:00
Sofartin
09bc22bac8 Upgrade Info.plist 2018-02-04 19:05:16 +02:00
Sofartin
2935b6a186 Fix and Upgrade Xcode project 2018-02-04 19:05:16 +02:00
Charles Dang
36bd8dba8a Multiplayer: wmlindent run
[ci skip]
2018-02-05 04:00:09 +11:00
Charles Dang
1b79cb65f2 ANL: removed a bunch of duplicate allow_player= keys
[ci skip]
2018-02-05 04:00:08 +11:00
loonycyborg
240d9d995d pot-update and regenerate doc files 2018-02-04 19:46:58 +03:00
loonycyborg
83c5b5c5b3 Fix incorrect port of os.path.walk to os.walk 2018-02-04 19:46:45 +03:00
loonycyborg
aa294390ca Revert "pot-update and regenerate doc files"
This reverts commit e00ed07a658ebd0c8a7bf2d6bcaf0dac29a2a362.
2018-02-04 19:46:45 +03:00
Severin Glöckner
02c79cf176 Dark Forecast: lock team selection
[ci skip]
2018-02-04 16:27:17 +01:00
Charles Dang
22087f47d3 Connect Engine: make team_ unsigned since it's never less than 0
Should fix Travis build.
2018-02-05 01:32:49 +11:00
Charles Dang
77a06e2812 MP Staging: fixed team setting issue when some sides were hidden (fixes #2436)
This was caused by the same bug I added a workaround for in a02c568b785f9d30373aef806507da60000ff1c9.
Essentially, the differing size of player_teams_ and team_names_ could cause an index mismatch if
some sides had allow_player=no and debug mode wasn't on. I didn't notice this before since I always
work with debug mode on.

I've reworked the connect_engine handling of team data. Now, the team_name, user_team_name, and an
is-player-allowed-to-be-on-this-team flag are all handled by a data pod. I've completely removed the
player_teams stuff and instead generate an applicable list of teams for the team menu_button to
display at runtime.

To get around the index disparity issue, I save any displayed team option's index (relative to
connect_engine::team_data) in that option's config (the one then passed to the menu_button). This
allows me to get an appropriate value to pass to connect_engine::set_team without any fancy find-
and-adjust calculations.
2018-02-04 23:59:11 +11:00
Charles Dang
39069c1afa GUI2/Menu Button: added getter for selected row config 2018-02-04 23:59:10 +11:00
Charles Dang
ae48811ba4 Cleaned up cases of ;;
[ci skip]
2018-02-04 23:59:09 +11:00
loonycyborg
e00ed07a65 pot-update and regenerate doc files 2018-02-04 15:46:30 +03:00
Sofartin
3431976cbd Update about.cfg
Add my real name
2018-02-04 17:36:41 +11:00
Celtic Minstrel
61aad57dbd Add new contributors to credits
@stevecotton @hrubymar10 @ilyapopov @fluffbeast
@singalen @kallaballa @SoapGentoo

Also tweak entries for @vgaming @sevu
2018-02-03 23:08:35 -05:00
Celtic Minstrel
54f8b3446d Update changelog 2018-02-03 23:06:33 -05:00
Charles Dang
b6a5341ec4 Pre-release version bump 2018-02-04 12:56:53 +11:00
Charles Dang
c1cfcdb472 Lua: don't allow setting a unit's x,y coordinated to an off-map location 2018-02-04 12:56:52 +11:00
Charles Dang
cfd0f774e4 Rework 883b4f1856a8 (*much* simpler method) 2018-02-04 12:56:52 +11:00
Severin Glöckner
762ec56e06 Dark Forcast: reanable solo playmode
force_lock_settings did also force controller_lock=yes

[ci skip]
2018-02-04 02:40:21 +01:00
Charles Dang
883b4f1856 Expand 13cacd1d1edb by allowing unit.loc = {x, y} 2018-02-04 12:29:20 +11:00
Charles Dang
419568dad5 Tweaked Elvish Outrider description (closes #2429)
[ci skip]

Original suggestion raised by @catagent101 (see PR above), tweaks by myself and @jostephd.
2018-02-04 11:50:57 +11:00
pentarctagon
6976091626 Renames the Dunefolk(formerly Khalifate) units based on forum discussions.
This commit actually changes the contents of the unit files, and adds deprecated.cfg for all the old IDs.
2018-02-04 11:46:50 +11:00
pentarctagon
dc21c42683 Renames the Dunefolk(formerly Khalifate) units based on forum discussions.
See this thread, along with a few linked within:
https://forums.wesnoth.org/viewtopic.php?f=12&t=47704

The purpose of this is both to:
a) Make the unit names more descriptive, so new players especially will have an easier time learning them and knowing what they do.
b) Make them eligible for translation, like the units of other factions are.

This commit only renames the files, along with the faction/AoH faction and wmllint.
2018-02-04 11:46:50 +11:00
ln-zookeeper
461e2aab26 UtBS: Disabled choice of old elf units, although old saves still work 2018-02-03 21:12:54 +02:00
sigurdfdragon
264167edcf Macros: Fixup DEPRECATE_ACTION_MACRO 2018-02-03 12:39:03 -05:00
Charles Dang
7c49995981 Fixup 13cacd1 (use luaL_checkinteger over luaL_checknumber) 2018-02-04 04:21:41 +11:00
Charles Dang
40da35d8de Made use of std::tie for certain unit_map operations 2018-02-04 04:20:22 +11:00
Charles Dang
13cacd1d1e Allow moving on-map units by setting unit.x an unit.y fields. 2018-02-04 03:08:29 +11:00
Charles Dang
fe23166a31 Updated pofix for ae33006
[ci skip]
2018-02-04 02:15:16 +11:00
Charles Dang
ae3300688d HttT S4: minor grammar fix (fixes #2435)
[ci skip]
2018-02-04 02:10:01 +11:00
Charles Dang
a012e7f0c3 Lua/Unit: allow modifying of id field for Lua-only units (fixes #2433)
Celticminstrel recommends restricting this to off-map units until we can be sure
changing the ID is safe in all contexts. I don't see why not, though... but this
should be enough for the situation described in the bug (a unit made with copy_unit).
2018-02-04 02:07:19 +11:00
Charles Dang
64b1ff2292 Added changelog note about missing [event] name= raising error
[ci skip]
2018-02-04 01:35:12 +11:00
Charles Dang
1478f21a77 Added ai::manager::has_manager function
Better than the hack we had before.
2018-02-04 01:34:33 +11:00
Charles Dang
a003633c5a Removed trailing tabs and whitespaces from C++ source
[ci skip]

I ran the same command from 9b7b1751fdda.

Excludes:
* lua/
* spirit_po/
2018-02-04 01:01:39 +11:00
josteph
6b703fd93c pofix: Update for HttT changes in previous commit. 2018-02-04 01:00:33 +11:00
josteph
b802d85a92 HttT S18: Rearrange the merman's message. 2018-02-04 01:00:33 +11:00
josteph
e1d192becf HttT: Fix English grammar and punctuation 2018-02-04 01:00:33 +11:00
Steve Cotton
bf754a8a8e tips: add tips that villages can be lures, and losses are necessary
From oaq's post https://forums.wesnoth.org/viewtopic.php?f=3&t=47702

Kai Laudiss is Kai Krellis' dad, and the quote would be 3 years
before Dead Water.
2018-02-04 00:24:41 +11:00
Jyrki Vesterinen
7ca5a0df64 Attempt to get the backtrace from the C++ unit test executable
Turns out that it's still crashing on startup in Travis,
but no longer giving the old error message

Xlib: extension "RANDR" missing on display ":99.0".

I also removed the old line that ran test_executor.sh only if WML tests had
failed. That made no sense.
2018-02-03 13:51:16 +02:00
Jyrki Vesterinen
f40a4966bc Travis CI: enable C++ unit tests
The tests should be able to run in Docker, and now when they are no longer
failing, we can enable them.
2018-02-03 12:17:53 +02:00
Jyrki Vesterinen
a67e13b4c5 Fix C++ unit tests
Regression from commit f2b31ba082e1ff47443120469e06b89318f37284.

The calls to get_fake_display() must not be removed. They are essential to
change the size of the fake screen. Fortunately we have a unit test to
check that constructing GUI2 windows doesn't succeed if the screen is way
too small.
2018-02-03 12:16:05 +02:00
Steve Cotton
07054112b0 Make [cancel_action] set_action_canceled (fixes #2430)
It was calling the getter instead of the setter.
2018-02-03 14:25:08 +11:00
josteph
e48964fa1b pofix: Add wesnoth-help fixes from previous commit. 2018-02-03 14:04:42 +11:00
josteph
a83a7cabda core: Fix grammar in Lich description. 2018-02-03 14:04:42 +11:00
josteph
4ac110b8b5 core: Fix grammar and punctuation
Split from #2390 at @GregoryLundberg's request.
2018-02-03 14:04:42 +11:00
sigurdfdragon
23dddd88b9 SotA: Call the passengers what they are
Names are only seen in S04 in the sidebar.
2018-02-02 18:23:52 -05:00
Severin Glöckner
9cd5d03609 remove very old gentoo packaging file
[ci skip]
2018-02-03 00:07:07 +01:00
Severin Glöckner
3777a5b307 add an appdata file for appstream software centers
(closes #1831 & #2160)
2018-02-02 23:46:59 +01:00