Commit graph

191 commits

Author SHA1 Message Date
ville
169cff9ec7 Adds a preference item for a sound being played and desktop notifications in the lobby when a new game is created.
Remove unnecessary blank lines and debugging comments

- Adds a preferences entry in the multiplayer/alerts menu so sounds and desktop notifications can be toggled.

Reformat a few points for consistency

Have desktop notification show name and scenario of new game

Have desktop notification show name and scenario of new game

Update desktop notifications to use VGETTEXT for translations

(cherry picked from commit af71dbf1b1)
(cherry picked from commit a2d9943286)
2019-08-27 13:41:01 +10:00
Jyrki Vesterinen
34d93d44ca Hide battery status if the device doesn't have a battery
The strategy is two-fold. We move the rendering of the icon into the
battery status report where it can be disabled at runtime, and allow the
countdown/clock to move to the position of the battery status if the device
doesn't have a battery. I also moved rendering of the clock icon to the
time report to allow the icon to move together with the text.

I needed to change theme::status_ to store pointers to status items because
otherwise the countdown object loses its type when inserted to the map. And
to be able to use std::unique_ptr inside the theme class, I had to make the
class non-copyable and movable.
2018-10-30 07:46:50 +02:00
gfgtdf
bc89512a5c add game_config.combat experience
and make [harm_unit] use these values instead of hardcoded 8*level for
killing and level for combat.

(cherry-picked from commit 3591e82586)
2018-10-07 03:25:00 +00:00
Martin Hrubý (hrubymar10)
674fda85b7 Migrate links to https if available - Fwd c18537edc0
(cherry-picked from commit bc4d22dc72)
2018-10-07 03:23:36 +00:00
Charles Dang
553cacd88e Moved game version stuff from game_config.hpp to version.hpp
They're still in the game_config namespace but are now in a more logical header.

game_config::version has been replaced with wesnoth_version.str(), save for one case
where it was replaced with wesnoth_version directly (it was a comparison against another
version_info object; no need to compare against a string...).

Also cleaned up a bunch of game_config.hpp includes.

(cherry-picked from commit b8d051cb72)
2018-10-07 03:18:49 +00:00
Charles Dang
45f871067f Use std::size_t everywhere instead of plain size_t
Excludes:
* spirit_po/
* xBRZ/

(cherry-picked from commit fc2a58f693)
2018-10-07 03:17:59 +00:00
Celtic Minstrel
dc0d6474e8 Boost deprecation logdomain severity when debug mode is enabled 2018-03-04 21:21:33 -05:00
Gregory A Lundberg
b5f76eff79
Bump copyright to 2018 2018-01-19 00:02:20 -06:00
Celtic Minstrel
74cff96475 Vary victory laurel in campaign select, depending on the difficulty beaten at
(No change to the laurel in difficulty select.)
2017-08-14 12:36:08 -04:00
Charles Dang
2101353d36 Convert include guards to the shorter #pragma once
Turns out I mistook @celticminstrel's opinion that we should use include guards over pragma (737916e).
Since all major compilers support `#pragma once`, there's no reason not to use it.

For future mergability reasons, this excludes src/spirit_po and src/xBRZ. It also excludes src/boost-patched.
2017-05-09 19:41:37 +11:00
Celtic Minstrel
4c5bf2dae2 Auto-build default team colors list 2017-05-05 21:26:28 -04:00
Celtic Minstrel
b0510bfdc7 Load valid zoom levels from [game_config] 2017-05-05 18:13:48 -04:00
gfgtdf
23f1cc1349 change game_config::default_victory_music to vector type 2017-03-23 18:08:16 +01:00
Celtic Minstrel
b4dc11ce36 Belated 2017 copyright update 2017-03-19 10:05:38 -04:00
Celtic Minstrel
e7e5ca5fa2 Fix Travis 2016-12-01 15:06:25 +02:00
Charles Dang
f2ab245e8d Refactor color_range to use color_t
Temporarily breaks TC/RC coloring, will fix.
2016-12-01 21:44:13 +11:00
Charles Dang
3e0797d3a6 Initial refactor of game_config::red_to_green and blue_to_white to use color_t 2016-12-01 07:56:04 +11:00
Charles Dang
9baabccf91 Use standard library includes instead of C includes when possible 2016-11-30 11:48:10 +11:00
Charles Dang
396267c900 Game Config: added default_color_list= key
This key contains the color range ids of the standard colors in the default order.

Previously, classes such as the connect_engine would have to cast ints to strings and browse for the numerically id-ed
color ranges. Consequently, since there are only 9 ranges identified by that method, 9 became a hardcoded number of
colors in certain places. This key allows for greater control over order and content of the default colors.
2016-10-12 01:04:05 +11:00
Celtic Minstrel
b295aab4ba Deprecate {MAGENTA_IS_THE_TEAM_COLOR}
The magenta colour is now the default flag_rgb colour if one is not specified.
2016-08-05 00:49:39 -04:00
dorng
c67538f93d [game_config]: new keys for logo
remove hardcoded path for logo image
add 'game_logo' & 'game_logo_background' keys in [game_config]
this allows [core] authors to define their own game logo to appear on the title screen
this does not (yet) affect the loadscreen
2016-06-16 00:15:53 +02:00
loonycyborg
7666030367 Merge branch 'master' into asio_wesnothd 2016-01-19 15:21:06 +03:00
Chris Beck
ba51524f6e update copyright to year 2016
using this shell script:

find src -type f -print0 | xargs -0 sed -i "s|Copyright (C) \([[:digit:]]*\)\([ ]*\)-\([ ]*\)2015|Copyright (C) \1\2-\32016|g"
2016-01-02 23:59:31 -05:00
Andreas Löf
1f41eca6e1 Make the default title screen a getter function.
This fixes a crash at startup when the preferences attempted to
retrieve a translated string before logging was enabled.
2016-01-03 13:40:15 +13:00
Charles Dang
64a5ae6851 Added and deployed a default_title_string var 2016-01-03 05:23:45 +11:00
gfgtdf
7f13156c28 Revert "Rename team_name/user_team_name to team_id/team_name (old syntax still valid)"
And related commits.

This reverts commit 545253ec2b.
This reverts commit 1215f65eb8.
This reverts commit 11664f4024.
This reverts commit e948df3424.
This reverts commit 3781e7839f.

This commits were reverted to exclude them from wesnoth 1.13.2 release because:
1) We are still unsure about the best name oftthese attributes
2) This breaks multiple campaigns, including LoW and the tutorial.
Feel free to revert this revert after 1.13.2 when thse issues can be solved..
2015-12-10 21:29:52 +01:00
loonycyborg
5d49489502 Use int types from stdint.h instead of SDL_Types.h 2015-10-30 15:06:06 +03:00
Charles Dang
3781e7839f Rename team_name/user_team_name to team_id/team_name (old syntax still valid) 2015-10-26 00:44:28 +11:00
Lari Nieminen
f6c6c482de Added list of customizable poison/slow/petrify sounds to game_config 2015-08-28 23:54:39 +03:00
gfgtdf
2fb119d964 revert 'option to disable most of spmp patch'
That commit was meant as a plan b in case we couldn't fix the spmp
related bugs which are now fixed.
2015-08-27 15:25:21 +02:00
gfgtdf
024c56459e option to disable most of spmp patch
adds a bool variable in game_config which comepltely disables the
configure_engine, and connect_engine in sp.

Using this should fix https://gna.org/bugs/?23629 and
https://gna.org/bugs/?23496 but some bugs of the spmp patch like the
additional config reload in the campaigns  menu are still present.
2015-06-18 00:24:57 +02:00
gfgtdf
280dd8e7ed fix some indention 2015-03-22 01:39:55 +01:00
Ignacio R. Morelle
57ae45387a New Year copyright update 2015-01-01 19:07:35 -03:00
Fabian Müller
21484aa5bc Add no_addon item to the game_config:: namespace.
This will be used to switch addons off during runtime.
Used for fallback if loading fails.
Can later be used to give gui controll over loading the addons.
2014-11-07 23:17:23 +01:00
Chris Beck
17d6b5e574 read sounds from the game_config.cfg, rename sounds to match ui ids
I'm renaming the sounds to match the ui ids, because currently the
lobby sounds options dialog gives for each event, the name of the
corresponding sound entry in game_config.cfg, and I want the code
to look up those ids to be as simple as possible.
2014-10-11 23:44:26 -04:00
Chris Beck
4b99454c27 move notifiation icon path to game_config 2014-07-14 15:40:56 -04:00
fendrin
1e5d58af6a Made the orb and minimap colors configurable by the preferences. 2014-03-15 14:37:16 +01:00
Chris Beck
21e167f6eb add a sound played when the host clicks "begin" in an mp game 2014-02-21 23:33:06 -05:00
Ignacio R. Morelle
a4f47a63c7 New Year copyright update 2014-01-01 02:08:52 -03:00
Alexander van Gessel
2b22f942e0 Get rid of an unnecessary variable 2013-12-27 21:30:10 +01:00
Ignacio R. Morelle
11c038214e Merge pull request #85 from cbeck88/party-full-bell
Party full bell
2013-12-11 16:30:51 -08:00
Chris Beck
880d9f68a9 added game_config::sounds::party_full_sound, defaults to turn bell
and switched multiplayer_connect.cpp to use this sound
changed debugging output message
2013-12-08 02:40:58 -05:00
Alexander van Gessel
a7b99d3d83 Make game_config::test_version a version_info object 2013-12-05 19:42:41 +01:00
Andrius Silinskas
758fc8c5da Goto mp::connect/wait only if "allow_new_game=yes".
The "--campaign-screens" command line option has been removed since it
is no longer useful.
2013-09-05 18:33:43 +01:00
Andrius Silinskas
f7fa3c59b5 Display mp::wait (temporary dummy) in between mp::scenarios.
The screen is displayed only if '--campaign-screens' command line
option was specified. The same now goes for mp::connect screen for the
game's host.

Server has been modified to not immediately start the game after
'store_next_scenario', but to wait for explicit 'start_game'.

Minor changes to parameter passing inside multiplayer.?pp have been
made as well.
2013-09-05 18:33:34 +01:00
Andrius Silinskas
74bf86cd91 Remove --new-syntax command line option. 2013-06-19 13:59:26 +01:00
fendrin
2dff1967bf New orb image wired in. 2013-06-09 08:47:10 +02:00
fendrin
725634eae3 Variables pointing to the radiobutton images. 2013-04-29 10:19:29 +02:00
Eric S. Raymond
043c4f9fd3 Remove $Id$ cookies. 2013-03-26 21:41:37 -04:00
Boldizsár Lipka
9575893446 Wire in the new wooden background as game_title_background. 2013-03-03 20:54:22 +00:00