Age | Commit message (Collapse) | Author | Files | Lines |
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
why. :P)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Also fixed overlap between description label and the buttons and added the
SDL_ttf library to the Code::Blocks project file.
|
|
(cherry picked from mainline commit f6f8b2f885145d4cacf7a6c42d88b6a39f71b366)
Conflicts:
src/openglgraphics.cpp
|
|
|
|
|
|
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97)
Conflicts:
src/net/beinghandler.cpp
src/net/charserverhandler.cpp
src/player.cpp
src/player.h
|
|
(cherry picked from mainline commit ecabe82d8720689905a6d035b0597d97037287c7)
Conflicts:
src/gui/browserbox.cpp
|
|
Put object files in subdirectories. Moved compilation flags to configure
script. Added library header checks.
(cherry picked from mainline commit 0bebbc320d50178a7ece573319cd6687a950dafa)
|
|
(cherry picked from mainline commit ecabe82d8720689905a6d035b0597d97037287c7)
Conflicts:
src/gui/browserbox.cpp
|
|
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97)
Conflicts:
src/net/beinghandler.cpp
src/net/charserverhandler.cpp
src/player.cpp
src/player.h
|
|
|
|
|
|
|
|
(cherry picked from eAthena client)
|
|
|
|
|
|
The font was interpreting the strings as UTF8, as they are in the
mainline client. But in the eAthena client they are regular text.
|
|
(cherry picked from mainline commit 8d1299338e033e1de539dae36856e365855fabc1)
Conflicts:
src/gui/gui.cpp
|
|
Mainly making sure 'const std::string &' is used everywhere instead of
'std::string const &'. The former has always been the preferred order in
this project.
(cherry picked from mainline)
|
|
TODO list of 1.9 still intact.
|
|
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)
|
|
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>
|
|
Noticed by QOAL
|
|
|
|
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>
|
|
|
|
Also fixed overlap between description label and the buttons and added the
SDL_ttf library to the Code::Blocks project file.
|
|
(cherry picked from mainline commit f6f8b2f885145d4cacf7a6c42d88b6a39f71b366)
Conflicts:
src/openglgraphics.cpp
|
|
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
in)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
class.
NOTE: This commit adds a brand new dependency (SDL_TTF). Make sure to
install it, regenerate your config files, reconfigure, and then install
before attempting to compile.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
on the screen.
(cherry picked from mainline commit 483c76d1b2433bc34f67406a10bf409fb2daafe1)
|
|
(cherry picked from mainline commit 0962fc8b567279a6e97e13e4b3f2f9f2ffe304c0)
|
|
(cherry picked from mainline commit 89a1dcb59be3e531cc0761c32d1aa70e141d4a12)
|
|
(cherry-picked from mainline)
|
|
|
|
(cherry-picked from mainline)
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
white for wallpapers (matches our wallpapers better), and fixed the
effect manager.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
check in the ColorDB.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
(cherry picked from eathena client repository,
commits 88af5cb15a02a26f4a5990ba3ef4df46e572bff4,
19ee623c0a1fdd333ef5b945ea887c983c829b1e,
f924885ea0db5842b080610ec63e61a4bcc2a30c)
Conflicts:
src/gui/itemshortcutwindow.cpp
src/gui/window.cpp
|
|
Still used in the eAthena client and it seems saner to me to have it.
|
|
Mainly making sure 'const std::string &' is used everywhere instead of
'std::string const &'. The former has always been the preferred order in
this project.
|
|
(cherry picked from mainline)
Conflicts:
src/game.cpp
|
|
Scrolling is now a bit less lazy and the scroll radius is 0. In my
opinion this is a better default.
Framerate limiter is now off by default, since it makes the game appear
a bit choppy. It's basically only useful for laptops anyway, and not too
hard to find.
(cherry picked from eAthena branch,
commit c56bc78b5f5676784265dff8ed5334884e8dcc39)
Conflicts:
src/main.cpp
|