Commit Graph

  • 92b253e648 Merge branch 'rathena' into skillupd muh 2022-12-02 06:52:54 +00:00
  • c9b7c65164
    Merge a808526fdd17642c005e6964c99aea5e91c8eabf into 5549ad2ac272157d47f223806b8bbc16f5d70d4a Aleos 2022-12-02 06:00:41 +00:00
  • 2c056b9438 Fixes #7363 violent01 2022-12-01 06:18:13 +03:00
  • c88afa1c7a Added replay version of buff NPC by @eppc0330 Lemongrass3110 2022-12-01 00:34:46 +01:00
  • 2857e51abd Cleanup of NPC logic Lemongrass3110 2022-12-01 00:28:38 +01:00
  • 0da07fff32 Translation of the replay Lemongrass3110 2022-12-01 00:17:02 +01:00
  • aaa6db65d5 Replay version by @eppc0330 Lemongrass3110 2022-11-30 23:54:35 +01:00
  • cc76262081 Fixed client getting out of sync Lemongrass3110 2022-11-30 23:42:13 +01:00
  • 34d0746df6 Fixed some circles during loading Lemongrass3110 2022-11-30 23:41:52 +01:00
  • 0e4bc36d6b No points for autotraders! Lemongrass3110 2022-11-30 23:02:41 +01:00
  • 45c799acc9 Added client maximum seconds constant Lemongrass3110 2022-11-30 23:01:07 +01:00
  • 3353de0e8f Fixed accumulated seconds calculation Lemongrass3110 2022-11-30 23:00:32 +01:00
  • b97987e4e7 Changed gold points to parameters Lemongrass3110 2022-11-30 22:48:40 +01:00
  • c28886ee0e Overwrite real invalid timer ids Lemongrass3110 2022-11-30 22:47:35 +01:00
  • 39367c75f5 Merge branch 'master' into hotfix/issue6912 Lemongrass3110 2022-11-30 22:17:09 +01:00
  • 5549ad2ac2
    Update agit_start_se.txt (#7448) rosald 2022-12-01 05:07:43 +08:00
  • 890b5a5806
    Update inter_athena.conf emmamarshall451 2022-11-30 18:43:04 +08:00
  • c9f23e691a
    Follow up to 4e638838de1c99abbcc289d7679580cacb502b18 (#7468) Jittapan Pluemsumran 2022-11-30 15:11:25 +07:00
  • 8d5ae39647 Follow up to 4e638838de1c99abbcc289d7679580cacb502b18 Jittapan Pluemsumran 2022-11-30 14:06:14 +07:00
  • bbe1a960f9
    Update inter_athena.conf emmamarshall451 2022-11-30 12:04:18 +08:00
  • dd2e8a1371
    Corrections from code review idk-whoami 2022-11-29 23:40:27 +07:00
  • 2b4e070827
    Corrections from code review idk-whoami 2022-11-29 23:17:23 +07:00
  • 795414de4f
    Removed duplicates list of menu items (#7459) idk-whoami 2022-11-29 20:24:24 +07:00
  • 610b4c1984 Update EDP require 1 list item cost from item_group_db idk-whoami 2022-11-29 18:20:30 +07:00
  • 4e638838de
    Corrected server response when adding an item to a trade session fails. (#7462) Jittapan Pluemsumran 2022-11-29 13:24:34 +07:00
  • 3711789a62 Corrected the case of adding an item with amount = 0 Jittapan 2022-11-29 12:28:01 +07:00
  • 8e598739ef
    Apply suggestions from code review Lemongrass3110 2022-11-28 23:54:25 +01:00
  • 4d7fcf73cc
    Merge branch 'master' into feature/macro_additions Aleos 2022-11-28 14:02:49 -05:00
  • a6850f6ea7 Apply suggestions from code review feature/kachua Atemo 2022-11-28 16:53:49 +01:00
  • a2e5b63ad2 Removed IG_KACHUA_SECRET_BOX Atemo 2022-11-28 16:15:41 +01:00
  • 73e06f9abf Version upgrade Atemo 2022-11-25 18:34:59 +01:00
  • b020565565 Box content for november Atemo 2022-11-25 16:40:56 +01:00
  • 522e2ecd85 Apply suggestions from code review Atemo 2022-11-25 14:53:26 +01:00
  • 4ae18c2353 Changed format arg type Jittapan 2022-11-12 14:00:51 +07:00
  • 180913d448 Bumped db version Jittapan 2022-11-12 12:12:57 +07:00
  • c8ff9c19f3 Update npc/re/other/kachua_key.txt Jittapan Pluemsumran 2022-11-12 08:38:23 +07:00
  • e76ef51793 Apply suggestions from code review Jittapan Pluemsumran 2022-11-08 23:47:57 +07:00
  • c069b2d0f1 Allow announcing different item than last used item Jittapan 2022-11-12 09:15:18 +07:00
  • 3bb23e4671 Implemented Kachua's Secret Box NPC Jittapan 2022-11-08 01:15:29 +07:00
  • b1ba989104 More clean ups as requested in code review Jittapan Pluemsumran 2022-11-28 21:06:51 +07:00
  • becc19fbd4 Corrected server response when adding an item to a trade session fails. Jittapan 2022-11-28 18:06:29 +07:00
  • 20a772cd30 Merge branch 'master' into feature/adventure_agency Lemongrass3110 2022-11-27 23:57:44 +01:00
  • 4661016445
    Generate Reputation UI bson files (#7340) Vincent Stumpf 2022-11-27 00:53:54 -08:00
  • ba1cbd6104 update documentation Vincent Stumpf 2022-11-26 14:11:53 -08:00
  • 20e72a45b5 Add support for ReputeGroupInfo.bson Vincent Stumpf 2022-11-26 14:07:06 -08:00
  • 4a2f2ba7ab Generate Reputation UI bson file Vincent Stumpf 2022-10-08 22:11:13 -07:00
  • 92778c3894 More Fixes Pokye 2022-11-26 11:19:22 -03:00
  • bc4934373d
    Implemented itemmoveinfov5.txt generator (#7457) Jittapan Pluemsumran 2022-11-26 17:33:27 +07:00
  • c2dbaa94bc
    Removed duplicates list of menu items idk-whoami 2022-11-26 15:51:12 +07:00
  • 52eb19e62e Follow up to 75a1924 Jittapan Pluemsumran 2022-11-26 11:53:44 +07:00
  • 75a1924c48 Attempt to resolve LGTM alert Jittapan Pluemsumran 2022-11-26 10:58:46 +07:00
  • c54a7fccf1 Removed duplicate group Atemo 2022-11-25 19:51:08 +01:00
  • 2d94f3f360 Merge branch 'master' into feature/cashmall Atemo 2022-11-25 19:34:34 +01:00
  • 3c1eed02dc Don't initialize iterator as ref Jittapan Pluemsumran 2022-11-25 22:58:43 +07:00
  • 00c3cc7ab2
    Merge branch 'master' into update_items Pokye 2022-11-25 11:22:30 -03:00
  • d627d88854 Fix Pokye 2022-11-25 11:13:39 -03:00
  • df4b03e08c More Fixes Pokye 2022-11-25 10:57:44 -03:00
  • 1f8147ec72 Implemented itemmoveinfov5.txt generator Jittapan Pluemsumran 2022-11-25 14:51:19 +07:00
  • 08c85479d9
    Merge branch 'master' into Update-Warper-npc idk-whoami 2022-11-25 11:19:19 +07:00
  • 9398f698fc
    Added missing etcs and equips items up to 22 11 2022 (#7453) Atemo 2022-11-24 18:35:21 +01:00
  • 828d95c81e
    Merge branch 'rathena:master' into update_items Pokye 2022-11-24 10:25:50 -03:00
  • d8796db227 Correction of th Aegis Name of Meyer Lugenburg Card Atemo 2022-11-24 00:04:52 +01:00
  • c7b67c0ded Added missing etc and equip items up to 22 11 2022 Atemo 2022-11-23 00:22:46 +01:00
  • 4353ec3fec
    Added missing items usable/cash (#7456) Atemo 2022-11-24 13:58:26 +01:00
  • 0d46b007e9 Correction from 9fd5cf7f68 ("manual" changes) Atemo 2022-11-23 23:14:00 +01:00
  • 3754485f06 Removed duplicate groups Atemo 2022-11-23 21:18:46 +01:00
  • 5ed358ac12 Removed IDs commented (debug) Atemo 2022-11-23 21:13:35 +01:00
  • 9fd5cf7f68 Added missing items Atemo 2022-11-23 21:07:33 +01:00
  • b4ac660ac6 Commented items with rate 0 for subgroup > 0 Atemo 2022-11-23 16:28:14 +01:00
  • bfc775ea0c Corrected some aegis item name Atemo 2022-11-23 16:22:38 +01:00
  • f5c943ed25 Corrected some aegis name Atemo 2022-11-23 16:01:55 +01:00
  • d460c34ff4 Added several usable (container) and cash items Atemo 2022-11-23 12:34:34 +01:00
  • eda5341064
    Merge branch 'master' into only_constants Vincent Stumpf 2022-11-22 14:15:37 -08:00
  • cad9ce5374 And More Fixes Pokye 2022-11-22 17:41:17 -03:00
  • 8c0962dead More Items Pokye 2022-11-22 07:11:06 -03:00
  • ec3805d441
    Apply suggestions from code review Lemongrass3110 2022-11-21 21:48:56 +01:00
  • 90553b854f More Fix Pokye 2022-11-21 16:38:23 -03:00
  • fa2c30c314 Added some more commented items for CachuaCoupon06 barter Lemongrass3110 2022-11-21 19:23:24 +01:00
  • 0715b629b1 Renamed S_Magic_Fishing_Insect_Net_Armor to S_M_FishInsect_Armor Lemongrass3110 2022-11-21 19:08:03 +01:00
  • a27455f931 Renamed S_Magic_Scissor_Hunting_Armor to S_M_SciHunting_Armor Lemongrass3110 2022-11-21 19:07:10 +01:00
  • dea0e66801 Renamed S_Magic_Vibration_Dragon_Killer_Armor to S_M_DragonVib_Armor Lemongrass3110 2022-11-21 19:06:16 +01:00
  • afa550497d Renamed S_M_ExoCorrupt_Armor to S_Magic_Exorcist_Corrupted_Armor Lemongrass3110 2022-11-21 19:05:29 +01:00
  • 8f18f49641 Renamed S_Magic_Executioner_Holy_Water_Armor to S_M_ExeHoly_Armor Lemongrass3110 2022-11-21 19:04:25 +01:00
  • d732313ec1 Renamed S_Fishing_Insect_Net_Armor to S_FishInsect_Armor Lemongrass3110 2022-11-21 19:03:06 +01:00
  • 6daa0bcc33 Renamed S_Scissor_Hunting_Armor to S_SciHunting_Armor Lemongrass3110 2022-11-21 19:02:03 +01:00
  • 11c5a288b3 Renamed S_Vibration_Dragon_Killer_Armor to S_DragonVib_Armor Lemongrass3110 2022-11-21 19:00:44 +01:00
  • 93ec6f8cbd Renamed S_Exorcist_Corrupted_Armor to S_ExoCorrupt_Armor Lemongrass3110 2022-11-21 18:59:18 +01:00
  • cc3d7592b9 Renamed S_Executioner_Holy_Water_Armor to S_ExeHoly_Armor Lemongrass3110 2022-11-21 18:57:30 +01:00
  • f343a18f28 Added items for CachuaCoupon05 barter Lemongrass3110 2022-11-21 18:56:08 +01:00
  • f4629b2f6e Added items for CachuaCoupon04 barter Lemongrass3110 2022-11-21 18:34:39 +01:00
  • 696ff51b63 Added items for CachuaCoupon03 barter Lemongrass3110 2022-11-21 17:47:38 +01:00
  • 53fc1997bb More Items Pokye 2022-11-21 13:06:43 -03:00
  • 35d09d84e2 Added items for CachuaCoupon02 barter Lemongrass3110 2022-11-21 16:53:49 +01:00
  • 0800f0466e Fix Pokye 2022-11-21 09:15:36 -03:00
  • a1d25d09be Added and Updated Missing Items Pokye 2022-11-21 09:03:05 -03:00
  • 46d8357f49 Added items for CachuaCoupon01 barter Lemongrass3110 2022-11-21 10:45:50 +01:00
  • 3a7cf6bc05 Initial version of cashmall Lemongrass3110 2022-11-21 01:07:24 +01:00
  • 70b54081da Merge branch 'master' into hotfix/issue6912 Lemongrass3110 2022-11-20 19:10:31 +01:00
  • 4f98d0198f Always stop the timer on logout Lemongrass3110 2022-11-20 18:53:44 +01:00
  • 654c85e718 Fixed gaps in random options Lemongrass3110 2022-11-20 17:32:43 +01:00