13039 Commits

Author SHA1 Message Date
Napster
0c9bd301d8 Follow up to 8b3b32e
* Revert code, found problem with npcshopattach
2015-12-07 12:47:38 +07:00
Lemongrass3110
5fc3cbf5b0 Merge pull request #789 from Baalberith6/clif_quest_info2
Fixing quest objectives being shown by client incorrectly on monster kill.
2015-12-06 14:01:40 +01:00
Cydh Ramdh
f5beee1744 Follow up 36d85277b4f048f8baa57e88e9dc1effd644d993, Thank @dastgir.
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-12-06 12:40:56 +07:00
Cydh Ramdh
36d85277b4 * Cleanup redundant usage of getarg() in scripts
* `npc:enchan_mal.txt`

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
2015-12-06 12:03:12 +07:00
Napster
8b3b32e000 Fixed #503
* when use the callshop, then player can't move in the game. thank to @CairoLee
2015-12-06 01:01:07 +07:00
aleos89
0212d44bb4 Fixes #809
* Reverted 42b7ba9 and cef2f9e NPC shop ID checks.
2015-12-05 10:08:18 -05:00
aleos89
4b7301ac89 Follow up to c7ede8d
* Adjusted the check for hidden targets for Earth Shaker.
2015-12-04 17:00:05 -05:00
aleos89
c7ede8ddbd Fixes #563
* Updated various detection skills pulling out hidden targets.
2015-12-04 16:24:54 -05:00
aleos89
8f4660b774 Fixes #524
* Spore Explosion will now properly give damage to targets.
2015-12-04 16:10:13 -05:00
aleos89
feb885cb37 Fixes #797
* Elemental Control will no longer be removed on map change/Teleport.
2015-12-04 15:53:37 -05:00
aleos89
42b7ba9d63 Fixes #790
* Fixes the close button not displaying after canceling a shop transaction.
2015-12-04 15:15:33 -05:00
icxbb-xx
92d617bbb0 Fixed #807
* Add missing packets version check, @thank you to @cold-hr
2015-12-04 20:29:41 +07:00
aleos89
523cb145f5 Follow up to a7b8fd4
* Resolves a check for skills that have required equipment items to check for all items in the list.
* Fixes #782 - Removed renewal items from pre-renewal skill requirements for 3rd classes.
2015-12-03 11:20:12 -05:00
Atemo
1f47604f57 Fixed issue #800 2015-12-02 21:31:11 +01:00
icxbb-xx
1f1160300b Follow up to d2d1fd2
* Add missing packets other
* Fixed #785, Big HP Bar show only MVP (this not sure, needs official info)

note: BIG HP Bar for MVP, Now not update status hp
2015-12-02 21:33:46 +07:00
Atemo
01e041874c Fixed some typo 2015-12-02 01:54:07 +01:00
Atemo
2b5332a3b1 Merge pull request #795 from rathena/academie
Academie
2015-12-02 01:22:45 +01:00
Atemo
24ecdadf48 Merge branch 'master' into academie 2015-12-02 00:40:42 +01:00
Atemo
1a5b5f6057 Typo 2015-12-02 00:21:40 +01:00
Atemo
564f4f8100 Partial revert of 65b6861e84d29a8226680312ca4639bd15373bed
Created Small_cleanup branch to merge the mapcache clean up later, after debug.
2015-12-02 00:07:36 +01:00
aleos89
0ffeec075b Disabled rAthena Stat Reporter by default
* Fixes #793
2015-12-01 10:30:18 -05:00
nanakiwurtz
9dafcee30d Item Package Update
* Fixed 0 drop on IG_Lucky_Scroll08 and IG_Adventurer_Returns_Support_Box (Since commit 51074a06 on 2013-12-23)

Signed-off-by: nanakiwurtz <nanakiwurtz240@gmail.com>
2015-12-01 00:01:40 +07:00
Atemo
5695dc57e2 Update & fix.
- Updated script_commands.txt
- Fixed typo in bio4_reward.txt
- Fixed getexp command giving 1 exp with 0 value
2015-11-29 16:57:04 +01:00
Atemo
c3125026d2 Merge branch 'master' into academie 2015-11-29 16:03:09 +01:00
Atemo
3e7b90d8cb Coquille 2015-11-29 16:00:17 +01:00
Lemongrass3110
86d6113801 VS 2015 support(commit 4/4)
Fixed all compiler warnings for the default settings(defines). There might be a lot with different packetversions or other setings. Feel free to create a issue on github if you find any.
2015-11-29 14:23:21 +01:00
Lemongrass3110
c68680ab6b VS 2015 support(commit 3/4)
Updated gitignore for VS 2015.
2015-11-29 14:19:39 +01:00
Lemongrass3110
a2270aad71 VS 2015 support(commit 2/4)
Changed the compiler to VC14 and made it compileable.
2015-11-29 14:18:42 +01:00
Lemongrass3110
1d60228469 VS 2015 support(commit 1/4)
Copied the VS -13 files and renamed them to -14.
2015-11-29 14:17:15 +01:00
marha
6f5f53dae6 Fixing quest objectives being shown by client incorrectly on monster kill. Client only shows the first monster received, but we want to show the killed monster. 2015-11-29 13:07:36 +01:00
Lemongrass3110
1f26ad5599 Follow up to 644341a
NPC is now getting loaded on renewal.
2015-11-29 12:37:47 +01:00
Lemongrass3110
644341a0d1 Merge pull request #775 from rathena/Bio4Reward
Moved the NPCs from WolfchevLaboratory.txt (Issue #774)
2015-11-29 12:35:02 +01:00
Cydh Ramdh
002f321b27 Merge pull request #776 from Baalberith6/master
Fixing VIP rates to add configured rate.
2015-11-29 10:12:05 +07:00
icxbb-xx
c7d73711fd Fixed#780
* Fixed compile warning
* Add missing Packets version check
Thank you to @hnomkeng
2015-11-27 22:07:46 +07:00
icxbb-xx
25cb15161f Follow up to d2d1fd2
* Fixed Map server crash,add check packets version for 2013-08-07
2015-11-27 16:26:10 +07:00
Atemo
c3e56b9c1b Update 2015-11-26 23:11:22 +01:00
nsbuild
fe30f2cde8 Revert Fixing HP/SP tables for 3rd levels 150-175 according to Hercules tables and irocalc.
This reverts commit 5e28e5a45dc1ff71b6561b31f587be421fe343f7.
2015-11-26 00:15:55 -08:00
marha
5e28e5a45d Fixing HP/SP tables for 3rd levels 150-175 according to Hercules tables and irocalc.
Also fixing calculation of base hp/sp based on the tables - they were not used at all..
2015-11-25 22:16:47 +01:00
icxbb-xx
dce7328060 Merge branch 'master' of https://github.com/rathena/rathena 2015-11-25 22:11:39 +07:00
icxbb-xx
54136ddfca Follow up to ec9c2b2
* hp display 50% by client, for novice class when dead
2015-11-25 22:07:08 +07:00
icxbb-xx
ec9c2b21c8 Follow up to 8ca20d1
* Revert code this wrong
2015-11-25 17:20:06 +07:00
icxbb-xx
8ca20d184f Follow up to 85971d6
* Fixed#758 : hp display by client, for novice class when dead
thank you to @kyeme
2015-11-25 16:44:53 +07:00
Atemo
7fcd0f5b9d Clean up 2015-11-24 23:22:42 +01:00
marha
f1bb9743dc Fixing VIP rates to add configured rate. 2015-11-24 21:23:38 +01:00
Atemo
d46cf4b35e Corrected Tutorial Instructor dialog 2015-11-24 19:34:08 +01:00
Atemo
219c0349fc Merge pull request #757 from rathena/sql_reorg
Update of pull #572

Organized the table creation statements by alphabetical order.
Added some redundancy to some SQL statements.
Split the default data for db_roulette from main.sql
2015-11-24 18:27:40 +01:00
Atemo
4f3f483bfa Remove setquestinfo_req state 3 unused in aegis (currently commented) 2015-11-24 18:12:52 +01:00
Atemo
9b13351817 Merge branch 'master' into academie 2015-11-24 18:01:09 +01:00
Atemo
501751df39 - corrected getequipid warning when nothing equipped
- getstatus should push -1 for infinite timer
2015-11-24 17:23:35 +01:00
Atemo
88e522060a Moved the NPCs from WolfchevLaboratory.txt (Issue #774) 2015-11-24 17:12:25 +01:00