Commit graph

8280 commits

Author SHA1 Message Date
malufett
9e4e11e764 Merge branch 'master' of https://github.com/HerculesWS/Hercules into SCConfigRedesign
Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
2015-04-20 05:14:39 +08:00
Taylor Locke
443c1d02e7 Fixed wrong job_db.conf path from 0f2b317372. 2015-04-19 11:48:15 -07:00
malufett
0f2b317372 Fixed Bug#8636
-http://hercules.ws/board/tracker/issue-8636-unknown-weapon-type/?gopid=25011#entry25011

Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
2015-04-19 22:26:47 +08:00
Andrei Karas
dda4f86ce4 Update HPM hooks. 2015-04-16 00:41:01 +03:00
Andrei Karas
47c691f0e7 In comment change job_db1.txt to job_db.conf 2015-04-15 16:49:55 +03:00
Andrei Karas
50de773053 Allow for plugins read custom fields from jobdb1. 2015-04-15 16:49:55 +03:00
malufett
37d2e16557 Merge pull request #496 from 4144/fix8620
Fix issue http://hercules.ws/board/tracker/issue-8620-error-in-quest/
2015-04-14 07:11:51 +08:00
malufett
5a5cd068fd Fixed Bug#8621
-http://hercules.ws/board/tracker/issue-8621-angra-manyu-with-aspd-low/?gopid=24959#entry24959

Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
2015-04-14 07:10:13 +08:00
malufett
2c192fc93f Fixed Bug#8624
-http://hercules.ws/board/tracker/issue-8624-damage-of-mvp/?gopid=24966#entry24966

Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
2015-04-13 22:50:28 +08:00
Andrei Karas
1f427df3fb Fix issue http://hercules.ws/board/tracker/issue-8620-error-in-quest/ 2015-04-12 00:54:30 +03:00
csnv
41ab668531 Fixed some compiling errors under MSVC
Introduced on: dab1fba3a8
2015-04-10 20:33:00 +02:00
malufett
d47bc1a787 Merge pull request #482 from 4144/checks
Add missing checks to char server
2015-04-10 18:57:30 +08:00
malufett
8b27b383ac Merge pull request #489 from 4144/loginchecks
Add missing checks to login server
2015-04-10 18:49:09 +08:00
malufett
5e09149114 Fixed Bug#8615
-http://hercules.ws/board/tracker/issue-8615-warning-after-compiling/?gopid=24928#entry24928
2015-04-10 18:45:48 +08:00
malufett
08cbaa1e87 Merge branch 'master' of https://github.com/HerculesWS/Hercules into JobDBRedesign 2015-04-10 17:40:02 +08:00
Andrei Karas
de35955a51 Add checks to loginlog_sql.c 2015-04-09 11:53:00 +03:00
Andrei Karas
12091c8fa0 Add checks to login.c 2015-04-09 11:52:59 +03:00
Andrei Karas
1068529152 Add checks to ipban_sql.c 2015-04-09 11:52:59 +03:00
Andrei Karas
991ef8e1be Add checks to account_sql.c 2015-04-09 11:52:59 +03:00
Andrei Karas
65ec2372ee Add checks to pincode.c 2015-04-09 11:52:35 +03:00
Andrei Karas
b9640535e1 Add checks to loginif.c 2015-04-09 11:52:35 +03:00
Andrei Karas
c2029c1947 Add checks to inter.c 2015-04-09 11:52:34 +03:00
Andrei Karas
d57016b84d Add checks to int_storage.c 2015-04-09 11:52:34 +03:00
Andrei Karas
9b5bb84f69 Add checks to int_quest.c 2015-04-09 11:52:34 +03:00
Andrei Karas
097e767aec Add checks to int_pet.c 2015-04-09 11:52:33 +03:00
Andrei Karas
7995906e50 Add checks to int_party.c 2015-04-09 11:52:33 +03:00
Andrei Karas
9764a93298 Add checks to int_mercenary.c 2015-04-09 11:52:33 +03:00
Andrei Karas
54482f9e30 Add checks to int_mail.c 2015-04-09 11:52:33 +03:00
Andrei Karas
f6faa451fe Add checks to int_homun.c 2015-04-09 11:52:33 +03:00
Andrei Karas
dab1fba3a8 Add checks to int_guild.c 2015-04-09 11:52:32 +03:00
Andrei Karas
8e2c71ea78 Add checks to int_elements.c 2015-04-09 11:52:32 +03:00
Andrei Karas
fb9f8cadf5 Add checks to int_auction.c 2015-04-09 11:52:30 +03:00
Andrei Karas
f4b719e8ac Add checks to char.c 2015-04-09 11:52:30 +03:00
Andrei Karas
4ca6649bec Done show error message in client if was used item with flag KeepAfterUse. 2015-04-07 22:56:06 +03:00
Andrei Karas
e39a129ee2 Return from pc_equipitem/pc_unequipitem 0 if cant equip item and 1 if item equipped/unequipped 2015-04-07 22:20:46 +03:00
malufett
9d1fe3cd38 Update some SC scripts
Implemented RC_PLAYER, RC_ALL, ELE_ALL.(http://hercules.ws/board/topic/6285-some-suggestions/)

Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
2015-04-02 11:45:16 +08:00
malufett
94899de039 Merge branch 'master' of https://github.com/HerculesWS/Hercules into JobDBRedesign 2015-04-02 08:51:14 +08:00
Andrei Karas
1843ef171a Fix reading character from db. 2015-04-01 18:32:19 +03:00
malufett
60844f655a Fixed Bug#8601
-http://hercules.ws/board/tracker/issue-8601-chemical-protection/?gopid=24866#entry24866
Fixed proper skill fail message when bullet runs out..

Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
2015-04-01 23:25:14 +08:00
malufett
3b4b782760 Fixed Bug#8596
-http://hercules.ws/board/tracker/issue-8596-latest-build-cannot-be-compiled/?gopid=24854#entry24854

Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
2015-03-30 10:49:42 +08:00
Andrei Karas
097b655651 Update HPM hooks. 2015-03-30 01:36:43 +03:00
Andrei Karas
fe4f4c851d Add channels.conf option irc_channel_autojoin for auto joining irc channel. 2015-03-30 01:36:43 +03:00
malufett
1b201f5b2c Fixed Bug#5654
-http://hercules.ws/board/tracker/issue-5654-high-wizard-gravitational-field/

Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
2015-03-29 09:22:44 +08:00
malufett
19228956cc Follow up@fb88a56b9519adedfca06085de6c2ccc5da72582
-Fix some flaw. Thanks to Michi

Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
2015-03-28 16:26:48 +08:00
malufett
fb88a56b95 Hercules 'job_db1.txt' Redesign
-Initial and for review

Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
2015-03-27 11:07:54 +08:00
malufett
1a693220f9 Fixed Bug#8587
-http://hercules.ws/board/tracker/issue-8587-hide-command-and-hiding-skill/?gopid=24786#entry24786

Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
2015-03-24 23:36:09 +08:00
shennetsind
127f9b52a4 Follow up 145a4fe644
Thanks to Mordekaiser for pointing this scenario to us.

Signed-off-by: shennetsind <ind@henn.et>
2015-03-19 13:33:42 -03:00
malufett
12ce31d68b Follow up@210c963d2851eb880ba3560998ee984d942cde19
-Thanks to michi and chatchanunn

Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
2015-03-19 23:25:13 +08:00
malufett
370c96e24a Merge pull request #472 from Inzianity/patch-1
Fixed skill SO_WARMER where it regenerates twice
2015-03-19 23:17:49 +08:00
shennetsind
145a4fe644 Fixed Bug 8582
Solves an issue where an skill unit left-area event would not triggered due to duels.
Special Thanks to Haruna, kyeme.
http://hercules.ws/board/tracker/issue-8582-infinite-songs/

Signed-off-by: shennetsind <ind@henn.et>
2015-03-19 10:23:52 -03:00