summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-10-16Merge pull request #1473 from Ridley8819/0hpHaru12-32/+38
Fix cases were player were executed
2016-10-16Fixes cases where player were executedRidley12-36/+42
On Aegis players set their HP to 0 by script are still alive. Since we don't want to copy this, scripts that set HP to 0 and expects the player to stay alive are changed. Additionally some scripts where changed where the HP were set to 1% instead to 1 HP and also the percentheal -100 with intended death set into close2. In megingard_seal.txt a end; was missing.
2016-10-16Constants Documentation SyncHercules.ws1-0/+8
Signed-off-by: HerculesWSAPI <dev@herc.ws>
2016-10-16ItemDB SQL SyncHercules.ws2-11/+11
Signed-off-by: HerculesWSAPI <dev@herc.ws>
2016-10-16Merge pull request #1472 from Asheraf/getcharidIbrahem Hossam79-361/+368
Change *getcharid to use constants
2016-10-16Change *getcharid to use constantsAsheraf79-361/+368
2016-10-14Merge pull request #1477 from HerculesWS/memmgr-hpm-fixesAndrei Karas18-1378/+7
Fixed a memory manager crash when a memory leak occurs in a plugin
2016-10-14HPM Hooks UpdateHaru14-1374/+0
Signed-off-by: Haru <haru@dotalux.com>
2016-10-14Fixed a memory manager crash when a memory leak occurs in a pluginHaru4-4/+7
- Plugins were accidentally using the core's memory manager instead of the HPM-safe wrappers. - As a side-effect of this, plugins shall not be able to hook into the iMalloc interface. - The issue was introduced in e7c2f7d827ad286dc826e483391e64b8ffe2720b Signed-off-by: Haru <haru@dotalux.com>
2016-10-08Merge pull request #1470 from 4144/fixpacketRidley1-1/+1
Fix packet id for clif_heal for packet version >= 20150513.
2016-10-08Fix packet id for clif_heal for packet version >= 20150513.Andrei Karas1-1/+1
2016-10-08Merge pull request #1463 from Ridley8819/gxquestDastgir1-0/+9
Add official quest condition for Guillotine Cross job change quest
2016-10-08Fixes wrong warp of izludeDastgir Pojee1-1/+6
2016-10-07ItemDB SQL SyncHercules.ws1-18/+18
Signed-off-by: HerculesWSAPI <dev@herc.ws>
2016-10-07Merge pull request #1465 from Asheraf/itemRidley1-75/+46
Fix wrong items bonus
2016-10-07Fix wrong items bonusAsheraf1-75/+46
-add white space after comma
2016-10-07Merge pull request #1464 from MishimaHaruna/variousfixesAndrei Karas21-41/+39
Build / CI improvements
2016-10-07Updated VECTOR_INIT() and VECTOR_ENSURE() to be more analyzer- (and ↵Haru1-7/+10
human-reader-) friendly Signed-off-by: Haru <haru@dotalux.com>
2016-10-07Fixed some issues detected by clang's static analyzer (Xcode 8/macOS Sierra)Haru7-21/+4
Signed-off-by: Haru <haru@dotalux.com>
2016-10-07Updated Xcode project to Xcode 8Haru10-10/+22
Signed-off-by: Haru <haru@dotalux.com>
2016-10-07Suppressed the superuser check in CI buildsHaru2-2/+2
- Speeds up GitLab builds by 1 minute Signed-off-by: Haru <haru@dotalux.com>
2016-10-07Improved Makefile change detectionHaru1-1/+1
- The build system's change detection is now more reliable when a new Makefile.in is added Signed-off-by: Haru <haru@dotalux.com>
2016-10-07Add official quest condition for Guillotine Cross job change questRidley1-0/+9
original commit https://github.com/rathena/rathena/commit/25c4334e8406b21a74ecbc313205ea42e9b2df50 by secretdataz
2016-10-05Merge pull request #1459 CRI should only be calculated if flag have SCB_CRIRidley1-4/+6
CRI should only be calculated if flag have SCB_CRI.
2016-10-05CRI should only be calculated if flag have SCB_CRI.Dastgir Pojee1-4/+6
Fixes #1442
2016-10-05Constants Documentation SyncHercules.ws1-0/+1
Signed-off-by: HerculesWSAPI <dev@herc.ws>
2016-10-05ItemDB SQL SyncHercules.ws1-0/+1
Signed-off-by: HerculesWSAPI <dev@herc.ws>
2016-10-05Merge pull request #1460 from AtlantisRO/Para_Team_Mark_Ridley15-30/+68
Added support to Para_Team_Mark_ item in Eden Group
2016-10-04Added support to Para_Team_Mark_ item in Eden Group.AtlantisRO15-30/+68
2016-10-04Merge pull request #1452 from 4144/commonchecksHaru14-105/+307
Add missing checks in common directory
2016-10-04Fix warning in strlib.cAndrei Karas1-0/+1
2016-10-04Add missing checks into utils.cAndrei Karas1-6/+23
2016-10-04Add missing checks into sysinfo.cAndrei Karas1-26/+58
2016-10-04Add missing checks into sql.cAndrei Karas1-5/+15
2016-10-04Add missing checks into socket.cAndrei Karas1-9/+22
2016-10-04Add missing checks into mutex.cAndrei Karas1-0/+12
2016-10-04Add missing checks into mapindex.cAndrei Karas1-10/+25
2016-10-04Add missing checks into grfio.cAndrei Karas1-3/+21
2016-10-04Add missing checks into ers.cAndrei Karas1-5/+11
2016-10-04Add missing checks into des.cAndrei Karas1-0/+7
2016-10-04Add missing checks into db.cAndrei Karas1-10/+15
2016-10-04Add missing checks into core.cAndrei Karas1-9/+30
2016-10-04Add missing checks into console.cAndrei Karas1-11/+32
2016-10-04Add missing checks into HPM.cAndrei Karas1-11/+35
2016-10-03ItemDB SQL SyncHercules.ws3-7/+7
Signed-off-by: HerculesWSAPI <dev@herc.ws>
2016-10-03followup 805a2b3bRidley1-13/+15
added missing end; and parantheses
2016-10-03Merge pull request #1437 from Asheraf/itemsDastgir1-16/+26
Fix some item bonus using wrong SkillNames
2016-10-03Merge pull request #1451 from gdesatrigraha/fix_item_dbDastgir1-1/+1
use mediumint for equip_locations in db2sql
2016-10-03Initial dimensional gap commit (#1431)Ridley6-2/+639
* Initial Dimensional Gap NPC's
2016-10-03use mediumint for equip_locationsGde Mahardhikha Satrigraha1-1/+1