| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
Conflicts:
CMakeLists.txt
configure.ac
data/help/header.txt
packaging/windows/setup.nsi
po/POTFILES.in
src/being.cpp
src/being.h
src/game.cpp
src/gui/color.cpp
src/gui/color.h
src/gui/equipmentwindow.h
src/gui/popupmenu.cpp
src/gui/recorder.cpp
src/gui/setup_colors.h
src/gui/setup_keyboard.cpp
src/gui/setup_keyboard.h
src/gui/skill.cpp
src/gui/speechbubble.cpp
src/gui/speechbubble.h
src/gui/table.cpp
src/keyboardconfig.cpp
src/keyboardconfig.h
src/localplayer.cpp
src/main.cpp
src/main.h
src/map.cpp
src/resources/colordb.cpp
src/resources/colordb.h
src/resources/emotedb.cpp
src/resources/emotedb.h
src/text.cpp
src/text.h
src/tmw.rc
src/winver.h
|
|
Adds two configurable "ignore" keys.
Stops the character moving about if the user's window manager
uses "ignore+arrow key" to switch virtual desktops.
|
|
Mainly removed trailing whitespace. Also small fix in header of
recorder.cpp.
|
|
useful since buddy lists are tracked through the player relation
interface instead)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Mainly removed trailing whitespace. Also small fix in header of
recorder.cpp.
|
|
Conflicts:
docs/FAQ.txt
packaging/windows/make-translations.vbs
src/Makefile.am
src/gui/colour.cpp
src/gui/colour.h
src/gui/popupmenu.cpp
src/gui/setup_colours.h
src/main.cpp
src/main.h
src/resources/resourcemanager.cpp
src/text.cpp
src/text.h
src/textmanager.cpp
src/textmanager.h
|
|
Removed tab characters and trailing spaces and added spaces between
"if(", "for(", "while(" and "switch(".
|
|
Conflicts:
A lot of files...
|
|
Removed tab characters and trailing spaces and added spaces between
"if(", "for(", "while(" and "switch(".
|
|
Also credited Joshua Langley in the AUTHORS file.
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
then you won't be able to type spaces in the NPC integer or string
dialogs. And no, assigning focus to the ok button doesn't resolve
anything, but makes things worse, as then the user has to click on the
input field to input text, then must click the ok button, as the chat
window already overrode it's confirmation action), this commit allows for
both the chat input and the NPC dialog confirming to share the same key,
but allows for people to change one or the other if they want to. This
will still allow for the player to use the keyboard fully for NPC
dialogs, but allow for people who don't like not being able to use chat
with an NPC dialog open to assign confirmation to another key and get
their way as well.
This is a rather ugly way of resolving both sides of the issue, but it's
the only way to appease both sides. The Aethyra players want things the
way they were, while Bjorn wanted things a different way.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
complaint commit d2876ad85935c5d0b181d050bd4c19a4682123b1 (btw, if
you're concerned about that, return is also a bad choice for the chat
window in general, which overrides the GuiChan default for use widget.
Tab would also be a bad choice, as it cycles through the widgets), next,
I made the text displayed by the keyboard configuration setup dialog
translatable, and lastly, I exposed the rest of the previously
unconfigurable keys to be configurable through the keyboard setup tab.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
This dates back to the old days of TMW, but the usage instructions of
GPLv2 don't mention this being necessary. Since it doesn't add anything,
avoid the branding in these sections.
|
|
code so that only one term is used everywhere (to simplify
maintainability), as well as corrected several variable names and
comments where there was copy/pasted code, but it wasn't corrected. Also
moved emote shortcuts back to where they were originally, to reduce
player confusion when the next build comes around.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
TODO list of 1.9 still intact.
|
|
different purpose (as smiley are requiring a special key press, that's
not a problem to assign the same key to differents purpose)
The function of game.cpp get reindented in the process, but the actual
change is minor.
The keyboardconfig get a new function, returning directly the emoticon
offset from the key pressed. (later, that function will return the index
of the smiley shortcut/array that has been selected... later)
Signed-off-by: Forge <jgrimbert@free.fr>
|
|
First step to more smileys...
Fully functionnal, very minor modifications
Provisions made for second step (windows for choosing smiley)
Signed-off-by: Forge <jgrimbert@free.fr>
|
|
|
|
statements, as well as removing the new skill dialog, which we do not,
nor will we use (if we do, it'd be a new one that we'd make).
WARNING!!! This, and all other previous builds have a linker error for
the Gnome libraries version 4.3.2 on my setup. It's assumed that this is
also the case for other users of this library as well. I'm currently
assuming that there's a bug in the compiler itself, and will look into
reporting this, but in the mean time, it doesn't build for these users,
unfortunately. Sorry about this.
|
|
it do exactly that in the local player. Since it already was doing this
behavior anyways, I just extended it out to stop attack at any point in
the attack.
|
|
an NPC, n for targeting an NPC, and changed basic targeting code so that
it'll time out after being on a target for longer than a minute.
|
|
|
|
|
|
Trinexx. Some mapping fixes at snake dungeon map.
|
|
Changed default sitting key back to 's'.
Fixed a problem with all equipment being interpreted as weapon sprite.
|
|
|
|
|
|
|
|
config.
m_id:16
|
|
the list of source files. Also set some missing Subversion properties.
|
|
http://mantis.themanaworld.org/view.php?id=16
|
|
|
