summaryrefslogtreecommitdiff
path: root/src/net
AgeCommit message (Collapse)AuthorFilesLines
2009-02-26Merge branch 'aethyra/master'Bjørn Lindeijer4-26/+22
Conflicts: data/graphics/images/login_wallpaper.png src/being.cpp src/beingmanager.cpp src/engine.cpp src/game.cpp src/gui/buysell.cpp src/gui/buysell.h src/gui/gui.h src/gui/npc_text.cpp src/gui/npc_text.h src/gui/npcintegerdialog.cpp src/gui/npclistdialog.cpp src/gui/npclistdialog.h src/gui/npcstringdialog.cpp src/gui/sell.cpp src/gui/shop.cpp src/gui/table.cpp src/net/beinghandler.cpp src/net/npchandler.cpp src/net/playerhandler.cpp src/npc.cpp src/npc.h src/shopitem.cpp src/shopitem.h src/utils/stringutils.cpp src/utils/stringutils.h src/utils/trim.h
2009-02-26Fixed showing being deaths. I removed the wrong pointless deathIra Rice1-6/+3
animation (case 1 is NOT death, but actually idle in SMSG_PLAYER_UPDATE_1) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25Fix NPC handling to not need a handle on the NPCIra Rice4-29/+33
Loosely based on TMW commit f04a8713ffc83db8b3dc4a472b28aad25a2b2bd1 Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25Fix NPC handling to not need a handle on the NPCJared Adams4-25/+24
The Being ID is used instead, as that is all that was ever really needed.
2009-02-25Added method for resetting npc integer dialogs in the last commit, butIra Rice1-0/+1
forgot to use it. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25Make sure that all dialogs are cleared on player death, not just the NPCIra Rice2-3/+3
text dialog. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25Fix some problems with deleting NPCs earlyJared Adams1-1/+1
2009-02-25Fixed up NPC list dialogs to be navigatable by keyboard (scrollingIra Rice1-1/+1
through the list requires the use of the mouse wheel at the moment), fixed wrapping behavior for wrapping around lists to actually wrap around lists properly, and placed a few checks for current_npc where they were assumed before which could cause the client to hang or crash in case the NPC is no longer around. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-24Cleaned up some code, as well as removed redundant talk client requestingIra Rice2-8/+8
(which would happen from using the keyboard instead of the mouse). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-24Fix handling of next and close packetsJared Adams1-5/+15
If we aren't talking with the NPC that they originate from, just send off the next dialog packet, as empty dialogs don't help. This prevents problems with ivisible NPCs that just send close (which was ignored by older clients anyways).
2009-02-23Clear text from NpcTextDialog when character diesJared Adams1-1/+8
Also hid the integer and string dialogs
2009-02-20Added a pickup notification as particle effect. Also make a ui option to ↵Majin Sniper1-3/+12
enable/disable this effect (default is off) and another option to disable the pickup notification in the chat log (default is on).
2009-02-19Added a pickup notification as particle effect. Also make a ui option to ↵Majin Sniper1-3/+12
enable/disable this effect (default is off) and another option to disable the pickup notification in the chat log (default is on).
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer6-10/+9
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer6-10/+9
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-18Centralize current_npc cleanupJared Adams3-4/+4
2009-02-17Fixed closing for NPC dialogs.Ira Rice1-1/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-16Fixed up NPC dialogs to behave more like eAthena expects.Jared Adams1-2/+1
2009-02-16Allow setting default values for NPC dialogsJared Adams1-0/+1
2009-02-16read hairstyle and gender from the looks change methodRoderic Morris1-1/+9
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-09Mostly whitespace and formatting changesBjørn Lindeijer2-27/+23
(merged from eAthena client)
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.
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-03-19 20:00:25 +0000