Age | Commit message (Collapse) | Author | Files | Lines |
|
idea for the speech, I accidently trimmed it down to just the item name
before.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
model (none of the changes yet make visible improvements yet,
unfortunately).
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
to be opaque, the text area in the NPC window wasn't transparent, and
was rather noticeable using Aethyra's color scheme, cause it shows up
as white)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
commits ago.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
isn't broken. Also added a string which should be translated in the Buy
class for substitution by gettext.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
position.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
|
|
clicking on add to chat to put the item in the chat input. Left click
the item link to show a popup description, and click the link again to
remove the popup.
|
|
made by Jarvellis.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
More branding-neutral == good
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
(cherry picked from commit 1ac350cb425249f37961206a04427e084d2fa833)
Conflicts:
packaging/windows/setup.nsi
|
|
|
|
use the layout engine.
Signed-off-by: Ira Rice <irarice@gmail.com>
(cherry picked from Aethyra commit fa007dafa2c499425e7112095cbda9c2ff5ea20c)
Conflicts:
src/gui/debugwindow.cpp
|
|
(cherry picked from mainline commit 2a7c63f6070606e6623a9730aa1ca9d52c942055)
|
|
|
|
|
|
|
|
|
|
GNU. Fixed that, as well as found why we were indented as many lines as
we were in the first place.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
my mind.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
In order to stay consistent with the video setup page.
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Also don't set "The Mana World" to start with.
Signed-off-by: Ira Rice <irarice@gmail.com>
(cherry picked from Aethyra commit d2b804c1a817ccdd85b4b1220bf929e9d370d774)
Conflicts:
src/game.cpp
src/gui/inttextfield.cpp
src/gui/item_amount.cpp
src/gui/textfield.h
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Most of it applies to us as well, thanks!
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
In order to stay consistent with the video setup page.
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
(cherry picked from Aethyra commit adfa6fa21b1ef5c8169538ca5c4896bf86e59d6a)
Conflicts:
src/gui/setup_audio.cpp
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
(cherry picked from commit e3f05299f81cd2e567531df6729de0f34970a9e9)
Conflicts:
src/gui/setup_joystick.cpp
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
(cherry picked from commit 18c00fedebda79d4ebfbe15401c3e5bc8869fda2)
Conflicts:
src/gui/setup_players.cpp
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
(cherry picked from commit 8f28b18a31fc8415fbf6aedc5106b8b8525f4caf)
Conflicts:
src/gui/setup_keyboard.cpp
src/gui/setup_video.cpp
|
|
doesn't PhysFS handle this properly?!?) when there's already an update
directory. Also fixed the recorder class so that it's fixed on Windows
as well.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
use the layout engine.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
model, cause it's a mess.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
again.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
uniform GUI style.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
completing, as well as making it so that the server can actually
use the string to match to the same value (which it wasn't doing before.
Did anyone think to test that?) Would eventually like to whittle down
the wasted bytes sent, but this so far is the least number that can be
done, make it so that strings can be matched, and on top of that, NOT
crash the map server.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
NPC String class. The Integer input field was rather horribly broken to
the point where it could send invalid data, the increment and decrement
buttons didn't work, and overall it was tripping over itself. As for the
NPC String, "The Mana World" as a string is not needed to set the field
to that length, but instead fills the text field with that text for
starting. This is completely inappropriate for a text entry field, and a
more sensible default would be to leave it empty, so that people can
type in what they want without having to delete it.
Signed-off-by: Ira Rice <irarice@gmail.com>
|