summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2009-02-26Merge branch 'aethyra/master'Bjørn Lindeijer36-161/+293
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-26Forgot to extend the player or NPC specifying fields as well.Ira Rice1-1/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-26Extended job numbers based on what's actually used for Ragnarok'sIra Rice1-3/+3
server. TODO: Make this externally configurable, so that specific servers can specify what they use specific sprite IDs for, as well as specifying good defaults as well, in case that configuration file isn't found. Signed-off-by: Ira Rice <irarice@gmail.com>
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-26Fixed an error in shoplistboxes as identified by Octalot.Ira Rice10-27/+14
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25Fix NPC handling to not need a handle on the NPCIra Rice19-141/+165
Loosely based on TMW commit f04a8713ffc83db8b3dc4a472b28aad25a2b2bd1 Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25Prevent duplicate NPC talking when using keyboardJared Adams3-2/+8
Based on commit a1e483913672e55704e8fbafeff5ea0ccc0c9b07 from Aethyra.
2009-02-25Fix NPC handling to not need a handle on the NPCJared Adams21-148/+142
The Being ID is used instead, as that is all that was ever really needed.
2009-02-25Don't delete the Being in the NPC classJared Adams1-4/+1
The BeingManager will clean it up when it's next cleared. One hanging Being isn't too much. A reference count system like resources use might be a better way to handle Beings.
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 Rice6-3/+15
text dialog. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25If no network is set, then don't continueIra Rice1-1/+10
Based on TMW commit a996d4bff3cc5a35ee5cdb6cb5bdef920cf44120 Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25Fix some problems with deleting NPCs earlyJared Adams3-11/+14
2009-02-25If no network is set, then don't continueJared Adams1-0/+2
Only checks in these two palces for now, as missing network in the others would indicate a design flaw.
2009-02-25Don't delete the current NPC too earlyJared Adams1-3/+11
2009-02-25Fixed up NPC list dialogs to be navigatable by keyboard (scrollingIra Rice9-15/+136
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 Rice12-61/+89
(which would happen from using the keyboard instead of the mouse). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-24Don't set current_npc when initiating interractionJared Adams1-1/+0
Let it be set by the netcode if the NPC responds. This caused a movement bug if they didn't.
2009-02-24Don't set current_npc when initiating interractionJared Adams1-1/+0
Let it be set by the netcode if the NPC responds. This caused a movement bug if they didn't.
2009-02-24Prioritize monsters when targetingJared Adams1-3/+3
Players are then the next highest priority
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-24Remove debug statement that should've been removedJared Adams1-1/+0
It was for testing and shouldn't have been committed
2009-02-24Small dialog visibility fixJared Adams6-0/+27
Basically ensures that the NPC text dialog is visible before making NPC input dialogs visible
2009-02-24Send a next dialog packet when ending interactionJared Adams1-0/+1
Server seems to want it in some cases
2009-02-24Fix update handlingJared Adams1-11/+11
THis will prevent loading updates when -u is used, and prevent error messages in the log when -u is used.
2009-02-24Fixed compile warningsBjørn Lindeijer3-7/+7
Order of initialization and suggested parenthesis.
2009-02-24Fix update handlingJared Adams1-11/+11
THis will prevent loading updates when -u is used, and prevent error messages in the log when -u is used.
2009-02-23Allow to sell non-stackable items like stackablesMajin Sniper5-32/+259
Make it possible to sell non-stackable items all at once by introducing "Duplicate Items" and a Shop that can handle them. Also fix a trivial bug to correctly preview you money while selling.
2009-02-23Allow to sell non-stackable items like stackablesMajin Sniper5-33/+260
Make it possible to sell non-stackable items all at once by introducing "Duplicate Items" and a Shop that can handle them. Also fix a trivial bug to correctly preview you money while selling.
2009-02-23Hide the buy/sell dialogs when there is no NPCJared Adams6-0/+36
2009-02-23End NPC interraction when canceling list inpuJared Adams1-0/+1
2009-02-23Fix Job EXP bar codeJared Adams1-1/+1
2009-02-23Clear text from NpcTextDialog when character diesJared Adams2-1/+13
Also hid the integer and string dialogs
2009-02-22Highlight unbuyable items in redJared Adams1-8/+7
2009-02-22Fixed another Particle/Paricle mismatch in a commentPhilipp Sehmisch1-1/+1
2009-02-22Make progressbars more readableJared Adams1-2/+2
2009-02-22Allow percentage for exp displaysJared Adams2-9/+25
2009-02-22Fixed another Particle/Paricle mismatch in a commentPhilipp Sehmisch1-1/+1
2009-02-22Renamed InfoParicleFont to InfoParticleFont (typo?)Philipp Sehmisch2-3/+3
2009-02-21Fix bug when maximum level is reachedJared Adams3-62/+77
Also centralize code for updating the various progress bars for player status.
2009-02-20Fix debug window to show correct mouse coordinatesJared Adams1-2/+2
2009-02-20Fix debug window to show correct mouse coordinatesJared Adams1-2/+2
2009-02-20Fixed some lines from cutting off in English (which would carry over toIra Rice1-4/+4
other languages as well). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-20Removed the last of the image particle guichan fonts.Ira Rice4-42/+45
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-20Added a pickup notification as particle effect. Also make a ui option to ↵Majin Sniper13-21/+118
enable/disable this effect (default is off) and another option to disable the pickup notification in the chat log (default is on).
2009-02-20Restore old attack behaviorJared Adams1-2/+1
2009-02-20Restore old middle click behaviorJared Adams1-1/+2
2009-02-19Added a pickup notification as particle effect. Also make a ui option to ↵Majin Sniper13-21/+118
enable/disable this effect (default is off) and another option to disable the pickup notification in the chat log (default is on).
2009-02-19Prevent target toggling when the button is heldJared Adams2-27/+27
2009-02-18Changed shopitem to use the stringutils class instead of tostring, asIra Rice1-0/+1
the two have been merged. Signed-off-by: Ira Rice <irarice@gmail.com>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-02-16 09:45:04 +0000