index
:
evol/hercules
jak1/ci_fix
jak1/remove_unusable_console_output
master
rebased
test
tmphpm
The Mana World fork of Hercules. This is vanilla Hercules with a few tiny modifications for our specific needs. Mutually-beneficial modifications are contributed upstream.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
npc
/
merchants
Age
Commit message (
Expand
)
Author
Files
Lines
2016-04-27
Remove conf dir.
Andrei Karas
30
-10085
/
+0
2016-02-29
Replaced the SEX_FEMALE/SEX_MALE constants to scripts, where appropriate
Emistry
4
-52
/
+52
2016-02-22
Alberta NPC Updates
Jedzkie
1
-51
/
+1
2016-02-22
Payon NPC Update
Jedzkie
2
-74
/
+3
2016-02-21
Geffen NPC Updates
Jedzkie
2
-44
/
+5
2016-02-07
Merge pull request #1110 from dastgir/22-ScriptClean-Phase2
Haru
27
-126
/
+126
2016-01-17
Script Standardization: changed select format in merchants folder
Dastgir
27
-126
/
+126
2016-01-16
Remove VAR_ constants
AnnieRuru
2
-10
/
+10
2016-01-03
Update morroc trader npc's to match kRO's morroc trader npc's.
Jedzkie
1
-60
/
+1
2016-01-03
Update Prontera trader npc's to match kRO's trader npc's.
Jedzkie
1
-62
/
+1
2015-12-31
Replace -1,{ with FAKE_NPC,{
AnnieRuru
5
-7
/
+7
2015-12-22
NPC Update:
Jedzkie
2
-24
/
+30
2015-12-18
ItemID to Constant: kafras/merchants Folder
Dastgir
18
-139
/
+139
2015-12-15
Standardized header in scripts (part 6)
Haru
30
-797
/
+1187
2015-09-25
More aggressive whitespace cleanup. Follow up to 51329e6
Haru
2
-2
/
+2
2015-06-25
Updated Buying Shops script
Dastgir
1
-1
/
+11
2015-05-08
Replaced checkre() calls with constants
Haru
2
-4
/
+3
2015-03-03
Updated socket_enchant2.txt to contain ninja item
Dastgir
1
-1
/
+2
2015-03-03
Updated ninja shop
Dastgir
1
-0
/
+8
2015-01-11
Added check for Renewal items in Shop, Fixed #8484
Dastgir
1
-2
/
+4
2014-12-30
Merge pull request #325 from happyme9/master
malufett
1
-0
/
+2
2014-11-02
Replaced 'set' with direct assignment where applicable (common folder)
Haru
20
-259
/
+259
2014-10-31
Follow-up to c6f102e (fixed a typo)
Haru
1
-1
/
+1
2014-10-30
Deprecated checkriding and setriding commands
Haru
1
-6
/
+6
2014-10-24
Renamed ismounting, setmounting, @mount2
Haru
1
-4
/
+2
2014-08-21
Added Kagerou Tools
Happy
1
-0
/
+2
2014-05-13
Removed trailing whitespace (scripts)
Haru
9
-21
/
+21
2014-05-13
Fixed several files with a missing EOL at EOF
Haru
3
-3
/
+3
2013-12-24
Christmas Patch - 2013-12-23 Support
shennetsind
1
-182
/
+2058
2013-11-30
Re-commit of 4faa0ec9df7067cee3eb1c1953fccc6c2f842179
Taylor Locke
19
-57
/
+57
2013-11-28
Revert "Cleaned up Zeny manipulation in scripts."
Haru
19
-57
/
+57
2013-11-25
Cleaned up Zeny manipulation in scripts.
Taylor Locke
19
-57
/
+57
2013-11-10
Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4
Haru
1
-2
/
+2
2013-11-10
Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4
Haru
5
-19
/
+19
2013-10-28
Added ability to use constants instead of sprite IDs for NPCs. Converted all ...
Kisuka
30
-294
/
+294
2013-10-24
Follow up 418dd821c91ae19723a7b7b531e64b9c4565d555
shennetsind
1
-1
/
+1
2013-10-24
Update to last rAthena npc.
Michieru
29
-677
/
+559
2013-10-11
Moscovia Quest Update / Catalog Magician Move
shennetsind
1
-99
/
+5
2013-09-16
Corrected line endings and BOM issues with several files
Haru
7
-8
/
+8
2013-07-04
Merged/Updated/Added scripts from rAthena.
j-tkay
2
-21
/
+6
2013-05-28
Woohooo! Some more cleaning up!
Mysteries
1
-2
/
+2
2013-05-28
Follow up from my last commit.
Masao
1
-176
/
+283
2013-05-27
- Added custom HD Refiner NPC Dwarf Mighty Hammer. (Disabled by default.)
Masao
1
-0
/
+211
2013-04-15
Fixed Bug #7154
shennetsind
1
-1
/
+1
2013-04-11
* Initial implementation of Archangel Wing Enchants script.
euphyy
1
-0
/
+2
2013-02-25
* Part one of fixing bugreport:6527. This does not yet change functionality.
euphyy
6
-9
/
+26
2013-02-18
-Updated map_cache.dat
Streusel
1
-3
/
+2
2013-02-03
Follow up to 2f02be9
Mysteries
1
-1
/
+1
2013-02-03
Merged rAthena r17103
Mysteries
1
-87
/
+119
2013-02-03
Updated more placeholders and fixed some spacing issues.
Mysteries
28
-78
/
+34
[next]