Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Merged 0.0 changes from revision 3035 to 3065 to trunk.

  • Loading branch information...
bjorn committed Jan 23, 2007
1 parent d139584 commit 05bdb92c267e3f041788f2aa41a73c9953249e7c
Showing with 65 additions and 49 deletions.
  1. +34 −2 ChangeLog
  2. +1 −1 INSTALL
  3. +8 −0 NEWS
  4. +1 −1 README
  5. +1 −1 data/help/header.txt
  6. +1 −1 docs/INSTALL/win32.txt
  7. +1 −1 docs/win32-release.txt
  8. +2 −1 src/gui/menuwindow.cpp
  9. +1 −1 src/gui/shoplistbox.cpp
  10. +11 −5 src/gui/updatewindow.cpp
  11. +1 −1 src/gui/viewport.cpp
  12. +1 −1 src/gui/viewport.h
  13. +1 −3 src/main.cpp
  14. +1 −30 tmw.cbp
@@ -1,4 +1,34 @@
2007-01-14 Bjørn Lindeijer <bjorn@lindeijer.nl>
2007-01-23 Bjørn Lindeijer <bjorn@lindeijer.nl>

* src/gui/shoplistbox.cpp, docs/INSTALL/win32.txt, INSTALL, NEWS:
Upgraded to Guichan 0.6.1.

2007-01-22 Bjørn Lindeijer <bjorn@lindeijer.nl>

* src/gui/updatewindow.cpp: Identify ourselves when requesting files
from the update server.

2007-01-17 Eugenio Favalli <elvenprogrammer@gmail.com>

* docs/win32-release.txt, src/gui/register.cpp, src/main.cpp: Changed
default server.

2007-01-15 Bjørn Lindeijer <bjorn@lindeijer.nl>

* src/gui/viewport.cpp, src/gui/viewport.h: Fixed issue where the
player stops walking.
* docs/INSTALL/win32.txt, INSTALL: Updated to mention Guichan 0.6.0.

2007-01-15 Eugenio Favalli <elvenprogrammer@gmail.com>

* data/help/header.txt, NEWS, README: Updated release date.

2007-01-14 Eugenio Favalli <elvenprogrammer@gmail.com>

* src/gui/updatewindow.cpp, src/main.cpp, tmw.cbp: Fixed windows
headers issues.

2007-01-14 Bjørn Lindeijer <bjorn@lindeijer.nl>

* src/game.cpp, src/main.cpp, src/gui/trade.cpp, src/gui/sell.cpp,
src/gui/connection.cpp, src/gui/buddywindow.cpp, src/gui/browserbox.h,
@@ -30,14 +60,16 @@
src/gui/chatinput.cpp, src/net/tradehandler.cpp,
src/net/playerhandler.cpp: Upgraded to Guichan 0.6.0 (merge from
guichan-0.6.0 branch).
* src/winver.h, configure.ac, data/help/header.txt, NEWS, README,
CMakeLists.txt: Updated version to 0.0.22.1.

2007-01-13 Bjørn Lindeijer <bjorn@lindeijer.nl>

* data/graphics/sprites/Makefile.am,
data/graphics/sprites/CMakeLists.txt: Updated with regard to renaming
of cotton equipment.

2006-01-13 Eugenio Favalli <elvenprogrammer@gmail.com>
2007-01-13 Eugenio Favalli <elvenprogrammer@gmail.com>

* src/gui/debugwindow.cpp, src/gui/viewport.h: Fixed mouse coordinates
display in debug window.
@@ -20,7 +20,7 @@ and some libraries. The required libraries are:
* SDL_mixer http://www.libsdl.org/projects/SDL_mixer/
* SDL_image http://www.libsdl.org/projects/SDL_image/
* SDL_net http://www.libsdl.org/projects/SDL_net/
* Guichan 0.5.0 http://guichan.sourceforge.net/
* Guichan 0.6.1 http://guichan.sourceforge.net/
* libxml2 http://www.xmlsoft.org/
* physfs 1.0.x http://icculus.org/physfs/
* zlib 1.2.x http://www.gzip.org/zlib/
8 NEWS
@@ -1,3 +1,11 @@
0.0.22.2 (...)
- Updated to work with Guichan 0.6.1 (older versions no longer supported)

0.0.22.1 (15 January 2007)
- Updated to work with Guichan 0.6.0 (older versions no longer supported)
- Fixed mouse coordinates in debug window
- Fixed clicking on GUI to cause the player to start walking sometimes

0.0.22 (24 December 2006)
- Added support for female-specific equipment graphics
- Added support for monster sounds
2 README
@@ -1,7 +1,7 @@
THE MANA WORLD
==============

Version: 0.0.22 Date: 24/12/2006
Version: 0.0.22.1 Date: 15/01/2007


Development team:
@@ -2,7 +2,7 @@
##1 T H E M A N A W O R L D
##1 ==========================================

##2Version:##6 0.0.22 ##2Date:##324 December 2006
##2Version:##6 0.0.22.1 ##2Date:##315 January 2007

##2 Website: http://themanaworld.org

@@ -28,7 +28,7 @@ Besides a C++ compiler, TMW depends on the following libraries:
1) SDL
2) SDL_mixer
3) SDL_image
4) Guichan 0.4.0
4) Guichan 0.6.1
5) libiconv
5) libxml2
6) PhysFS
@@ -19,7 +19,7 @@ Every Win32 releaser should follow this checklist when creating a new package.
<configuration>
<option name="chatlog" value="chatlog.txt"/>
<option name="guialpha" value="0.8"/>
<option name="host" value="animesites.de"/>
<option name="host" value="server.themanaworld.org"/>
<option name="hwaccel" value="0"/>
<option name="port" value="6901"/>
<option name="remember" value="0"/>
@@ -58,7 +58,8 @@ MenuWindow::MenuWindow():
};
int x = 0, y = 3, h = 0;

for (const char **curBtn = buttonNames; *curBtn; curBtn++) {
for (const char **curBtn = buttonNames; *curBtn; curBtn++)
{
gcn::Button *btn = new Button(*curBtn, *curBtn, &listener);
btn->setPosition(x, y);
add(btn);
@@ -112,7 +112,7 @@ void ShopListBox::setSelected(int selected)
mSelected = std::min(mListModel->getNumberOfElements() - 1,
std::max(-1, selected));

gcn::BasicContainer *parent = getParent();
gcn::Widget *parent = getParent();
if (parent)
{
gcn::Rectangle scroll;
@@ -28,15 +28,16 @@
#include <SDL_thread.h>
#include <zlib.h>

#include <curl/curl.h>

#include <guichan/widgets/label.hpp>

#include "browserbox.h"
#include "button.h"
#include "progressbar.h"
#include "scrollarea.h"

// Curl should be included after Guichan to avoid Windows redefinitions
#include <curl/curl.h>

#include "../configuration.h"
#include "../log.h"
#include "../main.h"
@@ -137,7 +138,7 @@ void UpdaterWindow::action(const gcn::ActionEvent &event)
if (event.getId() == "cancel")
{
// Register the user cancel
mUserCancel=true;
mUserCancel = true;
// Skip the updating process
if (mDownloadStatus == UPDATE_COMPLETE)
{
@@ -262,6 +263,11 @@ int UpdaterWindow::downloadThread(void *ptr)
curl_easy_setopt(curl, CURLOPT_WRITEDATA, outfile);
}

#ifdef PACKAGE_VERSION
curl_easy_setopt(curl, CURLOPT_USERAGENT, "TMW/" PACKAGE_VERSION);
#else
curl_easy_setopt(curl, CURLOPT_USERAGENT, "TMW");
#endif
curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, uw->mCurlError);
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
@@ -365,13 +371,13 @@ void UpdaterWindow::logic()
case UPDATE_ERROR:
if (mThread)
{
if(mUserCancel){
if (mUserCancel) {
// Kill the thread, because user has canceled
SDL_KillThread(mThread);
// Set the flag to false again
mUserCancel = false;
}
else{
else {
SDL_WaitThread(mThread, NULL);
}
mThread = NULL;
@@ -324,7 +324,7 @@ Viewport::mousePressed(gcn::MouseEvent &event)
}

void
Viewport::mouseMoved(gcn::MouseEvent &event)
Viewport::mouseDragged(gcn::MouseEvent &event)
{
if (!mMap || !player_node)
return;
@@ -92,7 +92,7 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
* Handles mouse move on map
*/
void
mouseMoved(gcn::MouseEvent &event);
mouseDragged(gcn::MouseEvent &event);

/**
* Handles mouse button release on map.
@@ -39,8 +39,6 @@
#if (defined __USE_UNIX98 || defined __FreeBSD__)
#include <cerrno>
#include <sys/stat.h>
#elif defined WIN32
#define NOGDI
#endif

#include "configuration.h"
@@ -174,7 +172,7 @@ void initConfiguration(const Options &options)
{
// Fill configuration with defaults
logger->log("Initializing configuration...");
config.setValue("host", "animesites.de");
config.setValue("host", "server.themanaworld.org");
config.setValue("port", 9601);
config.setValue("hwaccel", 0);
#if (defined __APPLE__ || defined WIN32) && defined USE_OPENGL
31 tmw.cbp
@@ -19,6 +19,7 @@
<Compiler>
<Add option="-Wall"/>
<Add option="-DUSE_OPENGL"/>
<Add option="-DNOGDI"/>
</Compiler>
<Linker>
<Add library="enet"/>
@@ -172,16 +173,6 @@
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="src\gui\buddywindow.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>
</Unit>
<Unit filename="src\gui\buddywindow.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="src\gui\button.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>
@@ -222,16 +213,6 @@
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="src\gui\chargedialog.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>
</Unit>
<Unit filename="src\gui\chargedialog.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="src\gui\chat.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>
@@ -448,16 +429,6 @@
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="src\gui\newskill.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>
</Unit>
<Unit filename="src\gui\newskill.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="src\gui\npc_text.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>

0 comments on commit 05bdb92

Please sign in to comment.
You can’t perform that action at this time.