summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-01-27Renaming some more, also temporarily made "display_version" off by default ↵shennetsind32-39/+39
until we decide what to do with the version since it's git. Signed-off-by: shennetsind <ind@henn.et>
2013-01-26Changing ASCI Art / Moving stat server to Hercules.shennetsind3-20/+21
Changed the ASCI art (not quite final; just changing it prior to release), moving stat server to hercules end Signed-off-by: shennetsind <ind@henn.et>
2013-01-25Merge pull request #4 from mkbu95/mastershennetsind1-1/+1
Fix for bugreport:7218 in rAthena
2013-01-25Merge pull request #3 from shennetsind/mastershennetsind23-27/+28
Dropping _athena conf suffixes
2013-01-25Fixed bugreport:7218, where unique id was implemented and they forgot that ↵Matheus Macabu1-1/+1
more load was being retrieved after, so card0 wasn't being loaded properly. Signed-off-by: Matheus Macabu <mkbu95@gmail.com>
2013-01-25Updating .gitignoreshennetsind1-1/+2
Made .DS_Store be ignored in all directories instead of only in root Signed-off-by: shennetsind <ind@henn.et>
2013-01-25Dropping _athena file suffixesshennetsind22-26/+26
Signed-off-by: shennetsind <ind@henn.et>
2013-01-21Updated .gitignoreshennetsind1-0/+2
The *.o files for libconfig were missing, and added /.DS_Store to ignore list (OSX mds cache storage) Signed-off-by: shennetsind <ind@henn.et>
2013-01-21Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind1-0/+129
2013-01-21Reverting SVN r17061shennetsind2-187/+160
Making --enable-debug useful once again. in r17061 lighta made --enable-debug enforce -wconversion, -Wno-switch, and other options (instead of making them optional) and by doing that lighta cluttered --enable-debug output making it incredibly hard to find important errors Signed-off-by: shennetsind <ind@henn.et>
2013-01-20Merge pull request #2 from trojal/mastershennetsind1-0/+129
Add .gitignore file
2013-01-20Fixed 3 logical errors (1 that would cause CH_PALMSTRIKE to crash the server ↵shennetsind2-4/+4
when either caster or target were out of sc data) Signed-off-by: shennetsind <ind@henn.et>
2013-01-17Merge remote-tracking branch 'origin/rathena'malufett14-203/+279
2013-01-16Fixed bugreport:7182 where GN_MIX_COOKING is limited in creating 1 food item.rud0lp203-10/+30
Fixed bugreport:7172 missing elemental resistance bonus of NC_RESEARCHFE. Recoded RA_FEARBREEZE.(bugreport:7188). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17101 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-16* Documented @set command from r16123.euphyy3-14/+20
* Fixed a waitingroom bug in Wizard job quest (bugreport:7189). * Fixed getequipname() returning -1 instead of an empty string (bugreport:7186). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17100 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-14* Added quotes parsing to @set (bugreport:7171)trojal1-1/+8
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17099 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-13Follow up r17094.(bugreport:7173)rud0lp201-2/+4
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17098 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-13Fixed bugreport:7170 where AL_INCAGI where it double DEF.rud0lp204-20/+21
Fixed bugreport:6961 WL_COMET AOE range is now 15x15. Fixed bugreport:5811 where SC_BLEEDING is not attach to caster to give exp. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17097 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-13* Updated WOE Controller script to v1.5, which overhauls the rewards system ↵euphyy4-133/+157
(with many new features). * Fixed another Renewal Izlude coordinate (bugreport:7169). * Fixed a mail bug, since r16574. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17096 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-12Okay. Trying it now, test 3.shennetsind1-1/+1
need to commit a minor edit to check how the caching works & to check if i got how this git stuff works. Signed-off-by: shennetsind <ind@henn.et>
2013-01-13Merge remote-tracking branch 'origin/rathena'malufett2-2/+2
2013-01-13Revert "Merge latest rathena commits to Hercules"malufett6-66611/+66595
This reverts commit cb18f86c8b6481a338057b1b8ea0bfbd5f5acb6e.
2013-01-12Merge remote-tracking branch 'hercules-remote/master' into dev/trojalTrojal6-66595/+66611
2013-01-13Merge latest rathena commits to Herculesmalufett6-66595/+66611
Merge r17093, r17094, r17095 of rAthena to Hercules. Welcome Hercules!! my first commit <3
2013-01-12Follow up r17094 forgot to include changes in db files..XDrud0lp202-6/+6
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17095 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-12Change GC_VENOMIMPRESS to 10 cells.(bugreport:6419)rud0lp203-19/+35
Fixed bugreport:6503 where SR_GT_REVITALIZE causes glitch display in stat window. Change WM_LULLABY_DEEPSLEEP to self targeted skill.(bugreport:6579) Fixed bugreport:6642 where SR_CURSEDCIRCLE effect is not remove after casting AL_WARP. Change SO_ARULLO to ground targeted skill.(bugreport:6842) Fixed bugreport:7165 where 'npcwalkto' script command is not working properly. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17094 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-12Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind0-0/+0
2013-01-12Test1, testing for the commit widget, need to edit something.Trojal1315-0/+830889
Test2, testing for the commit widget, need to edit something. Signed-off-by: shennetsind <ind@henn.et>
2013-01-11Fixed bugreport:7159 where cooking formula and creation effect is not ↵rud0lp202-2/+2
working properly. Fixed bugreport:7129 where GN_MANDRAGORA is not working with other skills. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17093 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-10Add .gitignore file specifying lists of files to ignore from repositoryTrojal1-0/+129
(exe, compile objects, custom files, etc) -- generated from list of svnignore files.
2013-01-10Merge rathena repository to form Hercules initial commit.Trojal1315-0/+830889
2013-01-11* Fixed minor issues in Guillotine Cross job change quest (bugreport:7145).euphyy5-9/+19
* Fixed misplaced line in 13-2 quests (bugreport:7136). * Fixed mistakes in script_commands.txt (bugreport:7140). * Added 'nowarpto' and 'nomemo' mapflags to bossnia_0* maps (bugreport:7118). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17092 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-10Initial commitshennetsind1-0/+2
2013-01-10Implemented official walk path dealing with obstacle.(bugreport:6159)rud0lp203-26/+20
-see 'src/config/core.h' for settings[OFFICIAL_WALKPATH]. Fixed bugreport:7057 where HP_ASSUMPTIO should only double eDEF & eMDEF. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17091 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-10Fixed bugreport:7151 where NJ_ISSEN don't consume HP on plant type monsters.rud0lp203-4/+11
Fixed bugreport:7154 where RC_BOSS type monsters are not immune with SC_DEEPSLEEP. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17090 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-09Fixed bugreport:7105 where pierce defense must ignore def and add (def/2) as ↵rud0lp203-9/+8
additional ATK damage. Fixed bugreport:7148 where r17072 broke the ability of smiths to forge weapons. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17089 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-08Fixed bugreport:7125 changed CH_PALMSTRIKE to aspd based like official.rud0lp202-3/+3
Fixed bugreport:7131 where negative def in PRE causes instant death to target. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17088 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-08- Added svn:eol-style=native property.brianluau2-26/+26
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17087 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-08* Renaming variable name from nsiuid to unique_id for better understanding ↵markzd13-51/+62
of its meaning, as requested on tid:69380. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17086 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-08Another fix with the @follow issue.ediejohnny2-3/+1
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17085 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-08Fixed a problem with the @follow command, that was stick the character when ↵ediejohnny1-4/+8
turned the @follow off. (bugreport:7139) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17084 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-07- Fixed a typo on SQL single quote, in int_storage.c, follow up ↵markzd1-1/+1
r17080.(bugreport:7141) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17083 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-07* Fixed a compiling error which happened when PACKATVER was set as < 7. ↵markzd1-2/+0
(tid:76890) 1. Also a merge of eAthena: https://trac.paradoxsystems.net/changeset/15166 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17082 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-07* Follow Up: r17080markzd4-15/+22
1. Removed an unnecessary update call. 2. Implemented interreg table at main.sql. * Follow Up: r17077, r17072, r17065 1. Fixed bugreport:7078, removed unnecessary checks. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17081 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-07* Implemented Unique identifier for Non stackable items. (tid:69380)markzd15-37/+174
* Set as off by default, it can be changed in /src/config/core.h. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17080 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-05Reverted 're/scripts_main.conf' from r17078..sorry folks..:)rud0lp201-1/+16
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17079 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-05Fixed bugreport:6332 updated NJ_TATAMIGAESHI to its RE behavior.rud0lp205-24/+17
Fixed bugreport:7101 where MO_EXTREMITYFIST don't consume sp when used against plant type monster. Fixed bugreport:7116 missing duration for HW_MAGICPOWER. Fixed bugreport:7117 where WL_WHITEIMPRISON doesn't work properly. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17078 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-05* Follow up r17065markzd5-9/+10
1. Removed some unnecessary checks.(bugreport:7078) 2. Fixed some index's which would access an invalid array position, crashing the server. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17077 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-04> Follow-up to r17065:aleos2-184/+184
* Further harmonized skill_id and skill_lv variables. * Fixed trap skill item requirement checking for signed return and being set to unsigned variable. (bugreport:7085, bugreport:7114) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17076 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-01-04* Documented OnTouch_ label.euphyy4-11/+14
* Fixed some bugs in Rune Knight job quest (incl. bugreport:7083). * Removed a duplicate item in custom Item Mall script (bugreport:7115). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17075 54d463be-8e91-2dee-dedb-b68131a5f0ec
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-25 06:03:02 +0000