summaryrefslogtreecommitdiff
path: root/src/net
AgeCommit message (Collapse)AuthorFilesLines
2009-02-09Merged with Aethyra master as of 2009-01-27Bjørn Lindeijer24-260/+516
Conflicts: Almost everywhere.
2009-01-25Removed the TMW branding from header guardsBjørn Lindeijer19-41/+43
2009-01-25Removed the TMW branding from header guardsBjørn Lindeijer18-39/+41
2009-01-23Removed unnecessary references to The Mana World in code headersBjørn Lindeijer36-144/+144
This dates back to the old days of TMW, but the usage instructions of GPLv2 don't mention this being necessary. Since it doesn't add anything, avoid the branding in these sections.
2009-01-23Removed unnecessary references to The Mana World in code headersBjørn Lindeijer36-144/+144
This dates back to the old days of TMW, but the usage instructions of GPLv2 don't mention this being necessary. Since it doesn't add anything, avoid the branding in these sections.
2009-01-19Fixes to the NPC Integer input fieldIra Rice1-1/+1
Also don't set "The Mana World" to start with. Signed-off-by: Ira Rice <irarice@gmail.com> (cherry picked from Aethyra commit d2b804c1a817ccdd85b4b1220bf929e9d370d774) Conflicts: src/game.cpp src/gui/inttextfield.cpp src/gui/item_amount.cpp src/gui/textfield.h
2009-01-18Fixed the NPC Integer input field, as well as cut some bull from theIra Rice1-1/+1
NPC String class. The Integer input field was rather horribly broken to the point where it could send invalid data, the increment and decrement buttons didn't work, and overall it was tripping over itself. As for the NPC String, "The Mana World" as a string is not needed to set the field to that length, but instead fills the text field with that text for starting. This is completely inappropriate for a text entry field, and a more sensible default would be to leave it empty, so that people can type in what they want without having to delete it. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-18Add dialogs to input text and numbers for scriptsJared Adams2-1/+26
2009-01-18Add dialogs to input text and numbers for scriptsJared Adams2-0/+26
2009-01-15Style cleanups throughout most of the code. Splitting function type fromIra Rice7-88/+53
the function names should no longer be around. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-06Added support for internationalizationIra Rice1-34/+35
Merged from the mainline client. Originally implemented by Guillaume Melquiond, starting with commit 1828eee6a6d91fd385ad1e69d93044516493aa91. Conflicts: INSTALL configure.ac src/Makefile.am src/gui/buy.cpp src/gui/confirm_dialog.cpp src/gui/inventorywindow.cpp src/gui/login.cpp src/gui/menuwindow.cpp src/gui/minimap.cpp src/gui/ok_dialog.cpp src/gui/popupmenu.cpp src/gui/register.cpp src/gui/sell.cpp src/gui/setup.cpp src/gui/setup_video.cpp Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-05Handling gender with an enum everywhere.Philipp Sehmisch2-4/+7
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97) Conflicts: src/net/beinghandler.cpp src/net/charserverhandler.cpp src/player.cpp src/player.h
2009-01-05Handling gender with an enum everywhere.Philipp Sehmisch2-4/+7
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97) Conflicts: src/net/beinghandler.cpp src/net/charserverhandler.cpp src/player.cpp src/player.h
2008-12-26Fixed a potential leak in setup, changed the default border color toIra Rice1-2/+1
white for wallpapers (matches our wallpapers better), and fixed the effect manager. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Added some initialization and removed ChargeDialogIra Rice1-3/+0
Many member variables of LocalPlayer were not being initialized properly. In general this shouldn't have caused any problems, but it's bad style. The ChargeDialog was removed. This class was long dead anyway. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl> Conflicts: src/Makefile.am src/game.cpp src/gui/chargedialog.cpp src/gui/chargedialog.h src/localplayer.cpp src/localplayer.h Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice10-30/+32
Conflicts: AUTHORS CMakeLists.txt ChangeLog INSTALL README aethyra.cbp configure.ac data/help/changes.txt data/help/commands.txt data/help/header.txt data/help/support.txt src/Makefile.am src/aethyra.rc src/being.cpp src/being.h src/equipment.cpp src/equipment.h src/floor_item.h src/game.cpp src/gui/buddywindow.cpp src/gui/char_select.cpp src/gui/char_server.cpp src/gui/chat.cpp src/gui/chat.h src/gui/equipmentwindow.cpp src/gui/equipmentwindow.h src/gui/gui.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/itemcontainer.cpp src/gui/itemcontainer.h src/gui/minimap.cpp src/gui/ministatus.cpp src/gui/newskill.cpp src/gui/npc_text.cpp src/gui/npclistdialog.h src/gui/ok_dialog.cpp src/gui/setup_video.cpp src/gui/skill.cpp src/gui/skill.h src/gui/status.h src/gui/table_model.h src/gui/updatewindow.cpp src/gui/viewport.cpp src/inventory.cpp src/inventory.h src/keyboardconfig.cpp src/keyboardconfig.h src/localplayer.cpp src/localplayer.h src/logindata.h src/main.cpp src/map.cpp src/monster.cpp src/monster.h src/net/beinghandler.cpp src/net/beinghandler.h src/net/buysellhandler.cpp src/net/equipmenthandler.cpp src/net/loginhandler.cpp src/net/loginhandler.h src/net/network.h src/net/npchandler.cpp src/net/playerhandler.cpp src/net/protocol.h src/net/tradehandler.cpp src/npc.cpp src/npc.h src/particleemitter.cpp src/particleemitterprop.h src/player.cpp src/player.h src/player_relations.cpp src/resources/imageset.cpp src/resources/imageset.h src/resources/itemdb.cpp src/resources/mapreader.cpp src/resources/monsterinfo.h src/text.cpp src/text.h src/textmanager.cpp src/textmanager.h src/tileset.h src/utils/fastsqrt.h src/utils/strprintf.cpp src/winver.h tools/tmxcopy/Makefile tools/tmxcopy/base64.cpp tools/tmxcopy/base64.h tools/tmxcopy/tostring.h Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Added some initialization and removed ChargeDialogBjørn Lindeijer1-3/+0
Many member variables of LocalPlayer were not being initialized properly. In general this shouldn't have caused any problems, but it's bad style. The ChargeDialog was removed. This class was long dead anyway. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-07Added client-side status change handlers (text, icon, particle effect, audio).Fate1-18/+53
2008-12-06Prevent the player from continuing to walk after opening a NPC dialog.Ira Rice1-0/+3
This used to be caused by right clicking on an NPC, then clicking on it and telling the sprite to move at the same time. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03While there is still a small visual artifact, this patch fixes the buyIra Rice1-0/+3
window so that it properly reports how much money you have.
2008-12-03Add an effects manager (patch by Kage Jittai)Ira Rice1-1/+4
NOTE: This patch demonstrates the need to fix pixel coordinates in the eAthena client. Bjorn did the movement patch in the TMWClient, however, I still haven't got that fully working with the merges. It's likely that a clone will be developed to tackle this problem. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-11-25Miscellaneous TMW change commits. Missed these changes before because of Ira Rice1-1/+1
a confusion on git.
2008-11-22Fixed warning about passing NULL for a non-pointerBjørn Lindeijer1-1/+1
Encountered by z0ro.
2008-11-22While there is still a small visual artifact, this patch fixes the buy Ira Rice1-0/+1
window so that it properly reports how much money you have.
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice38-123/+32
statements, as well as removing the new skill dialog, which we do not, nor will we use (if we do, it'd be a new one that we'd make). WARNING!!! This, and all other previous builds have a linker error for the Gnome libraries version 4.3.2 on my setup. It's assumed that this is also the case for other users of this library as well. I'm currently assuming that there's a bug in the compiler itself, and will look into reporting this, but in the mean time, it doesn't build for these users, unfortunately. Sorry about this.
2008-11-16Got rid of CVS/Subversion $Id$ markersBjørn Lindeijer36-72/+0
I don't know why we dealt with these things for so long. Did we ever get anything out of it?
2008-11-09Fixed NPC's reporting as dead on the new server.Ira Rice1-1/+2
2008-11-06Ported a patch by Peavey on TMW to keep all item pointers inside of Ira Rice1-4/+4
inventory. For us, this should get rid of the arrow crashing bug, if it still exists (been a few weeks since I've heard of it happening now).
2008-11-06Have equipment tied into player inventory instead of keeping its own list of ↵Dennis Friis1-4/+4
pointers to items. This ensures the ressource is up-to-date and avoids crashes on stale item pointers.
2008-11-02Reverted a TMW change that had a repercussion that I didn't think of. While ↵Ira Rice1-2/+2
TMW may think that it's unnecessary to use these view packets, what they fail to realize is that this is done so that you can see these viewed on OTHER players than yourself, otherwise there would never be a reason to use any of the clothing packets at all. So, my reccommendation, if any TMW person is reading these SVN logs at all, is to either add it back, or remove all clothing ID's in the SMSG_PLAYER_MOVE packet. This is yet again another reason why all TMW commits should not be treated as being good and should be tested first before committing to our own SVN.
2008-11-02Ported a patch from TMW by fate which de-hardcodes skills, as well as ↵Ira Rice3-4/+15
removes the server sending out view id's for gloves and boots (which weren't needed.) Here's the full log: * Updated GUI table and model to better handle NULL widgets during initialisation * On SMSG_MOVE et al., ignore boots and glove information-- that information is incorrect and we're guaranteed to already have the correct information anyway. * Properly decode `is dead' information for PCs, so that dead players, when encountered, will be lying on the ground, dead, rather than standing. * Use `skills.xml' file from client data to determine skill names * Report client version number (hereby bumped to 1) in unused charserver slot (ignored by vanilla eAthena)
2008-11-01* Updated GUI table and model to better handle NULL widgets during ↵Fate3-9/+15
initialisation * On SMSG_MOVE et al., ignore boots and glove information-- that information is incorrect and we're guaranteed to already have the correct information anyway. * Properly decode `is dead' information for PCs, so that dead players, when encountered, will be lying on the ground, dead, rather than standing. * Use `skills.xml' file from client data to determine skill names * Report client version number (hereby bumped to 1) in unused charserver slot (ignored by vanilla eAthena)
2008-10-31Added critical notifications to the client. While I had originally Ira Rice1-1/+4
planned to do this (I still did it my way), TMW beat me to implementing, so I'll credit them with their commit reminding me to do it. This is not done the exact same way, as I prefer to see an actual "crit!" show above the being, instead of an ambiguous particle.
2008-10-30Added particle effect on critical hits.Philipp Sehmisch1-4/+8
2008-10-30Do not set shoe sprite on player move packet unless supported by eAthena.Dennis Friis1-3/+3
2008-10-28Removed a redundant line that wasn't doing anything. Should have taken a Ira Rice1-1/+0
minute more to check it over thouroughly first.
2008-10-28Added support for no dialogue NPC's. Patch by Peavey from TMW.Ira Rice1-2/+8
2008-10-28Handle NPC script close. Fixes client input freeze on no-dialog NPCs.Dennis Friis1-2/+8
2008-10-26Since we somehow did end up depending on a hacked eAthena instead of supportingBjørn Lindeijer1-8/+4
existing features decently, assign the shoes and gloves IDs.
2008-10-25Added in TMW's patch to display how long a ban is in effect.Ira Rice1-1/+1
2008-10-23Added a patch by peavey over on TMW to disallow adding items to trade if Ira Rice2-4/+10
the trade partner doesn't have room for them.
2008-10-23Add support for new athena trade-add failure condition; no free slot.Dennis Friis1-1/+7
2008-10-22Now displays ban time, if bannedDavid Athay1-2/+4
2008-10-12This commit contains three things: one, after looking over how TMW was Ira Rice2-20/+10
handling the effects through the level up system, I determined that it wasn't bad, so I pulled it from TMW's SVN. Two, I edited the web page css so that it better matches the forum. And three, I patched text wrapping so that it'll fix up its display size based on all previous lines, except for the last line. That fix will come later, but for now, it'll be seen as a special case. While you'd like to think that just resending the string and starting the function over again would fix it, you'd be wrong. So it won't be patched until I think of a better way to handle that case.
2008-10-01Possible fix for the arrow crashing bug. Confirmation needed.Ira Rice1-14/+14
2008-10-01Fixed female sprites not showing all equipment.Ira Rice1-1/+1
2008-09-25Merged the Tametomo branch into trunk.Ira Rice4-13/+67
2008-09-12Fixed /where, added /cast for heal and gather, some changes to inventory to ↵Lloyd Bryant3-19/+122
support storage
2008-09-11Fixed the name of a variable (fix by Scraggy).Bjørn Lindeijer1-1/+1
2008-08-28Added support for being effects through the eAthena levelup message, and checkBjørn Lindeijer3-23/+32
whether the being exists before referencing it. Re-enabled proper MP bar display. Improved handling of a warp to the same map.
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-15 21:11:30 +0000