summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-12-22Merge branch '0.5'Chuck Miller3-166/+0
2010-12-22Remove ambientoverlay class and filesChuck Miller3-166/+0
It was renamed and duplicated to "ambientlayer"
2010-12-17Update the net/manaserv/protocol.h file with latest description.Yohann Ferreira1-2/+2
Trivial fix.
2010-12-16Made the client handle the number of slots given by the server.Yohann Ferreira5-15/+45
I turned the CharacterEntries into a vector. As for now, it's basically working but I discovered bugs about slots handling mainly for Manaserv that were already present before that patch. Hence, there are three remaining issues: - Under ManaServ, the character's slots numbers aren't handled when loading the characters but used when sending selection or deletion attempts. For instance, if you delete the character at slot 1, you won't be able to select or delete characters at slots 2 and 3, since the server believes that the characters are now in slots 1 and 2, even thought the client still displays them at the former slots. - Also under manaserv, you won't be able to create a character at slot 1 and 3, the server will automatically add the new one to the next slot, which is not corresponding to where you clicked to the 'Create' button. I propose to make Manaserv send again the character slots numbers and store them in database since we used them in creation, selection, and deletion attempts. It would make more sense IMHO. - The last remaining issue found is that when switching between different servers, the loginData don't get cleaned up, make the characterSelect dialog look crazy when the number of slots is different between two servers. If this one is accepted, my next patch will make the logindata be cleaned up between each login attempts (as for the slot number, and maybe other sensible data) and the next ones will readd character slot handling server and client side. Reviewed-by: Jaxad0127.
2010-12-15Merge branch '0.5'Thorbjørn Lindeijer29-1244/+3938
2010-12-15Clean up .gitignore, remove auto* referencesBernd Wachter1-37/+2
2010-12-15Autogenerate list of translatable files for update-poBernd Wachter2-96/+7
Reviewed by: Thorbjørn Lindeijer
2010-12-15Update INSTALL to mention CMake instead of auto*Bernd Wachter1-10/+8
2010-12-15Remove outdated VC-project already removed from masterBernd Wachter1-876/+0
2010-12-15Free at last. Free at..erm. Drop remaining auto* filesBernd Wachter9-134/+0
2010-12-15Remove most likely useless OS-X filesBernd Wachter7-210/+0
2010-12-15Move OS-X icon to icon directoryBernd Wachter1-0/+0
2010-12-15Add targets for updating translationsBernd Wachter1-2/+36
2010-12-15Unlock the char select dialog even if we've got an error.Yohann Ferreira1-1/+1
This permit not to be stuck at character deletion when something goes wrong. Trivial fix.
2010-12-15Small hacking cleanups.Yohann Ferreira2-7/+14
In preparation for resolution of mana-issue: #211. Trivial.
2010-12-13Oops, didn't need to update the LINGUAS file.Yohann Ferreira1-1/+0
2010-12-13Added pt_ES.po file, staging translation by Natsuki.Yohann Ferreira2-0/+3878
Needs encoding checking.
2010-12-13pt_BR translation by alastrim.Yohann Ferreira1-1885/+1655
2010-12-13make update-po. Now translations can be updated on launchpad.Yohann Ferreira39-43838/+43401
2010-12-06Removed superfluous #includes taken from checkheaders list.Yohann Ferreira40-75/+0
Resolves: Mana-Mantis #265. Trivial fix.
2010-12-06Removed deprecated autotools support.Yohann Ferreira4-728/+0
2010-12-06make update-po before release.Yohann Ferreira38-42138/+45025
2010-12-05Add support for tiles with spacingStefan Dombrowski4-7/+10
Now the map from the Mana server's example data is shown properly. Reviewed-by: Jaxad0127
2010-11-29Allow enter OK button key in input field.Andrei Karas3-1/+9
By default OK shortcut is space key. Reviewed-by: Jaxad0127, Kage
2010-11-18Remove the configlistener.h from the other file lists tooStefan Dombrowski2-2/+0
2010-11-15Remove the configlistener.h from the file listChuck Miller1-1/+0
Trivial fix
2010-11-13Replace config listeners with the event systemChuck Miller17-165/+92
Reviewed-by: Jared Adams
2010-11-13Added a warning about deprecation of autotools.Yohann Ferreira1-0/+6
Especially when using manaserv. Trivial fix.
2010-11-12Change NPC handling in the net codeChuck Miller9-139/+237
Instead of using events to invoke netcode, invoke netcode directly and have it send events Reviewed-by: Freeyorp
2010-11-12Fix item name in floor item popup menu.Andrei Karas1-1/+1
Trivial fix.
2010-11-11Replace Event names with enums instead of stringsChuck Miller34-148/+204
2010-11-11Have the event system channels use enums instead of stringsChuck Miller45-152/+167
Reviewed-by: Freeyorp
2010-11-11Fix unloading of the emote databaseChuck Miller1-0/+3
Trivial fix
2010-11-10Removed executable bit from dyecmd source filesThorbjørn Lindeijer5-0/+0
2010-11-09These files needed to be added to SRCS, not SRCS_MANAChuck Miller1-2/+2
Trivial fix
2010-11-09Fix client successful unregister behaviour for manaserv.Yohann Ferreira1-1/+1
Resolves: Mana-Mantis #250. Reviewed-by: Freeyorp, thorbjorn.
2010-11-07Convert the emote system to use particlesChuck Miller11-159/+75
Reviewed-by: Jared Adams
2010-11-02Re-Enable the support of manaserv servers.Yohann Ferreira3-59/+0
Reviewed-by: CodyMartin.
2010-11-02Add missing variable initialisation in Being.Andrei Karas1-1/+2
2010-11-02Adding double-click to server dialog and world select dialogStefan Dombrowski6-0/+46
This resolves http://bugs.manasource.org/view.php?id=259 Reviewed-by: Thorbjorn
2010-11-02Removing program parameters from C::BStefan Dombrowski1-1/+0
2010-11-01Fix the client version on Windows.Yohann Ferreira1-3/+3
Trivial fix.
2010-11-01Merge branch '0.5' of gitorious.org:mana/manaYohann Ferreira72-729/+984
Conflicts: src/being.cpp src/client.cpp src/commandhandler.cpp src/gui/setup_video.cpp src/gui/socialwindow.cpp src/gui/viewport.cpp src/gui/widgets/browserbox.cpp src/gui/widgets/itemcontainer.cpp src/imageparticle.cpp src/localplayer.cpp src/localplayer.h src/map.cpp src/net/tmwa/beinghandler.cpp src/particle.cpp src/particle.h src/player.cpp src/player.h
2010-10-31Fix memory leak of localplayer classes in the charserverhandlerChuck Miller2-2/+2
They are initialized else where in the code Reviewed-by: Jared Adams
2010-10-31Using tile coordinates for pick-upStefan Dombrowski2-9/+4
Since the tile coordinates are already avaible the calculation is not needed. Furthermore this avoids the correction of the tile, which was needed because the pixel coordinates are meant as coordinates for drawing the being. This resolves http://bugs.manasource.org/view.php?id=249 Reviewed-by: Thorbjorn
2010-10-25Some updates to the rather out-of-date progression.txt documentThorbjørn Lindeijer1-3/+3
Reported by meway.
2010-10-23Small fix in the French translationThorbjørn Lindeijer1-2/+2
Article was repeated. TMW-Mantis-issue: 1011
2010-10-22Changed 'Low CPU' options and related gui widgets name to 'Disable ↵Yohann Ferreira3-32/+36
transparency'. That name is more explicit about what it actually does. Reviewed-by: CodyMartin.
2010-10-22Turned the OpenGL and disable transparency options as static members.Yohann Ferreira7-46/+66
- Now OpenGL and the transparency disabling are set at startup and not read again for displaying graphics, preventing graphic errors before startup. - We also agreed long time ago that SDL specific functions should have a SDL prefix. The header has been rearranged a bit to do so. - Also fixed a possible discrepancy in the hasAlphaChannel() function. Reviewed-by: CodyMartin. Resolves: Mana-Mantis: #260.
2010-10-22Removed short forms for --localdata-dir and --chat-log-dirThorbjørn Lindeijer1-3/+3
They are more confusing than helpful. Users of these options would likely set up a shortcut or alias already anyway.