Age | Commit message (Collapse) | Author | Files | Lines |
|
Moved remaining widgets into widgets folder, standardized include order, moved TextRenderer out.
|
|
Index 0 is now a valid index, namely the first item in the inventory. I
forgot to change this line to use -1.
|
|
Also cleaned up some debug log statements, fixed initialization order,
removed an unused member variable and added some documentation.
|
|
|
|
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
|
|
useful since buddy lists are tracked through the player relation
interface instead)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
include anything not needed by that specific widget or window. This
appears to have cleaned up system performance a bit on my current setup,
where it went from idling on 45% in game with opengl down to 30% now.
Also moved iptostring to the tostring header, as importing all of
network.h is a little overkill to use that function, and it goes along
with the basic functions that are in that header file anyways. TODO:
find out a way to get rid of warnings when a class doesn't use this
function.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
spots that could also be fixed up as well, but require other methods to
fix them (the filled color rectangles on the progress bars, as well as
the text on them as well, as an example).
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
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>
|
|
All is done, and all files are now in the tree.
(ok, copyright of new files is still opened... do as you want, if you
care)
Signed-off-by: Forge <jgrimbert@free.fr>
|
|
The window listing the smiley is ok (F11).
The window for shortcut of smiley is in progress (F12)
So far, you can use any available smiley directly (mouse interface)
and can get a reminder of the keybinding in the shortcut window.
Yet to be done (for final step 2.0):
* Transform the keybinding into the actual mapping of the shortcut seen in
F12
* Drag & Drop from F11 to F12 windows and from F12 to F12
* Code factorisation for class ShortcutContainer and derivatives Item &
Smiley (so far, most code is shared, but actually in 3 places, should
keep only specific code in leaf-class, and main code in parent)
Revision of copyright message (so far, only a cut-paste of inspiring
previous files)
* Save shortcut-smiley mapping on exit (and reload on start)
(with protection against changing smiley-list)
|