summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-09-10Merge pull request #1385 from Asheraf/saras_memoryhemagx12-1050/+962
Cleanup Sara's memory instance Closes #1385 as merged
2016-09-10Cleanup Sara's memory instanceAsheraf9-320/+260
* Now it follow Hercules coding style * Various improvments to HULD support
2016-09-10Merge pull request #1368 from KirieZ/sell-behavior-fixhemagx1-1/+7
Adds official behavior when selling to NPCs. Fixes issue #1214 Closes #1368 as merged
2016-09-10Adds official behavior when selling to NPCs. Fixes issue #1214KirieZ1-1/+7
2016-09-10Merge pull request #1421 from 4144/mapchecksHaru5-88/+289
Add missing checks into some files in map server
2016-09-10Add missing checks into searchstore.cAndrei Karas1-25/+42
2016-09-10Add missing checks into script.cAndrei Karas1-60/+208
2016-09-10Add missing checks into quest.cAndrei Karas1-0/+9
2016-09-10Add missing checks into pet.cAndrei Karas1-3/+23
2016-09-10Add missing checks into pc_groups.cAndrei Karas1-0/+7
2016-09-10Merge pull request #1416 from 4144/hpmfixHaru7-34/+169
Add some fixes for HPM
2016-09-09Merge pull request #1420 from Ridley8819/workstationAndrei Karas2-2/+4
Followup 0a097048
2016-09-09Followup 0a097048 #1419Ridley88192-2/+4
Fix issue#[1418](https://github.com/HerculesWS/Hercules/issues/1418) .conf format
2016-09-09Update HPM hooks.Andrei Karas4-0/+102
2016-09-04Revert "Coverity Scan"Haru1-27/+32
This reverts commit 00063d1cdda8fa771f17e378a28eba157a74a962. (this commit was accidentally pushed due to automation failure) Signed-off-by: Haru <haru@dotalux.com>
2016-09-03Add some missing functions in skill.c into interface.Andrei Karas3-34/+67
2016-09-03Coverity ScanHaru1-32/+27
2016-09-02Merge pull request #1414 from skyleo/minor_quest_fixesIbrahem Hossam1-4/+4
Fixed Mixed Solution No.3 Arc never being assigned and repositioning
2016-09-02ItemDB SQL SyncHercules.ws2-21/+21
Signed-off-by: HerculesWSAPI <dev@herc.ws>
2016-09-02Merge pull request #1412 from Asheraf/strcharinfohemagx227-4521/+4521
change *strcharinfo to use constants Closes #1412 as merged
2016-09-02change *strcharinfo to use constantsAsheraf227-4521/+4521
2016-09-01Fixed Mixed Solution No.3 Arc never being assigned and occurrence of ↵skyleo1-4/+4
questlog errors in map.
2016-08-29Constants Documentation SyncHercules.ws1-0/+8
Signed-off-by: HerculesWSAPI <dev@herc.ws>
2016-08-29Merge pull request #1411 from Asheraf/constantshemagx82-1866/+1873
Closes #1411 as merged
2016-08-29*strnpcinfo now uses constantsAsheraf82-1866/+1873
- NPC_NAME for the whole npc name including hidden part - NPC_NAME_VISIBLE for the visible part of the npc name - NPC_NAME_HIDDEN for the hidden part of the npc name - NPC_NAME_UNIQUE for the npc unique name - NPC_MAP for npc map
2016-08-26Constants Documentation SyncHercules.ws1-0/+14
Signed-off-by: HerculesWSAPI <dev@herc.ws>
2016-08-26MobDB SQL SyncHercules.ws1-0/+13
Signed-off-by: HerculesWSAPI <dev@herc.ws>
2016-08-26ItemDB SQL SyncHercules.ws1-0/+1
Signed-off-by: HerculesWSAPI <dev@herc.ws>
2016-08-26Merge pull request #1409 from Asheraf/ghost_palacehemagx15-14/+1531
Closes #1409 as merged
2016-08-26Implementation of Ghost palace instance based on iROAsheraf15-14/+1531
* Added ghost palace instance script * Add needed monster, item and quest database entries * Added mapflags for instance map (1@spa)
2016-08-25Merge pull request #1408 from 4144/vendingHaru1-1/+1
Swap calls to send info about solt item to seller and actual item del…
2016-08-25Swap calls to send info about solt item to seller and actual item deletion ↵Andrei Karas1-1/+1
from cart.
2016-08-22HPM Hooks UpdateHercules.ws4-0/+34
Signed-off-by: HerculesWSAPI <dev@herc.ws>
2016-08-22Corrected an issue that prevented the map server's database port from being ↵Haru1-1/+1
changed Signed-off-by: Haru <haru@dotalux.com>
2016-08-22Corrected an issue that caused the setting inter_configuration/log/log_inter ↵Haru3-3/+35
to be ignored Signed-off-by: Haru <haru@dotalux.com>
2016-08-22Corrected an issue that caused the setting ↵Haru1-1/+6
char_configuration/permission/display_new to be ignored Fixes #1407 Signed-off-by: Haru <haru@dotalux.com>
2016-08-22Temporary quick-fix for a warning in the linux buildsHaru1-1/+1
- libconfig uses 'long long' for its 64 bit lookup/set/get functions, rather than a well-defined size integer (such as int64_t). GCC doesn't like the use of an int64_t* where a long long* is required, especially on linux x86_64, where int64_t is typedeffed as long int - In future, the function signature will be changed, so we can use int64 normally. Signed-off-by: Haru <haru@dotalux.com>
2016-08-21Updated Visual Studio projects with the conf/import file name changesHaru3-24/+24
Signed-off-by: Haru <haru@dotalux.com>
2016-08-21Corrected some issues reported by coverityHaru1-4/+7
- Incorrect sizeof expression in char_config_set_ip() - Invalid comparison (when MAX_ZENY == MAX_INT) in char_config_read_player_new() Signed-off-by: Haru <haru@dotalux.com>
2016-08-21Syntax clean up in the script documentationHaru1-1652/+1680
- Changed all function calls to encourage parenthesized calls - Replaced numbers with constants where appropriate - Removed some incorrect remarks Signed-off-by: Haru <haru@dotalux.com>
2016-08-21Removed some of the leftover calls to menu() in custom scriptsHaru16-2074/+2047
Signed-off-by: Haru <haru@dotalux.com>
2016-08-20Re-added HPM support for configuration settingsHaru8-11/+73
Plugin settings should be relative to the the libconfig file root. For example, a configuration setting of type HPCT_CHAR will be relative to the root of conf/char/char-server.conf. In order to add a configuration entry inside the char_configuration block, the full configuration path (slash-delimited) should be passed to addCharConf(), as in the following example: `addCharConf("char_configuration/my_setting", my_parser_function);` Signed-off-by: Haru <haru@dotalux.com>
2016-08-20Added a better error message when a libconfig file is not foundHaru1-0/+5
Previously, it'd say "[Error] (null):0 - file I/O error" Signed-off-by: Haru <haru@dotalux.com>
2016-08-20Merge pull request #1399 from HerculesWS/settings_libconfigAndrei Karas140-5396/+9547
Ported the configuration to libconfig format
2016-08-20Updated references to the old config in the documentationHaru6-48/+50
Signed-off-by: Haru <haru@dotalux.com>
2016-08-19Added option to make plugin-defined battle config entries optionalHaru4-12/+15
When a setting optional, no warning is issued on the console when said setting is not found in the config Signed-off-by: Haru <haru@dotalux.com>
2016-08-19HPM Hooks UpdateHaru4-18/+52
Signed-off-by: Haru <haru@dotalux.com>
2016-08-19Ported battle.conf to libconfigHaru36-594/+1538
Ported to modern Hercules and cleaned up from Panikon's commits: 44fea0b3cdba6901599265220228ba4359b1f96d, 9cba05bc0811e638bbaaa6cff887d0b2c9872560 Signed-off-by: Haru <haru@dotalux.com>
2016-08-19Ported socket.conf (was packet.conf) to libconfigHaru10-148/+354
Ported to modern Hercules and cleaned up from Panikon's commits: b10f2a88073882bea812c6278fdec7848102ab87, bc5007299a92898ea4630f2a977d9a1b42b6c145 Signed-off-by: Haru <haru@dotalux.com>
2016-08-19Changed access_allow and access_deny to VECTORsHaru1-24/+29
Signed-off-by: Haru <haru@dotalux.com>