80787 Commits

Author SHA1 Message Date
mattsc
5aee9edb65
Merge pull request #6818 from mattsc/sound_path
Do not show user name in output
2022-07-01 16:17:57 -07:00
mattsc
7f14cc57ee Fix seg fault when weapon is removed during attack
Events during attacks may modify either of the units involved. If, as a result, one of the units does not have a weapon of the type used any more, this previously caused a segmentation fault in unit_attack() in udisplay.cpp. The solution is to set the remaining number of strikes for the unit to zero. This prevents that unit from striking again, but lets the opponent continue its attack.

Fixes #4927 and #5914
2022-07-01 15:50:50 -07:00
mattsc
221bae4e2d
Merge pull request #6817 from mattsc/unit_debug_error
Add no-unit error message for unit debug command
2022-07-01 15:41:27 -07:00
mattsc
ea749d5cef Apply sanitize_path to output not using the logger 2022-07-01 14:19:23 -07:00
mattsc
4c0c21c98d Logger: do not show user name in paths
This fixes #3777
2022-07-01 14:17:15 -07:00
Celtic Minstrel
8cb19eafbf Xcode: Add a sample command-line argument to the unit test scheme 2022-07-01 15:54:17 -04:00
Celtic Minstrel
3d20ea27d2 Xcode: Copy additional libraries so the unit tests can run 2022-07-01 15:42:21 -04:00
Celtic Minstrel
eddd762615 Xcode: Add additional rpath entries to wesnothd
This should allow it to run in different configurations:
- When clicking "run" in Xcode, it's adjacent to the Wesnoth applicaiton
- If you wanted a standalone install of wesnothd you'd now only need to copy over the Frameworks directory.

All of this assumes that wesnothd will run at all, which works with a debug build but probably not in the actual release.
2022-07-01 15:39:26 -04:00
Celtic Minstrel
864666f1dc Xcode: Set unit tests runpath correctly 2022-07-01 15:36:08 -04:00
Celtic Minstrel
bcdecb1185 Xcode: Update unit tests working directory 2022-07-01 15:35:37 -04:00
Celtic Minstrel
b14061d619 Xcode: Fix link errors in unit tests 2022-07-01 15:12:33 -04:00
Celtic Minstrel
348834b03a Xcode: fixup log option in the scheme 2022-07-01 13:57:41 -04:00
Celtic Minstrel
12b52ea179 Xcode: Add a bunch of useful command-line options to the scheme, but defaulted to off.
The motivation for this is that Xcode is (for some reason) incapable of automatically reloading a scheme that has changed on disk, and overwrites it the moment you try to edit it with whatever it has in memory.

With this change, the information lost when it does that will be much less; in many cases, just a checkbox to toggle back on.
2022-07-01 13:56:46 -04:00
Celtic Minstrel
c972b393d6 Remove Lua kernel from resources before game_events
This is how it's done in reset_gamestate, and it's consistently assigned into resources after game_events. Being different can only be wrong.
2022-07-01 13:46:32 -04:00
Celtic Minstrel
ab9fb12d24 Add an actual use for guard_value
This does the exact same thing as the ON_SCOPE_EXIT that was there but in less code.
2022-07-01 13:26:51 -04:00
Pentarctagon
08cc17ac1a Put this in the right textdomain. 2022-07-01 10:21:39 -05:00
Pentarctagon
e3fbf930f3 Whitespace fixup. 2022-07-01 10:21:39 -05:00
Pentarctagon
536eaa67b4 Move hero string macro text into their definitions. 2022-07-01 10:21:39 -05:00
Pentarctagon
b15c3420d3 Remove silly GUI macro. 2022-07-01 10:21:39 -05:00
Pentarctagon
0ca5a97d1f Move mainline string macro text into various definitions. 2022-07-01 10:21:39 -05:00
Pentarctagon
d7fa23abc5 Move effect string macro text into various definitions. 2022-07-01 10:21:39 -05:00
Pentarctagon
df99280274 Move artifact string macro text into artifact definitions. 2022-07-01 10:21:39 -05:00
Pentarctagon
3eb75b3e48 Remove some training.cfg one-liner macros. 2022-07-01 10:21:39 -05:00
Pentarctagon
875c6e0cf1 Remove WORLD_CONQUEST_II_CAMPAIGN_RESOURCE from its own file. 2022-07-01 10:21:39 -05:00
Pentarctagon
159396fdc0 Remove one-liner macros used once within the same file. 2022-07-01 10:21:39 -05:00
Pentarctagon
d472e2acb0 Remove factions/random.cfg and its macro. 2022-07-01 10:21:39 -05:00
Pentarctagon
ff5f795663 Remove factions/strings.cfg and related macros.. 2022-07-01 10:21:39 -05:00
Pentarctagon
0b6eb2a6e0 Remove config.cfg and era-related single use macros. 2022-07-01 10:21:39 -05:00
Tahsin Jahin Khalid
4252fad434
Update Death Squire and Bone Knight units (#6820)
* Death Squire, Bone Knight: rename files
* Bone Knight, Death Squire, Skeleton Rider: attack icon change
* Bone Knight: stats adjust
2022-07-01 02:41:03 -04:00
Tommy
bc63f4f00c color_t: Inherit from SDL_Color 2022-07-01 17:11:16 +12:00
Tommy
4489f358f8 sdl/point: Inherit from SDL_Point 2022-07-01 17:11:16 +12:00
Astrid Halberkamp
4878c3565e
Add the Skeleton Rider line and Death Squire to core (#6088) 2022-06-30 23:34:17 -04:00
Tommy
613f047c1e Remove hex_brightening config option
It is not used, and appears to have been unused for a long time.
It was related to mouseover hex brightening, but the brightening
amount is hardcoded. There were associated hex_semi_brightening,
mouseover_image and selected_image keys, but that info is also
hardcoded, and those keys appear to have been removed already.
2022-07-01 15:06:25 +12:00
Tommy
e44129fb91 Address some slightly less straightforward TODOs 2022-07-01 15:06:25 +12:00
Tommy
827ae6568a Remove some done and trivial todos. 2022-07-01 15:06:25 +12:00
mattsc
a961ce8a56 Add no-unit error message for unit debug command
Fixes #6116
2022-06-30 08:34:24 -07:00
Tommy
c6c3480605 draw: Empty src and dst rects can be passed to several drawing functions
They behave as if the parameter was not given.
2022-06-30 23:02:51 +12:00
Pentarctagon
44d41ff93f Manual forward-port of #4244.
This seems to have been applied to 1.14, but not 1.15/master at the time.

-

Revert network_transmission.cpp/hpp to its 1.14.7 version

I re-ran the timing test discussed in PR wesnoth#4201 (comment linked to below), and
saw similar numbers.  The old, simpler code downloads an 86.1MB addon in 25
seconds, the code with the extra thread takes 29 seconds.

https://github.com/wesnoth/wesnoth/pull/4201#issuecomment-517856090
2022-06-29 20:48:38 -05:00
Celtic Minstrel
9ade435cd4
Remove WC's custom Pick Your Advancements mod (#6807) 2022-06-29 19:29:04 -04:00
newfrenchy83
a077235e8d update codeblock projectfiles 2022-06-29 13:35:49 +02:00
Pentarctagon
1244639dc7
Fix whitespace. 2022-06-28 23:34:27 -05:00
Celtic Minstrel
a089c6e5ea Deprecate {AI_CA_POISONING}
This was already effectively deprecated by proxy due to the overall deprecation of FormulaAI.
So this just adds a message.
2022-06-28 23:07:50 -04:00
Tommy
9b9d30bd7f GUI2: Move alternate create_rect() implementation to sdl/rect.hpp
gui/widgets/helper.*pp had an implementation creating a rectangle
from points. It was added to sdl/rect.hpp.
2022-06-29 13:13:15 +12:00
Tommy
132a45c52f sdl/rect: Move fill_surface_rect to sdl/utils.hpp
And then have to clean up over a dozen files that were relying on
sdl/rect.hpp including sdl/utils.hpp and various other side effects.
2022-06-29 13:13:15 +12:00
Tommy
c2e23b64f6 sdl/utils: Remove several unused functions
sdl_copy_portion (only used one place internally, so inlined there)
stretch_surface_horizontal (obsoleted by hardware rendering)
stretch_surface_vertical (obsoleted by hardware rendering)
tile_surface (obsoleted by hardware rendering)
surface_submerge_alpha (now done via IPF)
blit_surface (not used anywhere, so sdl_blit must be fine)
2022-06-29 13:13:15 +12:00
Tommy
614d405663 sdl: Finish moving functions out of render_utils.hpp
Functions have moved to draw.hpp and sdl/texture.hpp as appropriate.
Most of these had already moved. set_texture_blend_mode() was the last
uncategorized function. It is now in texture.hpp.
2022-06-29 13:13:15 +12:00
Tommy
6661d4423b sdl/texture: add getters/setters for alpha mod, color mod, blend mode. 2022-06-29 13:13:15 +12:00
mattsc
38978feadd Schema: allow key values to be variables 2022-06-28 09:47:11 -05:00
mattsc
1eca762270 Schema: add missing newline character to message 2022-06-28 09:47:11 -05:00
mattsc
6fcca95be0 Schema: Add missing path key to [textdomain] 2022-06-28 09:47:11 -05:00