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

13225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cydh Ramdh
5d5aa78b56 Merge pull request #710 from rathena/hotfix/followup-214ff17c 
Follow up 214ff17c1955aaaab34c88faea0dedb97600660e, fixed errors and warnings in MSVS
 2015-10-22 08:55:29 +07:00
Cydh Ramdh
055f6d86a2 Follow up 214ff17c1955aaaab34c88faea0dedb97600660e, fixed errors and warnings in MSVS 
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2015-10-21 20:29:46 +07:00
lighta
214ff17c19 Replace macro max and min, by some inline functions : 
-To avoid having long operation repeated twice, peoples shouldn'tuse long operation into does macro but they do so...
-To avoid double increment or thing like such.
-Yes this involve some implicite cast sometime, but that still better then redo 10 dereference...
 2015-10-21 04:12:01 -04:00
lighta
b480cb3d47 Valkyrie example 
Move valkyrie sample config into conf/
Change path for relative path so that it could be applied for all.
tested with : 'valkyrie -f valkyrie_sample.cfg'
Change include in common, true that complicate move for those file but
will facilitate the parsing for some ide.
 2015-10-21 01:59:32 -04:00
Nova
edafd267d8 Merge pull request #661 from RagnarokNova/patch-7 
Magma Eruption Status Effects
 2015-10-20 11:27:35 -07:00
Lemongrass3110
5a49b70ba4 Fixed an issue where the memory leak log name was null on Windows. 2015-10-20 20:25:15 +02:00
Cydh Ramdh
030c4c58c1 Fixed #698, it's if. The check as option not as priority. 
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2015-10-20 19:54:36 +07:00
Nova
fd5e796487 Updated IG_Advanced_Weapons_Box (Used http://www.divine-pride.net/database/item/12623/high-weapon-box and Hercules as reference) 2015-10-20 00:14:34 -07:00
aleos89
66fbcfe49c Follow up to ce7aacb 
* Fixed some compile errors/warnings reported in Travis.
 2015-10-19 14:43:48 -04:00
aleos89
ce7aacb9a4 Base Status Stats Fix 
* Fixes #562 - Fixes Crystallization not taking base VIT into account correctly.
* Confirmed on Aegis that Base Status Stats are NOT affected by job, skill, or item bonuses. These bonuses are stored in Battle Status.
 2015-10-19 14:28:06 -04:00
nanakiwurtz
b758f39882 Follow up to 8952412d 
* Added additional item script for 5967 + 4163 combo set (Thanks to @Lemongrass3110)

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
 2015-10-19 15:39:31 +07:00
nanakiwurtz
b6187aa9b3 Fixed #695 
* Thanks to @ernestfegarido

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
 2015-10-18 22:25:52 +07:00
nanakiwurtz
8952412d07 Follow up to 587da10 
Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
 2015-10-18 22:00:46 +07:00
Cydh Ramdh
587da1048d Item DB Update 
* Added items, packages, and combos from idRO patch 2015-10-07 and 2015-10-15.
* There are some WoE TE items. (just bad, we don't have WoE TE implemented yet)

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2015-10-18 16:38:08 +07:00
Cydh Ramdh
573c7dc3c5 * Fixed #694, Skill cooldown bonus overflow in short variable. Thank @julia40124009 
* Fixed #691, Glass_Of_Illusion (14538) gave wrong value. Thank @admkakaroto

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2015-10-18 09:43:26 +07:00
nanakiwurtz
e0b24fc670 Fixed #683 
* Thanks to @Badarosk0

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
 2015-10-15 03:23:24 +07:00
Cydh Ramdh
de40271000 * Follow up 2cee5b6ff1bf53c4ae53bc1278b09ae84b8a0a76: gethominfo, getpetinfo, and getmercinfo for type 0 were correct 'to get ID' from database/their unique ID, not as GID. 
* Added type for `gethominfo`, `getpetinfo`, and `getmercinfo` to return GID.
* Added `geteleminfo`, to retrieve Elemental ID and GID. The otherinfo can be gained from `getunitdata`

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2015-10-14 10:27:31 +07:00
Cydh Ramdh
415aeabdb1 Added safe check for quest's packet length. 
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2015-10-13 07:21:36 +07:00
Cydh Ramdh
80b88b9067 Fixed #673, fixed map-crash by TK_COUNTER. Thank @lordganja 
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2015-10-12 19:59:12 +07:00
Lemongrass3110
a2d8b817ca Fixed Quest DB for > 65535 
Fixes #675
 2015-10-12 13:12:11 +02:00
Cydh Ramdh
34c19edf77 Fixed #667, Arms Cannon didn't give splash damage after d95f5d2db75c10435421fe396dc86e7be9654be5. Thank @Fraterna 
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2015-10-11 22:08:07 +07:00
Cydh Ramdh
8c8c486b84 Fixed #665, Fxied SG Warm skills had chance to crash server. Thank @anacondaqq 
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2015-10-11 21:13:32 +07:00
Cydh Ramdh
857b82d6ee Fixed #635, thank @julia40124009. 
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2015-10-11 20:50:45 +07:00
Lemongrass3110
79ef03e656 Merge pull request #669 from rathena/hotfix/questlog-2014 
Fixed questlog display for clients from 2014-10-22 on
 2015-10-11 14:06:36 +02:00
Cydh Ramdh
927d1e2f5c * Fixed #629. Thank @anacondaqq and @theultramage 
* Added optional param `char_id` for `instance_enter`.

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2015-10-10 19:04:15 +07:00
Cydh Ramdh
1210bca097 Moved hardcoded timestamp format for log files to conf/log_athena.conf::log_timestamp_format 
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2015-10-10 11:38:00 +07:00
aleos89
cef2f9ea63 Bug Fixes 
* Fixes #629 - Removed an extra costume check during action requests.
* Fixes #632 - Fixed long broadcast messages getting truncated.
* Fixes #635 - Fixed Elementals getting removed twice from a map during map_quit().
* Fixes #639 - Adjusted two checks from status_get_sc_def() so that tick_def2 is properly adjusted when pc_sc_def_rate is adjusted in battle config.
* Fixes #645 - Fixed atcommand 'iteminfo' displaying items not dropping from any monsters when battle flag 'mobinfo_type' is active.
* Fixes #652 - Don't call clif_scriptclose() on script command 'close' and script command 'end' when an NPC shop is active.
* Fixes #670 - Resolved a possible map crash when using the Lux Anima Runestone.
 2015-10-09 18:22:35 -04:00
Lemongrass3110
982d6c1f87 Fixed a warning 
(unused variable i)
 2015-10-09 17:25:49 +02:00
Lemongrass3110
f110657034 Minor cleanup 2015-10-09 17:19:15 +02:00
Lemongrass3110
45e50a3d24 Fixed questlog display for clients from 2014-10-22 on 2015-10-09 00:24:25 +02:00
Cydh Ramdh
fd7d6c31fd Follow up 99783689, typos. Thank @WhySoSexyMate 
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2015-10-08 15:41:33 +07:00
Vennren
ea1ffb578a Update upgrade_20150619.sql 
Fixed 'db_roulette' table in relation to Error Code: 1064.
 2015-10-08 05:10:51 +02:00
Vennren
0da96457e7 Update main.sql 
Fixed 'db_roulette' table in relation to Error Code: 1064.
 2015-10-08 05:09:46 +02:00
Lemongrass3110
bba5e4f425 Added compile time checks whether to enable or disable pincode system code 2015-10-07 20:57:37 +02:00
Lemongrass3110
c1623fd5dc Added an unsupported enum value for documentation reasons 2015-10-07 20:20:29 +02:00
Cydh Ramdh
81662aacee Updated doc/script_commands.txt, as follow up 6295c77d393555fe5a366f092a75f4cf0d2de933. 
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2015-10-07 07:02:14 +07:00
Lemongrass3110
10c2dc10dc Pincode Functionality Extension 
Added some options to allow or disallow certain combinations in the pincode as aegis has it.
In AEGIS it is not allowed to use pincodes like 0000 or 1111 where the pincode only contains 1 character. It is also not allowed to use sequences like 1234 or 5678.

In addition to the official check, which only disallows ascending sequences I also added descending ones.
 2015-10-07 00:15:11 +02:00
nanakiwurtz
64d2463e25 Fixed #664 
* Thanks to @ernestfegarido

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
 2015-10-04 17:17:20 +07:00
nanakiwurtz
4463d96b00 Follow up to 640a0c55 
Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
 2015-10-04 04:34:53 +07:00
nanakiwurtz
640a0c5541 Item Package Update 
* Changed AegisName -> ItemID

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
 2015-10-04 04:05:18 +07:00
Cydh Ramdh
c9c988abba * Fixed #654, TF_BACKSLIDE failed if player has 'no knock back' bonus. 
* Clean up on buildin scripts, to use constant in return value.

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2015-10-03 22:29:46 +07:00
Lemongrass3110
a597e7bd34 Some more pointer casts and enum fixes. 2015-10-03 01:46:47 +02:00
Lemongrass3110
a760e01c59 Follow up to 78b6c15 
Fixed a possible buffer overflow in mapindex.c
 2015-10-02 20:31:07 +02:00
Lemongrass3110
78b6c150d2 Added usage of enum values in script.c in some places. 2015-10-02 15:09:01 +02:00
Nova
7bc7b7e449 Magna Eruption Status Effects 
This line makes the status effects actually apply. (Burning and Stun)
 2015-10-01 09:28:36 -07:00
Atemo
1b303d32ab Fixed issue #648 2015-09-27 20:36:28 +02:00
Cydh Ramdh
e112fc1c50 Fixed #647. Fail to get parameter value from readparam if the parameter given is constant as param-type value. So for an example, readparam(BaseLevel) will be fine now, the result same as like BaseLevel itself. 
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2015-09-27 21:44:54 +07:00
nanakiwurtz
9f126d2d73 Item DB Update 
* Added Moving Dark Matter (6940)
* Add 2 spaces to script_commands.txt

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
 2015-09-27 05:09:02 +07:00
Cydh Ramdh
725903e3ce Fixed a typo 
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2015-09-26 11:18:07 +07:00
Cydh Ramdh
fe9b430ace Follow up 039e1b65a3cae96d80b220f078814cac72846737, removed extra 0 
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
 2015-09-26 06:19:35 +07:00