Age | Commit message (Collapse) | Author | Files | Lines |
|
The default window sizes were all too small, since they were specified
in content size. On pressing "Reset Windows", the sizes would be
interpreted as such and apply alright.
The inconsistency is now removed, and the default window sizes are
always the size of the whole widget now, not just the contents.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
(cherry picked from eAthena branch,
commit 72f5288682f46af1f7c04c002172178c880e060b)
Conflicts:
src/gui/chat.cpp
src/gui/equipmentwindow.cpp
src/gui/inventorywindow.cpp
src/gui/ministatus.cpp
src/gui/setup.cpp
src/gui/skill.cpp
src/gui/trade.cpp
src/gui/window.cpp
|
|
(cherry picked from mainline)
Conflicts:
src/game.cpp
|
|
|
|
|
|
(cherry picked from commit 7d5c6124e9c9cf447286eaa58afe17adf6c1a81d)
|
|
Won't be introduced based on eAthena anyway, I think even with tmwserv
we have different plans now.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
(cherry picked from eAthena branch, commit
bab09df7a8347f39221b2a87487dcd128a686def)
Conflicts:
src/game.cpp
|
|
(cherry picked from commit 4f2749ab2782fdece3c098b1a52b69cb37eea9eb)
|
|
I wish I had never fallen for this weird style, and I hope removing it
will prevent others from introducing new code like this. :-)
(cherry picked from eAthena branch, commit
68760426532b9ca4c6939d7a7b8faa1586ee82e0)
Conflicts:
src/being.cpp
src/being.h
src/gui/tabbedcontainer.cpp
src/particle.cpp
src/particle.h
|
|
The ChargeDialog was removed. This class was long dead anyway.
(cherry picked from eAthena client commit
719e2b02bc6833198d6af2d3c95de96ef95f876d)
Conflicts:
src/CMakeLists.txt
src/Makefile.am
src/game.cpp
src/localplayer.cpp
src/localplayer.h
src/net/charserverhandler.cpp
tmw.cbp
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Got rid of "void" in functions that take no arguments and removed the
newline after the return type of a method in many places.
|
|
Passing --playername would set both the username as well as the name of
the character to play with. Now --username sets the username while
--character is used for choosing the character.
Also made it so that the login dialog won't show up when username and
password are passed from the command line, unless login fails.
|
|
It was only used to automatically choose the character. For choosing
the character, --playername can be used.
|
|
it works fine in Linux without having to reinitialize the OpenGL state. Adapted
change by kraant from Aethyra.
(cherry picked from eAthena client)
|
|
(cherry picked from eAthena client)
Conflicts:
src/monster.cpp
src/resources/monsterinfo.h
|
|
(cherry picked from eAthena client)
|
|
(cherry picked from eAthena client)
|
|
whether the being exists before referencing it. Re-enabled proper MP bar
display. Improved handling of a warp to the same map.
(patch by Fate)
(cherry picked from eAthena client, the part about the levelup message
doesn't apply, and we now seem to have a second "effect manager"...)
Conflicts:
ChangeLog
src/being.cpp
src/being.h
src/engine.cpp
src/engine.h
src/gui/ministatus.cpp
src/net/beinghandler.cpp
src/net/playerhandler.cpp
src/net/protocol.h
|
|
when it exists.
(cherry picked from eAthena client, replacing 'mapname' property
handling)
|
|
Joystick enabled state could end up uninitialized on unsuccesfully
trying to open a joystick. In addition, the enabled state wasn't
actually used in the accessor methods for the joystick buttons.
|
|
during recursion
|
|
Patch by Nikos, with some improvements.
Conflicts:
NEWS
src/gui/itemcontainer.cpp
src/itemshortcut.cpp
(cherry picked from eAthena client, not functional here yet)
|
|
Based on a patch by QOAL.
(cherry picked from eAthena client)
Conflicts:
src/gui/minimap.cpp
|
|
(cherry picked from eAthena client)
Conflicts:
ChangeLog
|
|
Conflicts:
ChangeLog
src/game.cpp
(cherry picked from eAthena client)
|
|
* Auto-detect number of hair styles available (#514)
Conflicts:
ChangeLog
src/being.cpp
src/being.h
src/gui/char_select.cpp
(cherry picked from eAthena client)
|
|
These properties should also apply to NPCs and possibly even monsters in
the future.
|
|
|
|
|
|
Don't treat anything starting with "Welcome" as a server message, for
example messages starting with a name that starts with "Welcome"
shouldn't belong in that category.
Put the nick in the right place for global announcements.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
|
|
Don't treat anything starting with "Welcome" as a server message, for
example messages starting with a name that starts with "Welcome"
shouldn't belong in that category.
Put the nick in the right place for global announcements.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
Won't be introduced based on eAthena anyway, I think even with tmwserv
we have different plans now.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
|
|
|
|
|
|
players), make sure to initialise if needed
Status particle effects: properly delete particles after effect has worn
off
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
The player character is never deleted, and hence might have particles
still active when the map changes. These particles are deleted on map
change, but when the player character was moved, it was trying to mark
these deleted particles for deletion, writing to unallocated memory.
The marking for deletion by the player character now happens before the
particles are deleted.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
The player character is never deleted, and hence might have particles
still active when the map changes. These particles are deleted on map
change, but when the player character was moved, it was trying to mark
these deleted particles for deletion, writing to unallocated memory.
The marking for deletion by the player character now happens before the
particles are deleted.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
|
|
I wish I had never fallen for this weird style, and I hope removing it
will prevent others from introducing new code like this. :-)
|