summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-11-09Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind1-6/+6
2013-11-09Follow up 7803b4e0d437681aa09113b5240363d03d85a1b8shennetsind1-2/+2
The commit said "4. pc_jobchange now correctly vaporizes the homun. " while it actually fixed it on skillreset, this commit fixes it on pc_jobchange and on pc_dead. Special Thanks to kyeme! Signed-off-by: shennetsind <ind@henn.et>
2013-11-09Fixed Bug 7800shennetsind1-1/+0
homunculus skill delays (cooldown was fixed in 7803b4e0d437681aa09113b5240363d03d85a1b8 ) are no longer reset upon being vaporized Thanks to Wend, kyeme. http://hercules.ws/board/tracker/issue-7800-homunculus-skills-cooldown/ Signed-off-by: shennetsind <ind@henn.et>
2013-11-09Fixed Bug 7809shennetsind1-3/+3
Fixed @speed bug that'd cause partial speed increase (instead of 100%) until map change. Thanks to Beret, kyeme. http://hercules.ws/board/tracker/issue-7809-speed-command/ Signed-off-by: shennetsind <ind@henn.et>
2013-11-09HPM Hooks UpdateHercules.ws1-6/+6
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-11-09Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind68-448/+455
2013-11-09HPM Support for plugin-implemented "--args" (options)shennetsind7-31/+130
As a necessary measure for the upcoming bot that will keep .sql files in sync with their .txt counterparts. Special Thanks to Haruna Signed-off-by: shennetsind <ind@henn.et>
2013-11-09HPM Hooks UpdateHercules.ws3-26/+26
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-11-09Consolidated commands called in scripts to their lowercase versionHaru65-422/+429
- Added a note about variables and command scripts case sensitivity. Even though the engine still accepts variable, function and command names in a case insensitive way, it is discouraged to rely on such behavior. Please update your custom scripts as soon as possible. Signed-off-by: Haru <haru@dotalux.com>
2013-11-08Adjusted account-modifiers default values to 100.shennetsind3-4/+11
Special Thanks to Haruna, ossi0110. Signed-off-by: shennetsind <ind@henn.et>
2013-11-08Fixed 5 Homun Bugsshennetsind6-20/+33
1. Homun cooldowns are no longer reset upon being vaporized. 2. Call Homun now displays the skill title above the char upon success. 3. Homuns that have been out of owners sight for over 3 seconds will now be teleport back to master. 4. pc_jobchange now correctly vaporizes the homun. 5. New homunculus now spawn with full health. Special Thanks to kyeme/Beret for all the information and official server testing. Signed-off-by: shennetsind <ind@henn.et>
2013-11-08Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind34-212/+303
2013-11-08Fixed Bug 7807shennetsind2-12/+12
NPC Duplicates with xs/ys weren't being properly loaded, Special Thanks to Haruna. Also fixes an issue with the instance empty timer. http://hercules.ws/board/tracker/issue-7807-endless-tower/ Signed-off-by: shennetsind <ind@henn.et>
2013-11-08HPM Hooks UpdateHercules.ws3-0/+30
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-11-08Added mercenary/homunculus constants from AegisHaru2-1/+48
- Follow-up to 124ab2a1cdb344f24170a4d91f7000ebabf39b40 - Replaced last leftover numeric sprite ID with the appropriate constant - Special thanks to Ind Signed-off-by: Haru <haru@dotalux.com>
2013-11-08Added support for monster spritename constantsHaru29-211/+225
- Follow-up to 124ab2a1cdb344f24170a4d91f7000ebabf39b40 - Replaced numeric IDs in NPC definitions and setnpcdisplay calls with the appropriate constants - Made possible thanks to Ind Signed-off-by: Haru <haru@dotalux.com>
2013-11-07HPM Hooks UpdateHercules.ws3-0/+182
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-11-07Merge pull request #220 from shennetsind/mastershennetsind35-161/+867
mhalicot's Item Bind Pull Request
2013-11-07Merge remote-tracking branch 'upstream/master'shennetsind29-98/+2385
2013-11-07Further item bind adjustmentsshennetsind11-18/+22
Thanks to Haruna! Signed-off-by: shennetsind <ind@henn.et>
2013-11-07Extended script constants to support NPC sprite IDsHaru7-53/+94
- Added support for constants whose name begins with a number. - Follow-up to 124ab2a1cdb344f24170a4d91f7000ebabf39b40. - Replaced calls to setnpcdisplay with hardcoded numeric IDs to constants. - Thanks to Yommy. Signed-off-by: Haru <haru@dotalux.com>
2013-11-07Item Bound Fixes/Adjustments/Improvementsshennetsind30-390/+285
Special Thanks to Haruna Signed-off-by: shennetsind <ind@henn.et>
2013-11-07Corrected a const pointer being incorrectly initializedHaru1-2/+1
- Fixes bugreport:7804, thanks to kyeme http://hercules.ws/board/tracker/issue-7804-warning-c4090-function Signed-off-by: Haru <haru@dotalux.com>
2013-11-07Fixed equip command failing when another item of the same kind is equippedHaru1-1/+1
- The command now correctly skips the already equipped items, rather than trying to equip them again (and fail during the process). - Special thanks to Poison. Signed-off-by: Haru <haru@dotalux.com>
2013-11-06Update Fixshennetsind4-2/+18
Re-added the changes that were gone in the update conflict. Signed-off-by: shennetsind <ind@henn.et>
2013-11-06Merge remote-tracking branch 'origin/master'shennetsind29-128/+919
Signed-off-by: shennetsind <ind@henn.et> Conflicts: conf/messages.conf src/common/mmo.h src/map/pc_groups.c src/map/pc_groups.h
2013-11-06Merge pull request #218 from MrKeiKun/masterHaruna19-42/+2259
Visual Studio File Update
2013-11-07Follow-up 993e3303c3 and c6be1114d3.Shido2-8/+7
Signed-off-by: Shido <the.keikun@gmail.com>
2013-11-07Added Visual Studio 2013 files.Shido11-0/+2213
Signed-off-by: Shido <the.keikun@gmail.com>
2013-11-07Renamed Hercules-12.sln and vcproj-12.Shido11-2/+2
* Instead of -12 used for Visual Studio 2013. Signed-off-by: Shido <the.keikun@gmail.com>
2013-11-07Added _MSC_VER check.Shido1-0/+5
* This will check if C/C++ Compiler Version since VER 18.00 already defined Interlocked/Interlocked64. Signed-off-by: Shido <the.keikun@gmail.com>
2013-11-07HPM Hooks UpdateHercules.ws3-0/+30
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-11-06Merge pull request #212 from shennetsind/mastershennetsind11-20/+95
Account-wide Exp/Drop/Death Modifiers
2013-11-06Updated to latest Herculesshennetsind1-13/+40
Signed-off-by: shennetsind <ind@henn.et>
2013-11-06Merge remote-tracking branch 'upstream/master'shennetsind100-1243/+2600
Signed-off-by: shennetsind <ind@henn.et> Conflicts: src/map/pc.c
2013-11-06Follow up eaf04b9a2f0b399027df251c5d19d58d74e24e6ashennetsind1-19/+19
Adjustments to the team-splitting algorithm Thanks to Haruna! Signed-off-by: shennetsind <ind@henn.et>
2013-11-06Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind1-179/+180
2013-11-07HPM Hooks UpdateHercules.ws1-179/+180
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-11-06Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind59-251/+623
2013-11-06Merge pull request #217 from HerculesWS/script-checkershennetsind58-197/+569
Introducing the Hercules Standalone Script Syntax Checker
2013-11-06BG Queue Updateshennetsind5-26/+120
Enabled Party/Guild joining methods, Implements first attempt at the splitting algorithm (Thanks to jaBote!) Checks item 1 on issue #69 Help us test! -- http://hercules.ws/board/topic/1302-bg-queue-debug/ Signed-off-by: shennetsind <ind@henn.et>
2013-11-06Fixed Bug 7799shennetsind5-34/+25
SC_MOONSTAR, SC_SUPER_STAR are no longer removeable by sc_end all, and sc clear. Modified sc_config.txt, added a new flag (0x80/128) for such cases. http://hercules.ws/board/tracker/issue-7799-sc-moonstar/ Special Thanks to kyeme. Signed-off-by: shennetsind <ind@henn.et>
2013-11-06Fixed Bug 7801shennetsind1-1/+1
Fixed idletime_criteria description, the demonstration of how the default value is aggregated had the wrong value. http://hercules.ws/board/tracker/issue-7801-description-of-idletime-criteria/ (Thanks to jaBote!) Signed-off-by: shennetsind <ind@henn.et>
2013-11-06HPM Hooks UpdateHercules.ws1-54/+54
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-11-06Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind5-3/+377
2013-11-06Modified status_calc_shennetsind14-122/+132
Replaces the previous 'first' flag with a multi-option flag capable of selectively determining calls where the recalculation must not be hold by delayed damage, and therefore must take place immediately. This fixes issues caused by actions that require immediate recalculation e.g. on-level-up max_hp update, also modified @baselevel where status_calc was being called after the heal and not before, causing it not to be fully healed. Special Thanks to Haruna! <3 Signed-off-by: shennetsind <ind@henn.et>
2013-11-06Modified @command loadingshennetsind3-14/+12
So that HPM plugins are able to override default commands, thanks to Akkarin for bringing it up. Signed-off-by: shennetsind <ind@henn.et>
2013-11-05Follow-up to 97001710c06ed7053d18c8baaac602eb563b64b3Mumbles1-0/+29
- Added script-checker.bat launcher for Windows.
2013-11-05Follow-up to 97001710c06ed7053d18c8baaac602eb563b64b3Haru2-0/+158
- Added missing license note and error message to the script-checker bash script - Added Script-Checker.applescript. Open in Applescript Editor and save as .app bundle in order to use it. It's not pretty, but it works. Signed-off-by: Haru <haru@dotalux.com>
2013-11-05cbasetypes.h updateshennetsind1-6/+6
partial usage of ea:15242 (ai4rei) -- will revisit the remaining. Signed-off-by: shennetsind <ind@henn.et>