Commit Graph

  • ea9079f2f3 Merge branch 'master' into cleanup/emotions aleos 2017-11-10 09:41:47 -05:00
  • 24f4642013 Follow-up 12ad24c28c * Reverted ET_KIK -> ET_KEK change * Corrected emotion character game ID * Reverted some emotion NPC target (for duplicates NPCs) * Fixed incorrect variable in quests_brasilis.txt (thanks to @Lemongrass3110 !) Atemo 2017-11-09 21:39:40 +01:00
  • 1f7a314c78 Fixed twice assigned values (#2560) Roman Kalashnikov 2017-11-09 22:50:11 +03:00
  • 12ad24c28c Follow up to c40c4d0 * Updated some remaining NPC. aleos 2017-11-08 22:10:23 -05:00
  • c40c4d0688 Adjusted script command emotion * Now accepts the game ID rather than the object name. * Removed the UNITTYPE_* parameter. * Deprecated script command unitemote. * Updated all NPC to reflect this new format. * Fixed all ET_KIK -> ET_KEK. aleos 2017-11-08 22:02:00 -05:00
  • 825e98f714 Suggestions from @lighta Jey 2017-11-09 02:51:59 +01:00
  • 265028926d Follow up to 964690e0a57713188a04356d2c3c9ce8103365d3 Jey 2017-11-09 02:26:32 +01:00
  • 964690e0a5 Follow up to 4fa184fc59de8c4f28d61743d797a0cca1fe45ad Jey 2017-11-09 02:06:45 +01:00
  • 4fa184fc59 Refactors hotfix implementation to fully use C++ Jey 2017-11-09 02:02:59 +01:00
  • 63daab5860
    Added battle config autoloot_adjust (#2562) Aleos 2017-11-08 18:55:20 -05:00
  • 86241b0eb8
    Adjusted item drop minimum value limit (#2561) Aleos 2017-11-08 18:44:32 -05:00
  • c4b090d2c9 Follow up to 2d984ed Jey 2017-11-08 23:29:37 +01:00
  • 6cc75a6870 Merge branch 'master' into hotfix/issue2360 Jey 2017-11-08 23:08:41 +01:00
  • c13f271a94 Resolved some compile warnings * Fixes #2588. * Clean up from 24b3509. Thanks to @darhlism! aleos89 2017-11-08 13:36:01 -05:00
  • a587b913fa Initial work for login server to C++ (#2583) lighta 2017-11-08 13:56:41 -04:00
  • 25c8b7d7aa Small revert * Reverted the account query for the time being. aleos89 2017-11-08 10:41:40 -05:00
  • 6a32645c76 Replaced the last emotions numbers to constants. * Corrected the encodage for cutin as well in quests_moscovia Atemo 2017-11-07 20:02:07 +01:00
  • 2fca04d7da Resolved a possible memory leak * When an invalid skill ID is given to a monster, the allocated skill object was not being freed. Thanks to @Tokeiburu! aleos89 2017-11-07 12:56:53 -05:00
  • 15a8747a8c Resolved two Windows compile warnings aleos89 2017-11-07 12:42:33 -05:00
  • 5cc06a5133 Updated Heal formulas to match kRO * Fixes #2575 and fixes #2574. * Adjusted the formula to properly account for bonuses which are additive of one another, not multiplicative. * Added the global multiplier which is added on after MATK. * Updated Highness Heal, Fresh Shrimp, and Bunch of Shrimp heal formulas. Thanks to @Tokeiburu for his extensive research and code! aleos89 2017-11-07 10:52:52 -05:00
  • 728a29d435 Harmonized include guards * Follow up to 24b3509 and c4a364b. * Harmonized the include guards for char-server and map-server header files. aleos89 2017-11-07 10:22:03 -05:00
  • 7a77787b6b Small cleanups * Removed an unneeded CMake line. * Cleaned up the includes. * Harmonized the include guards. aleos89 2017-11-07 09:47:28 -05:00
  • b26334c2fc Fix clang compilation error. lighta 2017-11-07 00:02:01 -05:00
  • 6c00e1d1a2 Login-serv initial c++ version. lighta 2017-11-06 22:41:22 -05:00
  • 24b3509e53
    Initial work for char server to C++ (#2567) lighta 2017-11-06 22:40:35 -04:00
  • c89ceb1992
    Update mob.cpp psychonaut04 2017-11-06 23:59:49 -02:00
  • 6decf6c6d0 Resolved skill NK checks * Fixes #2577. * Adjusted the battle checks to properly return the NK value rather than bool. Thanks to @darhylism! aleos 2017-11-06 17:16:45 -05:00
  • 673315994b Temporary adjustment for strict aliasing (#2582) lighta 2017-11-06 17:59:59 -04:00
  • 902383b6b7 Removes unwanted beginning white spaces. Jey 2017-11-06 22:21:01 +01:00
  • 836e3b0394 Changes suggested from @Lemongrass3110 Jey 2017-11-06 22:13:03 +01:00
  • 085416d50b Adds a newline in map-server.vcxproj Jey 2017-11-06 09:56:49 +01:00
  • f6bfb29636 Fix : #2572 lighta 2017-11-05 23:09:55 -04:00
  • a5cb6b5c63
    Update mob.hpp psychonaut04 2017-11-06 00:33:28 -02:00
  • 10285ddae2
    fix: changed from >= to > 51000 to fix #2579 psychonaut04 2017-11-05 23:49:33 -02:00
  • 70fd19b93b
    fix: No error when setting MAX_MOB_DB too high psychonaut04 2017-11-05 23:24:12 -02:00
  • 01761545a9 Update mob_avail.txt Balfear 2017-11-05 19:55:23 +03:00
  • 6ee4238974 Merge branch 'master' into update/madogear aleos89 2017-11-03 13:28:41 -04:00
  • 4609695882 Merge branch 'master' into refactor/StatusChangeDisplay refactor/StatusChangeDisplay aleos89 2017-11-03 13:27:25 -04:00
  • 6d9b175a21 Merge branch 'master' into hotfix/issue2173 aleos89 2017-11-03 13:25:26 -04:00
  • a128437276 Merge branch 'master' into cleanup/renewal_aspd aleos89 2017-11-03 13:24:14 -04:00
  • 2f557bbbb1 Merge branch 'master' into hotfix/issue1950 aleos89 2017-11-03 13:20:53 -04:00
  • 07368becd8 Merge branch 'master' into hotfix/issue2274 aleos89 2017-11-03 13:19:54 -04:00
  • 2d984edf59 Merge branch 'master' into hotfix/issue2360 aleos89 2017-11-03 13:19:03 -04:00
  • 0b83ac7d14 Merge branch 'master' into feature/refineui aleos89 2017-11-03 13:15:16 -04:00
  • c128aaaaea Merge branch 'master' into hotfix/issue2497 aleos89 2017-11-03 13:10:46 -04:00
  • 94cea18070 Merge branch 'master' into cleanup/emotions aleos89 2017-11-03 13:09:38 -04:00
  • cfe97585be Merge branch 'master' into hotfix/issue2551 aleos89 2017-11-03 13:05:56 -04:00
  • 6b1f52a48b Merge branch 'master' into hotfix/issue2540 aleos89 2017-11-03 13:04:36 -04:00
  • 936b3417e0 Merge 0df5f229e4efc39557bba52c49628373e60e324b into e7e9cf6d7333345d0e11d9f0bf9f1badb6ff3cd9 Maz-V 2017-11-03 16:15:15 +00:00
  • 0df5f229e4
    Update battle.cpp Maz-V 2017-11-03 23:14:05 +07:00
  • c865dea071
    Battle.cpp Adjusted item drop minimum value limit Maz-V 2017-11-03 23:11:18 +07:00
  • 7a89f8daf6 Initial work for char server to C++ lighta 2017-11-03 05:32:24 -04:00
  • e7e9cf6d73 Cleanup and harmonize cmake. lighta 2017-11-03 03:42:29 -04:00
  • c4a364be2c
    Initial work for map server to C++ (#2565) Aleos 2017-11-02 17:39:03 -04:00
  • c6cc8edeb4 Mapflag NoWarpTo: Novice Island (#2566) Maz-V 2017-11-02 21:12:38 +07:00
  • 4e85317a82
    Mapflag NoWarpTo: Novice Island Maz-V 2017-11-02 21:00:12 +07:00
  • f86bb39df8 Allow leaderless party (#1980) feature/leaderless_party Matheus Macabu 2017-11-02 12:32:33 +03:00
  • 5eaec8fe66 Merge eb1c0b9368b99eadb89a50d0b48197841e0aa3ca into c09929aa1692c4ff7985d76018e173349060c934 Maz-V 2017-11-02 02:23:35 +00:00
  • 49daae77d4 Merge branch 'master' into refactor/mapserver_cpp aleos 2017-11-01 21:41:13 -04:00
  • ab8ecb7532 Migrated headers to C++ aleos 2017-11-01 18:26:25 -04:00
  • c09929aa16 Negative npc input checks for arena_points. Jey 2017-11-01 22:17:31 +01:00
  • 10acb84ae8 Follow up to 326049e * Cleaned up some variable definitions. Thanks to @lighta! aleos 2017-11-01 15:38:47 -04:00
  • fbb447ac8c SQL synchronization rAthenaAPI 2017-11-01 16:57:26 +01:00
  • 125ab2853a Last missing mob ids from old range Lemongrass3110 2017-11-01 16:56:32 +01:00
  • d6171801ca SQL synchronization rAthenaAPI 2017-11-01 16:40:39 +01:00
  • af358809b9 New npc and mob IDs Lemongrass3110 2017-11-01 16:40:22 +01:00
  • 326049e70f Updated refine database parsing * Updated the refine database YAML parsing to use native C++. aleos 2017-10-31 22:39:45 -04:00
  • 8806b5cbf6 Fix win32 compilation. lighta 2017-10-31 20:23:11 -04:00
  • 2b2300ea07 Resolved a compile error * Added a missing include. aleos89 2017-10-31 10:45:49 -04:00
  • c38f5d208c Merge branch 'master' into refactor/mapserver_cpp aleos89 2017-10-31 09:57:34 -04:00
  • 0a111c922a clarification sader fawall 2017-10-31 10:08:31 +02:00
  • c824e438d3 Add Devil Tower sader fawall 2017-10-31 09:38:48 +02:00
  • 9362876101 Cleanup lighta 2017-10-31 02:18:53 -04:00
  • cd594fc908 Update map-server/cMakeFile to auto list files. lighta 2017-10-30 22:17:12 -04:00
  • 88f1fa32e6 Fix cmake lighta 2017-10-27 20:38:37 -04:00
  • 04326f609c Fix warning in make. lighta 2017-10-30 22:04:58 -04:00
  • 6ea6a58c55 Added battle config autoloot_adjust * Fixes #2540. * Added battle config autoloot_adjust that allows autoloot to take player drop penalties and bonuses into account. Thanks to @ecdarreola! aleos 2017-10-30 18:51:30 -04:00
  • eb6125d9f5 Adjusted item drop minimum value limit * Fixes #2551. * Lowered the item drop minimum value limits to be able to be set to 0. Thanks to @mazvi! aleos 2017-10-30 17:49:47 -04:00
  • 64c66c3045
    Fixed twice assigned values Roman Kalashnikov 2017-10-31 00:18:44 +03:00
  • 4d602135fc SQL synchronization rAthenaAPI 2017-10-30 22:16:53 +01:00
  • d15b5fc584
    Corrected St. Patrick's Hat and Green Ale (#2558) Aleos 2017-10-30 17:16:28 -04:00
  • 611dee0753 Fix cmake (#2554) lighta 2017-10-30 13:19:27 -04:00
  • 2c9bd5d6f0 Corrected St. Patrick's Hat and Green Ale * St. Patrick's Hat bonus should be granted from +8 or higher refine. * Green Ale has a 10 second use delay. Thanks to @uddevil! aleos89 2017-10-30 13:06:20 -04:00
  • c76f3675a2 Global_Function: Added "F_GetPlatinumSkills" (#2545) Maz-V 2017-10-30 21:57:57 +07:00
  • 88e60d001c
    Small follow up to 9b3b0ab Aleos 2017-10-30 10:31:48 -04:00
  • 9b3b0ab07f
    Updated Global Functions script header Aleos 2017-10-30 10:31:07 -04:00
  • c9704c621e
    Updated Job Master NPC header Aleos 2017-10-30 10:27:17 -04:00
  • 390f285b23
    Update CMakeLists.txt lighta 2017-10-29 21:39:55 -04:00
  • 65e0a66ed2 Merge branch 'master' into script/phantasmagorika Atemo 2017-10-29 18:37:24 +01:00
  • d629357c34 Replaced specialeffect number to constant Atemo 2017-10-29 18:28:31 +01:00
  • adfc67b9e3 Fixes compile warnings Jey 2017-10-29 14:22:42 +01:00
  • 09519f3b37
    Merge pull request #2546 from lighta/fix_configure Jittapan Pluemsumran 2017-10-29 05:35:13 -07:00
  • 9772639ae7 Fixed duplicated condition (#2553) Roman Kalashnikov 2017-10-29 13:00:59 +03:00
  • 44a5357911 Add warp option on the first level only sader fawall 2017-10-29 11:40:30 +02:00
  • 72c1d45fe9
    Removed Doram Check Maz-V 2017-10-29 12:45:34 +07:00
  • 2b18defd14 Follow up e7a6c77503 Atemo 2017-10-28 19:55:46 +02:00
  • e7a6c77503 Initial release of Devil Tower Memorial Atemo 2017-10-28 19:44:06 +02:00
  • b326b1b937 Migrated path.c to C++ aleos 2017-10-28 09:59:29 -04:00
  • 4fc0994b96
    Add doram check @secretdataz Maz-V 2017-10-28 11:24:01 +07:00
  • a98e1594b3
    Edited as request @sader1992 remove line 309 Maz-V 2017-10-28 10:44:22 +07:00