summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-05-25Improved CFLAGS/CPPFLAGS handlingHaru14-216/+322
- Language extensions, such as _GNU_SOURCE are now enabled through CPPFLAGS by the configure script, rather than within the source code. - Moved some configure-time CFLAGS to CPPFLAGS, where appropriate. - Fixes bugreport:8211, thanks to Neoth http://hercules.ws/board/tracker/issue-8211-compiling-warning-in-linux Signed-off-by: Haru <haru@dotalux.com>
2014-05-24Fixed issue in [AT](un)jail when jailing players in sec_pri (issue: 8206) ↵panikon1-2/+12
http://hercules.ws/board/tracker/issue-8206-jail-bug/
2014-05-24Fixed issue in *guildskill, lvl could be set to negative values. (issue: ↵panikon1-1/+1
8214) http://hercules.ws/board/tracker/issue-8214-guildskill-lead-to-negative-guild-skill-level/
2014-05-23Merge pull request #288 from pois8n/masterStreusel1-2/+2
Minor spelling correction in agit_main.txt
2014-05-24Minor spelling correction in agit_main.txtPoison1-2/+2
2014-05-23Update rAthena-main-upgrade.sqljaBote1-0/+5
Following up 3591de7e7ac2db4e3eeaa9bad2615648e7f94b3a. Upgrader should be up to date as of now.
2014-05-23Merge branch 'master' of https://github.com/HerculesWS/Herculesmalufett12-300/+424
2014-05-23Fixed Bug#8215malufett1-1/+1
-http://hercules.ws/board/tracker/issue-8215-raido-rune-crushing-strike/?gopid=22895#entry22895 Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
2014-05-21HPM Hooks UpdateHercules.ws1-18/+18
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2014-05-21Corrected a nullpo report in 4c8d773d72ae134f7cc4d43861104ecd9f4ae134Haru3-11/+7
Special thanks to ossi0110 Signed-off-by: Haru <haru@dotalux.com>
2014-05-20Corrected Bioethics quest checks in the Biochemist NPCHaru1-58/+53
- As of 4ea6d474 (almost 7 years ago!) the correct check is bioeth==13, rather than MISC_QUEST&64. Special thanks to ossi0110. - Minor tweaks to the script to match Hercules standards. Signed-off-by: Haru <haru@dotalux.com>
2014-05-20Improved @go commandHaru1-137/+84
- Corrected checks to correctly display the help message when an invalid map name is requested (rather than warping to Prontera) - Removed huge list of hardcoded town names (special thanks to KeiKun). Signed-off-by: Haru <haru@dotalux.com>
2014-05-20Fixed an exploit in the custom jobmaster NPCHaru1-95/+165
- Improved legibility (renamed variables, replaced numbers with constants. - Changed syntax to match Hercules standards. - Fixed status point exploit upon Baby Novice job change. - Special thanks to bgamez23. Signed-off-by: Haru <haru@dotalux.com>
2014-05-19HPM Hooks UpdateHercules.ws3-0/+70
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2014-05-19Fixed issue 8182panikon4-6/+47
http://hercules.ws/board/tracker/issue-8182-cloaking-on-ice-wall/ Fixed minor typo on script_commands
2014-05-19Fixed issue 8201panikon1-1/+1
http://hercules.ws/board/tracker/issue-8201-map-server-crash/
2014-05-17Added missing changequest commands on Alchemist Job Change Quest.Taylor Locke1-2/+7
2014-05-18Follow-up 5f5380e and a42f880e, Fixed crappy coding with sql-update ↵Shido1-1/+1
file(Special thanks to QQfoolsorellina)
2014-05-17Follow-up to 5f5380e8d5fa2e6042813e35101cb33b656e3972Haru1-1/+1
- Fixed a missing semicolon in the upgrade script. Special thanks to QQfoolsorellina Signed-off-by: Haru <haru@dotalux.com>
2014-05-17ItemDB SQL SyncHercules.ws1-1394/+1538
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2014-05-17Re-Upload and fix the aegis conversion for item_db.confMichieru1-876/+3142
2014-05-17Fixes and Clean-ups from Euphy for Wolfchev's Lab.Taylor Locke1-366/+200
2014-05-16Merge pull request #284 from MrKeiKun/fix_pet_tableHaruna10-31/+36
Renamed incuvate of Pet System
2014-05-17Renamed incuvate of Pet System.Shido10-31/+36
2014-05-16Follow-up to b6b3f58795288701d0e162d43fa6f0a47af913b3Haru12-56/+60
- Includes in some files weren't sorted alphabetically. Special thanks to KeiKun. Signed-off-by: Haru <haru@dotalux.com>
2014-05-16Changed battle_config definition to extern to avoid mistakes in pluginsHaru3-12/+14
- This avoids plugins incorrectly using battle_config (with unreliable results) instead of using the proper interface, battle->bc. - Edited various #defines to use battle->bc instead of battle_config so that they can work perperly in plugins as well. Signed-off-by: Haru <haru@dotalux.com>
2014-05-13Partial cleanup of script_commands.txtHaru1-548/+529
- Updated examples to a more modern syntax - Corrected examples using the wrong case for script commands (fixes bugreport:8192 thanks to jaBote) http://hercules.ws/board/tracker/issue-8192-camelcase-in-scripting-documentation/ - Reworded or rewritten some misleading/no longer correct notes to match the current script engine behavior. - Marked some commands as deprecated and suggested alternatives, to discourage their use in new scripts (set, goto, jump_zero, menu) - Changed use of temporary character variables into scope variables in examples, where appropriate. Signed-off-by: Haru <haru@dotalux.com>
2014-05-13Removed trailing whitespace (sources)Haru71-1143/+1147
Signed-off-by: Haru <haru@dotalux.com>
2014-05-13Removed trailing whitespace (scripts)Haru199-812/+761
Signed-off-by: Haru <haru@dotalux.com>
2014-05-13Fixed some charset issuesHaru17-16/+45
- Fixed files with mixed character set or invalid CP949 characters. - Uncommented '#music' script in the_sign_quest.txt (now the soundeffect filename should be fixed). - Added a note to the header of CP949 files not to read or save them as UTF8, since it'd break their encoding. It should be safe enough to read them as EUC-KR if your text editor doesn't offer CP949 as an option. - Added FIXME notes about untranslated strings in assassin_skills.txt and WolfchevLaboratory.txt. Signed-off-by: Haru <haru@dotalux.com>
2014-05-13Fixed several files with a missing EOL at EOFHaru45-45/+45
- All text files should end with an EOL. Period. - See http://robots.thoughtbot.com/no-newline-at-end-of-file for info on how to configure the most common text editors to do it automatically for you. Signed-off-by: Haru <haru@dotalux.com>
2014-05-13Removed enchantments from const since they're in item_db.confTaylor Locke1-170/+1
2014-05-13Wolfchev's Laboratory Instance Release.Taylor Locke4-595/+3635
2014-05-13ItemDB SQL SyncHercules.ws1-1651/+1507
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2014-05-12Revert "Updated to match AEGIS item_db" temporally in order to stop issues ↵panikon1-3321/+812
depicted in issue: 8190 This reverts commit ae289d65b550198ce32a5314f1ff769d729821a9.
2014-05-11Merge branch 'master' of http://github.com/HerculesWS/Herculespanikon4-7/+133
2014-05-11Fixed typo in thqs_ttshoppanikon1-1/+1
2014-05-10Travis improvementsHaru3-5/+131
- Parallelized pre-re and re tests - Added mapserver and script engine tests: this means that travis will detect parse errors in scripts as well as the source now) Signed-off-by: Haru <haru@dotalux.com>
2014-05-10Merge pull request #281 from Geniks/patch-1Flipp1-2/+2
Update atcommands.txt
2014-05-10Changed set_reg behavior on pc_setparam failure, now it won't simply END the ↵panikon2-11/+25
script, if a dialog window is open it'll also CLOSE it. Corrected Zeny formula in THQS
2014-05-10Follow-up to 5f1529083ad1f35a3ac66cc041ee74d6db2f3552Haru1-1/+5
- Now the map-server returns nonzero even on nomral runs (or --run-once) if any script failed loading. Signed-off-by: Haru <haru@dotalux.com>
2014-05-10Moved MAX_CARTS and NEW_CARTS defines into common/mmo.hHaru9-19/+31
- Fixes bugreport:8184, allowing re-commit of 94657284973f4037596bae468ebfbee5c217e02b Signed-off-by: Haru <haru@dotalux.com>
2014-05-10Re-commit of "Fixed order of includes in all source files"Haru144-1367/+1676
This reverts commit 94657284973f4037596bae468ebfbee5c217e02b.
2014-05-10Revert "Fixed order of includes in all source files"panikon144-1676/+1367
This reverts commit b6b3f58795288701d0e162d43fa6f0a47af913b3. Fixes issue 8184 http://hercules.ws/board/tracker/issue-8184-cart-related/
2014-05-10HPM Hooks UpdateHercules.ws1-6/+6
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2014-05-10Optimized THQS_TTShop.txt and corrected a minor mistakepanikon9-492/+177
Added npc_market_data_db to inter-server.conf Added shop message to messages.conf Fixed small typo in clif_GM_kickack
2014-05-10HPM Hooks UpdateHercules.ws1-6/+6
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2014-05-10Small changes in npc loading/reloadingpanikon4-55/+57
Compartmentalized npc file processing Corrected event initalisation order in npc_reload Changed loading order, now item db constants are loaded before npc processing in order to avoid labels overwriting constants values, like Aegis Names Added information regarding reloading scripts in /doc/script_commands.txt
2014-05-09Added documentation regarding trader objects in script_commands.txtpanikon4-41/+85
Added enumered returns to npc_cashshop_buy and to npc_cashshop_buylist
2014-05-10Update atcommands.txtGeniks1-2/+2
@newmount => @mount2