summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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>
2013-11-05Introducing the Hercules Standalone Script Syntax CheckerHaru56-197/+382
- Added a command line argument '--script-check' to check a script's syntax without running the server (and without requiring a SQL connection). Usage: ./map-server --script-check /path/to/the/script.txt - For convenience, a script-checker bash script is provided, to set the path correctly when called from a different directory. Usage: /path/to/Hercules/script-checker /path/to/the/script/to/check.txt - While the script checker will supposedly work under windows as well, no convenience scripts are currently provided for platforms other than UNIX (feel free to open a pull request with a .bat launcher or whatever you like) - Integration with IDEs or text editors is possible. In fact, I already have a fully functional plugin for vim (through vim-syntastic), and if there's enough interest, I'll publish it. - screenshot: http://d.pr/i/NOBD - If you want an online checker, http://haru.ws/scriptchecker/ is running this code, without modifications and will be kept up to date (without any warranty though.) - Special thanks to Ind, Yommy, Streusel, who helped making this possible, in a way or another.
2013-11-05HPM Hooks UpdateHercules.ws5-3/+377
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-11-04Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind32-274/+645
2013-11-04pc_groups interfacedshennetsind7-129/+215
The last file without a interface is now no more (date.h doesn't count :P). Modified the way permissions are stored in order to enable plugins to be able to create permissions ( pcg->add_permission("name") [returns permission key] ). Special Thanks to Haruna! Closes #121 Signed-off-by: shennetsind <ind@henn.et>
2013-11-05Fixed grammarsevenzz232-5/+7
Signed-off-by: sevenzz23 <sevenzz23@yahoo.com>
2013-11-04Follow-up to 124ab2a1cdb344f24170a4d91f7000ebabf39b40Haru12-17/+17
- Changed a few leftover NPC IDs to constants - Note: we're still missing support for mob sprite constants, so the NPCs using mob sprites are still not converted. Signed-off-by: Haru <haru@dotalux.com>
2013-11-04Follow-up to 3b0cd11f980a48b903262c857fde1cd9c784c2e0Haru2-80/+79
- Changed <? ?> to <" "> after some further brainstorming. Special thanks to Yommy. Signed-off-by: Haru <haru@dotalux.com>
2013-11-04Standardized the format of some NPC parse error messagesHaru2-39/+39
- For better machine-parsing of such messages (i.e. in IDEs) Signed-off-by: Haru <haru@dotalux.com>
2013-11-04Implemented correct refine success rates above +10Haru2-13/+12
- Refine rates above +10 are updated with the official values obtained from Aegis. Note: There are no safe refines above +10 anymore. - Corrected the above +10 refine NPC to decrease the refine level by 3 in case of failure, according to what observed in Aegis. - Special thanks to malufett, Ind. Signed-off-by: Haru <haru@dotalux.com>
2013-11-03Modified travis to not compile pluginsshennetsind1-2/+2
Thanks to Haruna. Signed-off-by: shennetsind <ind@henn.et>
2013-11-03Added some packetver-related flags to the UNIX build scriptHaru4-13/+211
- The --disable-packetver-re (or --enable-packetver-re=no) flag prevents the definition of PACKETVER_RE (without editing mmo.h) - The --with-key1=, --with-key2=, --with-key3= flags override the encryption key defined by the current packetver. All three flags are required if at least one is used, or they'll be ignored. - These options are mostly useful for buildbots, developers who often use git bisect, or users who want to minimize their diffs and still want to override those settings. - (unrelated minor tweak) Silenced an unnecessarily verbose STDERR message caused by the $CC shipped with clang-5 during the MinGW check.
2013-11-03Added support for <? ?> blocks (parsed as multiline strings) in libconfigHaru3-176/+215
- If this doesn't make any sense right now, fear not. It'll make sense in an upcoming update. - Special thanks to Yommy, Ind. Signed-off-by: Haru <haru@dotalux.com>
2013-11-03Allow warp duplicates without a 'facing' valueHaru2-4/+6
- Warps don't require a facing, so their duplicates shouldn't either. - Credits to jaBote. Signed-off-by: Haru <haru@dotalux.com>
2013-11-03Merged Pull Request #195 (@autoloottype)Haru8-12/+146
- Small tweaks to the command, fixed merge conflicts Signed-off-by: Haru <haru@dotalux.com>
2013-11-02Fixed Bug #7621shennetsind2-11/+11
Magicmushroom poison now properly cancels skills being cast upon activating one of its own, also modified unit_skillcastcancel's error message upon timer deletion failure so that it becomes easier to debug in the future. http://hercules.ws/board/tracker/issue-7621-erro-map-server-waraitake/ Thanks to Beret Signed-off-by: shennetsind <ind@henn.et>
2013-11-02Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind3-0/+62