24303 Commits

Author SHA1 Message Date
Charles Dang
8d1ec6216b Added two missing textdomain headers
[ci skip]

Should fix two of the issues mentioned in 2709.
2018-03-22 22:08:38 +11:00
Lari Nieminen
4d86af796c
EI: Fix Lua syntax error from 3783693cbe95
[ci skip]
2018-03-22 09:51:37 +02:00
ln-zookeeper
3be2ff5187 EI S03: Changed Mal-Kallat back to male
He was changed to female in f4d67031a436 even though he's addressed as "brother" in dialogue. Reported on the forums.
2018-03-21 11:25:28 +02:00
Iris Morelle
39b05dd0db wam: Update description and name for Modifications
They are no longer just for multiplayer mode (see issue #1475, commit
a09e2bb8583c6125f8c4e3157d6eba8bbd800b62).

[ci skip]
2018-03-21 00:14:41 -03:00
Charles Dang
075a9bac34 Get the GUI2 in-game UI at least appearing
I decided to go with a modular approach, where both in-game and editor UI dialogs inherit
from a single base class, a pointer of which is owned by the display class. That can be
used for common functionality that needs be shared by all in-game dialogs.

Right now the new UI is just static. It works with most stuff, but not key presses. Working
on that...
2018-03-20 04:47:42 +11:00
Charles Dang
1167e3e78b Some build fixups to reflect changes since the help commits were originally made 2018-03-19 10:48:48 +11:00
Charles Dang
5193c7e7bf Help Browser: removed help topic padding 2018-03-19 10:48:06 +11:00
Charles Dang
75639bafd1 Help Browser: fixup topic title layout 2018-03-19 10:48:04 +11:00
Celtic Minstrel
854ade5d5c Help Browser: Show topic title 2018-03-19 10:45:09 +11:00
Charles Dang
71a89de7b2 Help Browser: properly implement toggling by clicking the book icons 2018-03-19 10:45:06 +11:00
Charles Dang
231a8ccbf2 Help Browser: implemented viewing of sub-sections/topics 2018-03-19 10:44:01 +11:00
Charles Dang
19eee7e806 Help Browser: improved layout stability and added next/back buttons (non-functional, of course) 2018-03-19 10:43:38 +11:00
Celtic Minstrel
fbd42a7378 Help Browser: Actually show the correct topics with the correct icons
This also fixes the lag when opening help and makes the topic text appear.
(The topic text is not parsed at the moment, though.)
2018-03-19 10:43:25 +11:00
Celtic Minstrel
9902a2df31 Add the advanced prefs entry for the deprecation setting 2018-03-18 16:55:03 -04:00
Charles Dang
ed27b67f1e Port floating textbox/command console to GUI2
The old floating textbox was extremely entwined with the controller_base, play_controller, and menu_handler
classes. controller_base::have_keyboard_focus essentially controlled whether some events were executed based
on whether the floating textbox was open or not. Additionally, those events weren't even reached if a UI dialog
was open at all.

The new design features a singleton console class that can be called from anywhere, not just the game. I've also
decoupled the execution object from play_controller. The relevant functions in menu_handler are now passed to
the console as callbacks.

To work around map events such as clicking not being available if the console was open, I removed the exclusionary
is-in-dialog check from controller_base::handle_event and instead exit early out certain types of events using
controller_base::have_keyboard_focus. As mentioned in the accompanying comment, this isn't the best solution, but
it will do for now.

The new console also isn't fully feature-comparable with the old GUI1 one. The following are still missing:
* The checkbox, for use when sending messages.
* Tab completion.
* A crash occurs when existing the app if a game was exited with the console open.

I'm leaving the old floating_textbox code around for now for reference.
2018-03-19 01:22:18 +11:00
Charles Dang
8396b535c8 GUI2/Window: draw background image first instead of last
Originally was going to do this as workaround for the background tiling over the borders,
but I fixed the root cause of that instead. Still, this just makes more sense.
2018-03-19 01:22:05 +11:00
Charles Dang
e30a2aa520 Added static prototype for GUI2 in-game theme 2018-03-19 01:14:00 +11:00
Charles Dang
41f921bd38 GUI2/Canvas: refactor surface blitting out of drawing routines
This entirely refactors surface blitting out of the canvas. Instead, each canvas owns a texture. This texture
is completely redrawn any time the canvas if marked dirty, else the result is cached and drawn to the screen
each draw cycle.

All windows are now redrawn every draw cycle. The use of the cached canvas textures means there's no noticeable
performance difference (likely a performance gain, actually) from using surface blitting.

There's still some code to clean up and a few things to fix.
2018-03-19 01:13:23 +11:00
ln-zookeeper
3cea4790b8 UtBS: Corrected Sun Singer movetype from float to foot 2018-03-18 14:30:02 +02:00
Iris Morelle
0b3f14d63e campaignd: Set port allocation for version 1.14 2018-03-18 17:25:23 +11:00
Charles Dang
a43623ff2d Screenshot Notification: cleaned up and tweaked a few things
* Added textdomain closure missing from 267510ea076ce317d323da54bb81ccd255b93284
* Avoid use of invalidate_layout by having an em dash in the size field prior to
  saving. That's needed since GUI2 doesn't expand the label's canvas if its text
  is initially empty.
* Use a better button definition for the View button.
* Grouped Save and Close buttons together
2018-03-18 17:01:26 +11:00
Charles Dang
a18522acb8 File Dialog: removed label keys with empty values
[ci skip]

This doesn't do anything.
2018-03-18 17:01:24 +11:00
Celtic Minstrel
5008c72a22
Fixup wml.all_variables 2018-03-18 01:38:39 -04:00
doofus-01
f2cf0f1e5a
defense animation for Quenoth Warrior (will add Champion later) (#2595)
I'm going to merge this, possibly for git-illiteracy reasons, but if this causes problems, it doesn't have to permanently taint the stable branch.  We can fix it later.
2018-03-17 19:06:16 -07:00
Celtic Minstrel
7fcc813438 One more dunefolk tweak
Revert the change to Marauder blade resistance and instead raise Raider blade resistance
2018-03-17 18:52:31 -04:00
Celtic Minstrel
8d74b72031 fixup! Fix missing return in on_event() 2018-03-17 17:21:20 -04:00
Celtic Minstrel
a314876bf2 Use new persistent tags interface for [object] [objectives] [item] 2018-03-17 17:16:23 -04:00
Celtic Minstrel
c266b35528 Fix rabbits AI being broken by save-load 2018-03-17 17:16:22 -04:00
Celtic Minstrel
ddcbb4cb50 Add a more convenient way of registering custom saved game data 2018-03-17 17:16:22 -04:00
Celtic Minstrel
68d545c3be Add a couple more WML utility functions 2018-03-17 16:48:06 -04:00
Celtic Minstrel
d4e08359dd Fix missing return in on_event() 2018-03-17 16:48:04 -04:00
Celtic Minstrel
e776635023 Clear up redundancies in helper compatibility and deprecate the array functions 2018-03-17 16:48:03 -04:00
Celtic Minstrel
4b08a40181 Deprecate wesnoth.set_music 2018-03-17 16:48:02 -04:00
Celtic Minstrel
6e4d09d2a5 Bump up a couple of deprecation levels at @vultraz's request 2018-03-17 16:48:01 -04:00
Celtic Minstrel
08ec9017b5 Lua API: Some tweaks of the experimental wml module 2018-03-17 16:48:00 -04:00
Celtic Minstrel
23aac4f72f Cleanup of fef953a48e258e5b07ff4559eeff5571103d58c1
- Fix the rabbit AI
- Enable invoke_synced_command to also call (some) built-in commands
  and give an error message in the case of an unknown command
- Remove some unnecessary implementation details
2018-03-17 16:48:00 -04:00
stevecotton
29e3468b91 LoW S14 Objectives, reinforcements, edit repetitive dialog (ok for string freeze) (#2585)
Objectives: note that the death of Galtrid is a losing condition

Reinforcements: In multiplayer, Landar's L3 troops that join on turn 9
now join his side, instead of trying to join side 13 (and ending up on
Kalenz' side).

Dialog: the following conversation happened on both turn 1 and turn 9.
Having 6 repeated messages in a row gave a strong sense of deja vu,
and I thought that a bug had repeated an event. This commit cuts the
repetition.

* Elf: "Kalenz! We come to fight beside you!"
* Kalenz: "Where is the rest of the elvish army? ...
* Elf: "The Great Council has decided it was too risky ...
* Landar: "That is well! If the Ka’lian is too fearful or blind ...
* Cleodil: "It is not well that we have become so divided as this."
* Kalenz: "No, it is not. But ...
2018-03-17 20:53:25 +02:00
loonycyborg
cdd1cb692b pot-update and regenerate doc files 2018-03-17 21:37:00 +03:00
Celtic Minstrel
5c3f04518d Attempt to address RIPLIB violations in Raider -> Marauder advancement
- Grant Marauder the mountain movement+defense of the Raider
- Reduce Raider hills defense to match the Marauder
  (avoiding reduction on level-up)
- Adjust Marauder resistances
2018-03-17 14:27:29 -04:00
Celtic Minstrel
c8f95b1bf5 Simplify Piercer resistance definition by only listing those that differ from the movetype 2018-03-17 14:27:29 -04:00
Celtic Minstrel
ee8077ea14 Dunefolk balancing tweaks
- Burner line: -20% cold
- Soldier line: -10% cold
- Soldier line: possibility of fearless trait
- Rover line: +10% pierce
- Piercer: +10% impact
- Reduced Piercer XP
- Increased Rider XP
2018-03-17 14:27:29 -04:00
doofus-01
003942410f [UtBS] Quenoth Mystic and Sun Singer line animations (#2579)
* Initial pass at sun singer animations

* adding sun-shyde and generalizing fire animations

* sun-singer healing anim, and change of default image

* mystic healing animation, and move mystic images to sub-directory

* harmonized sprite file naming scheme for sun-shyde with sun-singer
2018-03-17 19:50:16 +02:00
Jyrki Vesterinen
267510ea07 Show screenshot window before saving the screenshot
In particular, this allows the player to choose the filename before saving,
including the extension. If support for target format is present, Wesnoth
honors the extension and saves the screenshot in that format.

I also changed the default screenshot format back to PNG due to quality
issues JPEG has with pixel art. See discussion in pull request #2655.

This commit doesn't introduce any string changes. I used existing strings
for everything (sometimes having to take them from another textdomain).
2018-03-16 23:45:36 +02:00
Charles Dang
95d9eb7f1b Unit Attack: removed the Choose Weapon text
[ci skip]

Legacy from the GUI1 dialog, not really in line with our current UI.
Replaced it with a spacer.
2018-03-17 00:41:33 +11:00
Charles Dang
134353f863 Further cleanup of deprecated Lua API usecases (inc. ones from fef953a)
[ci skip]
2018-03-17 00:41:32 +11:00
gfgtdf
10a3ef1dac
Merge pull request #2663 from gfgtdf/no_syncedcommand
No synced command
2018-03-16 13:48:22 +01:00
gfgtdf
fef953a48e remove ai.synced_command
fixes #1649 . ai.synced_command could easily be used to implement all types of
undeteced cheats so it was removed. As a replacement this commit adds a
[custom_command] synced command that just calls
wesnoth.game_events.on_synced_command which calls a lua handler that
must first be set.
2018-03-16 13:43:05 +01:00
Charles Dang
85f98fc4d4 Bump map border layers
[ci skip]

Fixes map borders drawing over certain editor overlays. Not sure why UMC editor overlays
weren't affected...

Should also preempt other such issues, since we always want borders to draw on top of
everything.
2018-03-16 22:17:37 +11:00
Charles Dang
55866694ff Editor: added overlay to Fake Shroud terrain
[ci skip]
2018-03-16 20:23:47 +11:00
Charles Dang
79b7e08573 Fixup 3783693cbe95 (removed a C++-ism)
[ci skip]
2018-03-16 11:26:21 +11:00