Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,637 Commits 66 Branches 0 Tags 560 MiB
Commit Graph

11637 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lilith-
a29aace9c5 Follow up bd2503e,7355677 and fef6307. Merged Hercules e115c30 2013-12-16 06:46:21 -08:00
Lilith-
54dfc67925 * Fixed bug http://rathena.org/board/tracker/issue-8330-secure-npctimeout-bug-for-those-npc-who-have-no-dialog-window/ 
Merged Hercules adc2e6e
 2013-12-16 05:04:52 -08:00
Cydh Ramdh
4d8558489b [db/re/item_db.txt] Fixed 18742 and 18744 class. 7 to 63 
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2013-12-16 10:57:40 +07:00
Cydh Ramdh
b05ce44d19 Merge pull request #27 from Rekiem/patch-3 
Fixed typo on bard_quest.txt
 2013-12-14 19:45:24 -08:00
Cydh Ramdh
6dc538c343 Merge pull request #25 from exneval/master 
*Fixed bugreport http://rathena.org/board/tracker/issue-8337-all-hidecloaking-skills-in-pvpduelwoe/
*Fixed bugreport http://rathena.org/board/tracker/issue-8332-npc-dark-breath/
*Fixed bugreport http://rathena.org/board/tracker/issue-8107-dual-wield-problem/
 2013-12-14 19:44:02 -08:00
exneval
2520c85714 Merge branch 'master' of github.com:rathena/rathena 2013-12-15 09:06:22 +07:00
Rekiem
a872bd2fb4 Update bard_quest.txt 2013-12-14 20:32:47 -05:00
Cydh Ramdh
6a18170985 Merge pull request #26 from Rekiem/patch-2 
Follow up recent new items commit, wrong script on db/re/item_db.txt at line 8545
 2013-12-14 15:32:13 -08:00
Rekiem
bb3173c0bf Update item_db.txt 
when ejecute the server the console show me error from line 8545
the error is (getrefine>=7)have a missing ()
 2013-12-14 15:52:35 -05:00
exneval
7f6afa84b0 *Fix bugreport http://rathena.org/board/tracker/issue-8107-dual-wield-problem/ 2013-12-14 14:20:19 +07:00
exneval
fc763367db *Fix bugreport http://rathena.org/board/tracker/issue-8332-npc-dark-breath/ 2013-12-14 14:13:01 +07:00
exneval
bc9eff5b0c Merge branch 'master' of github.com:rathena/rathena 2013-12-14 13:42:26 +07:00
exneval
43c21ad667 *Fix bugreport http://rathena.org/board/tracker/issue-8337-all-hidecloaking-skills-in-pvpduelwoe/ 2013-12-14 13:40:23 +07:00
aleos89
0f2dd7fcf0 * Cleaned up a mercenary kill check. (bugreport:2222) 
Bug Fixes
* Adjusted script commands that use script_isstring and script_isint to use script_getdata to dereference if variable is given. (bugreport:8198)
* Removed the hardcoded password so that users can pass blank passwords through the config for MySQL. (bugreport:7787)
* Increased the hostname array to account for longer hostnames. (bugreport:8003)
* Fixed the CashShop not listing items correctly. (bugreport:7585)
* Fixed Offertorium not consuming the correct amount of SP. (bugreport:8266)
* Cart Boost effect stays even if the cart is removed. Revert of change in r16339. (bugreport:5808)
 2013-12-13 15:25:03 -05:00
Cydh Ramdh
5c698ef4f4 Merge pull request #23 from nanakiwurtz/master 
New Items from http://forums.irowiki.org/showpost.php?p=1367852&postcount=651
 2013-12-13 08:27:41 -08:00
nanakiwurtz
3b81f0b263 * Changed item script for "Improved Helm of Angel" 
Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
 2013-12-13 23:15:50 +07:00
Lilith-
c81607f1ca Added missed items from http://forums.irowiki.org/showpost.php?p=1366277&postcount=624 and http://forums.irowiki.org/showpost.php?p=1367371&postcount=636 2013-12-13 00:53:56 -08:00
Cydh Ramdh
dab21907b6 Fixed bugreport http://rathena.org/board/tracker/issue-8334-the-mapflag-of-monk-in-should-exclude-nosavesavepoint/ 
Thank t79979119 and exneval

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2013-12-13 13:27:32 +07:00
nanakiwurtz
056af72f21 * Follow up 93d4b176 2013-12-13 01:43:47 +07:00
Cydh Ramdh
45951b6864 Added items from http://forums.irowiki.org/showpost.php?p=1373816&postcount=769 
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2013-12-13 00:17:11 +07:00
nanakiwurtz
93d4b176fc * Follow up to http://forums.irowiki.org/showpost.php?p=1367852&postcount=651 
Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
 2013-12-12 23:50:28 +07:00
nanakiwurtz
3541fae4bd New Items. 
Source: http://forums.irowiki.org/showpost.php?p=1367852&postcount=651

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
 2013-12-12 23:37:39 +07:00
Cydh Ramdh
c2dc9e684c Follow up fba3ed9, tq Euphy 
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2013-12-12 23:19:22 +07:00
Cydh Ramdh
fba3ed9e3e * Added items from http://forums.irowiki.org/showpost.php?p=1360597&postcount=448 (Thank Lilith) 
* Added items from http://forums.irowiki.org/showpost.php?p=1367371&postcount=636 (Thank Lilith)
* Fixed some typos

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2013-12-11 23:10:01 +07:00
Cydh Ramdh
fca883b0ab Merge pull request #22 from nanakiwurtz/master 
More Items
 2013-12-10 17:49:13 -08:00
nanakiwurtz
518a038f49 fc37599 2013-12-11 01:45:29 +07:00
Cydh Ramdh
5beaa7ea09 Merge pull request #21 from exneval/master 
*Fix typo in vip_gemstone.
 2013-12-09 04:41:52 -08:00
exneval
6c41f74d1a *Fix typo in vip_gemstone. 2013-12-09 18:44:09 +07:00
lighta
8ce56465ad Update athena-start thx to <Talaysen> for reminding 
Fix log directory check/creation
Fix watch option
Add help command to know how to use the script and explain a bit
 2013-12-08 18:03:52 -05:00
Cydh Ramdh
3029d3bbc4 * Fxied Telekinesis Intense buff duration (thx Akuma) 
* Fixed Earth Strain divest chance (part of rebalancing formula)

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2013-12-08 16:27:28 +07:00
Cydh Ramdh
c88b77f5fd Fixed cell_basilica which gave nothing. Only works only for player 
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2013-12-08 14:21:16 +07:00
lighta
ea925a05b1 Update check-doc to allow only listing, (for IDE that require functions for markup langage) 
Add option for extra documentation file inc_scrtf and inc_atcf (for people who have their customs documented in other file, wich is probably best to avoid conflicts)
 2013-12-07 18:03:03 -05:00
Cydh Ramdh
7107cc7ce9 * Fixed succes rate of Dark Crow 
* Fixed damage rate bonus of Telekinesis Intense

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2013-12-07 14:28:37 +07:00
Cydh Ramdh
c54f35dad0 Just a little follow up of d3f6236 
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2013-12-07 03:20:28 +07:00
Cydh Ramdh
d3f623613e Merge pull request #19 from nanakiwurtz/master 
More new items. Related-post: http://rathena.org/board/topic/90115-item-db-help/
 2013-12-06 09:42:51 -08:00
nanakiwurtz
c8f3ddeb4d Removed extra space 2013-12-06 23:50:11 +07:00
nanakiwurtz
fc37599a25 More items. 
Source: http://forums.irowiki.org/showpost.php?p=1356728&postcount=365

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
 2013-12-06 23:15:13 +07:00
lighta
4f2c1d4eb3 Fix charban, align to Herc model, 
Add a timered function to refresh block data if you still on charselection waiting for unban (prevent deco reco for refresh)
Fix char_charlist_notify (0x9a0) counting page. The previous was quite an ugly estimate.
 2013-12-06 03:36:51 -05:00
Cydh Ramdh
edaddfd02d Rebellion update. Merged Hercules 19758ee 
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2013-12-06 13:01:55 +07:00
Cydh Ramdh
ffa4273475 Fixed bugreport http://rathena.org/board/tracker/issue-8311-latest-update-commit-broken/ (Just a little leftover) 
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2013-12-05 16:23:11 +07:00
Cydh Ramdh
02d44bf822 Update 'RequirementRemoved' field on 'skill_copyable_db.txt', following 'RequiredEquipment' field on skill_require_db.txt 
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2013-12-05 13:47:27 +07:00
nanakiwurtz
4de5b23e8d Reapplied Rekiem's SC effect for 11551-11554. 
Refference: https://github.com/rathena/rathena/commit/b307531

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
 2013-12-05 12:56:44 +07:00
lighta
82b272f410 QuickFix for charban 
Fixing charban causing segfault on charserv
Fixing charban wrong target
Fixing charban not able to ban unconnected char
Fixing charblock being sent before unban_time was filled
Reset unban_time to 0 when < now.
 2013-12-04 23:42:10 -05:00
Cydh Ramdh
77b2ff8df6 * Fixed bugreport http://rathena.org/board/tracker/issue-8309-map-server-crash/ 
* Fixed bugreport http://rathena.org/board/tracker/issue-8307-error-in-map-server-in-latest-update/

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2013-12-05 11:16:40 +07:00
nanakiwurtz
cd23da990a * Add new items. 
Source: http://forums.irowiki.org/showpost.php?p=1366277&postcount=624
* Added 'Accessory' as Item Type 5 in /doc/item_db.txt

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
 2013-12-05 02:30:11 +07:00
nanakiwurtz
3e2536b09d Add new items. 
Source: http://forums.irowiki.org/showpost.php?p=1360597&postcount=448

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
 2013-12-05 00:57:34 +07:00
nanakiwurtz
d60230f495 New items added. 
Source: http://forums.irowiki.org/showpost.php?p=1364909&postcount=585

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
 2013-12-05 00:25:25 +07:00
nanakiwurtz
526bdfa416 New items added. 
Source: http://forums.irowiki.org/showpost.php?p=1364909&postcount=585

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com> (reverted from commit de12054bdbc7ca2f24f3373ff0b4f57a05ad1564)
 2013-12-05 00:25:24 +07:00
Cahyadi Ramadhan Togihon
f18548aef7 * Follow up b307531, updating item_db_re.sql 
* Follow up 2524c69, compile problem on MSVS compiler

Signed-off-by: Cahyadi Ramadhan Togihon <house.bad@gmail.com>
 2013-12-05 00:25:24 +07:00
lighta
78a4782abb Fix item_combo who wasn't checking for different index in case of same item required for combo (e.g 2890:2890,{ bonus bAgi,10; }) 2013-12-05 00:25:24 +07:00