From aa29353afcad57055b1ede5db78cac27dbd99514 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Sun, 25 Mar 2007 12:33:29 +0000 Subject: Removed some stuff that actually wasn't merged since it didn't apply to trunk. --- ChangeLog | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index d0f661a9..d2add310 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,16 +4,9 @@ logic, in order to prevent an incoming character delete message from deleting the player character that was about to be drawn. * src/gui/char_select.cpp: Removed useless lock/unlock calls. - * src/logindata.h, src/main.cpp, src/gui/login.cpp: Go back to login - or register state on error, depending on what the user was doing. - * src/gui/register.cpp: Actually use the server that is filled in. - * src/net/loginhandler.cpp: Fixed error message. * src/net/charserverhandler.cpp: Fixed crash since now logic is called after non-selected characters are deleted, by properly setting deleted instances to 0 and going back to initial selection. - * src/main.cpp, src/net/network.h, src/net/network.cpp: Make sure that - when a network error occurs, the error message is available and shown - to the user. * src/gui/register.h, src/gui/register.cpp: Only enable Register button when all necessary fields are filled in. @@ -36,19 +29,15 @@ 2007-03-23 Bjørn Lindeijer * src/gui/char_select.cpp, src/gui/char_select.h, - src/net/charserverhandler.h, src/net/charserverhandler.cpp: Clarified - the error message when character creation fails and made sure the - character creation dialog doesn't close when creation failed. + src/net/charserverhandler.h, src/net/charserverhandler.cpp: Made sure + the character creation dialog doesn't close when creation failed. 2007-03-22 Bjørn Lindeijer * src/gui/login.cpp, src/gui/login.h, src/gui/register.h, src/gui/register.cpp: Only enable login button when a username, password and server are filled in. Pass username, password and server - on to the register dialog. Go back to login dialog when canceling - registration. Fixed a crash caused by deleting an OkDialog twice (it - also deletes itself). Made the register dialog a bit wider. Register - dialog no longer clears username field when it is invalid. + on to the register dialog. Made the register dialog a bit wider. * src/main.cpp, data/icons/CMakeLists.txt, data/icons/Makefile.am, data/icons/tmw-32x32.png: Use a 32x32 non-alpha layered window icon. * tmw.cbp: Updated project file. @@ -64,8 +53,7 @@ software mode. * src/gui/login.cpp: Fixed small issue where default server didn't fit in the server entry field properly. - * src/main.cpp: Display a progress bar and connecting status for each - server and display the version using a gcn::Label. + * src/main.cpp: Display the version using a gcn::Label. * src/gui/viewport.cpp, src/monster.h: Avoiding magic numbers where possible (1002) and also display the target when other players are targeted. -- cgit v1.2.3-70-g09d2