summaryrefslogtreecommitdiff
path: root/src/net
AgeCommit message (Collapse)AuthorFilesLines
2009-02-18Centralize current_npc cleanupJared Adams3-4/+4
2009-02-16Allow setting default values for NPC dialogsJared Adams1-0/+1
2009-02-16Add next/close buttons for NPCsJared Adams1-2/+5
And keep the text dialog open for the whole transaction, logging user input and keep a full record of text from the NPC (for the current transaction only).
2009-02-15Add configurable units systemJared Adams1-2/+3
2009-02-15More copyright header fixesBjørn Lindeijer2-2/+2
2009-02-15Merge commit 'aethyra/master'Bjørn Lindeijer3-7/+6
Conflicts: CMakeLists.txt configure.ac data/help/header.txt packaging/windows/setup.nsi po/POTFILES.in src/being.cpp src/being.h src/game.cpp src/gui/color.cpp src/gui/color.h src/gui/equipmentwindow.h src/gui/popupmenu.cpp src/gui/recorder.cpp src/gui/setup_colors.h src/gui/setup_keyboard.cpp src/gui/setup_keyboard.h src/gui/skill.cpp src/gui/speechbubble.cpp src/gui/speechbubble.h src/gui/table.cpp src/keyboardconfig.cpp src/keyboardconfig.h src/localplayer.cpp src/main.cpp src/main.h src/map.cpp src/resources/colordb.cpp src/resources/colordb.h src/resources/emotedb.cpp src/resources/emotedb.h src/text.cpp src/text.h src/tmw.rc src/winver.h
2009-02-12Fix some spelling and whitespaceKess Vargavind2-25/+41
Also a few whitespace and spelling fixes.
2009-02-12Fix some spelling and whitespaceKess Vargavind2-25/+41
Also a few whitespace and spelling fixes.
2009-02-11Removed a few unneeded includes in the being handler.Ira Rice1-2/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-11Restored particle effects on hits and critical hits.Philipp Sehmisch1-1/+0
2009-02-11Don't make log statements translatableBjørn Lindeijer1-4/+4
The log is mainly used to aid the developers, hence shouldn't be translated to the user's local language. Also introduces unnecessary work for all translators.
2009-02-10Removed many pointless comparisons with NULLBjørn Lindeijer1-1/+1
Sometimes it's nice for clarity, but most of the time this is just clutter. C++ != Java. :)
2009-02-10Fixed header files, as well as removed the unused buddy list class (notIra Rice38-82/+118
useful since buddy lists are tracked through the player relation interface instead) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-11Removed many pointless comparisons with NULLBjørn Lindeijer1-1/+1
Sometimes it's nice for clarity, but most of the time this is just clutter. C++ != Java. :)
2009-02-10Don't make log statements translatableBjørn Lindeijer1-4/+4
The log is mainly used to aid the developers, hence shouldn't be translated to the user's local language. Also introduces unnecessary work for all translators.
2009-02-09Mostly whitespace fixesBjørn Lindeijer7-88/+87
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Merged with Aethyra master as of 2009-02-09Bjørn Lindeijer13-77/+67
Conflicts: A lot of files...
2009-02-09Mostly whitespace fixesBjørn Lindeijer7-88/+87
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Merge branch 'master' of git@gitorious.org:tmw/eathenaBjørn Lindeijer4-31/+79
Conflicts: src/game.cpp src/net/charserverhandler.cpp src/net/loginhandler.cpp src/net/protocol.h
2009-02-09Merged with Aethyra master as of 2009-01-27Bjørn Lindeijer24-260/+516
Conflicts: Almost everywhere.
2009-02-07Some more include cleanups.Ira Rice4-4/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Exposed some more strings I found to be translatable.Ira Rice6-29/+44
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Put back the 0x06b packet, which apparently our server uses. WillIra Rice1-0/+21
investigate why we use it and what this packet is meant to do. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Added a few translation strings to the char server handler, as well asIra Rice1-43/+14
remove the need for extensions.h in it. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Modified the NPC string and integer classes to automatically take focusIra Rice1-0/+2
to the input fields. Now the only NPC dialog which isn't completely navigatable by the keyboard alone is the NPC list dialog (seems to have regressed slightly recently). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Went through the gui folder and revised the include statements to notIra Rice4-18/+5
include anything not needed by that specific widget or window. This appears to have cleaned up system performance a bit on my current setup, where it went from idling on 45% in game with opengl down to 30% now. Also moved iptostring to the tostring header, as importing all of network.h is a little overkill to use that function, and it goes along with the basic functions that are in that header file anyways. TODO: find out a way to get rid of warnings when a class doesn't use this function. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-28Fix handling of packet 0x81Jared Adams4-33/+79
2009-01-28Fix handling of packet 0x81Jared Adams4-31/+78
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.
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-16 16:31:04 +0000