Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master #2

Merged
merged 417 commits into from
Mar 17, 2021
Merged

Master #2

merged 417 commits into from
Mar 17, 2021

Conversation

Zarbony
Copy link
Owner

@Zarbony Zarbony commented Mar 17, 2021

Pull Request Prelude

Changes Proposed

Issues addressed:

AnnieRuru and others added 30 commits November 7, 2020 02:23
Override code try to open first conf/import/include/SERVERNAME/FILEPATH file,
if it failed fallback to normal FILEPATH path.

This feature need for example for override sql_connection.conf
without changing any other configs.
By Kenpachi2k13 (styling)

Co-authored-by: Kenpachi2k13 <3476227+Kenpachi2k13@users.noreply.github.com>
Refactored Party Booking defines.
Signed-off-by: HerculesWSAPI <dev@herc.ws>
Refactor map->random_dir and implement aegis behavior of some skills which used it
Allow override libconfig command @include
Fix Freezing Spear on Watery Evasion
fix missing scoreboard for battleground type 2
improve error messages in mob skill db to show monster constants
Fix some wrong return values in mob skill code
Fix summoned monsters wont follow masters of type BL_PC
Make Impositio Manus always overwrites itself
Prevent using unit->set_dir needlessly in unit_attack_timer_sub
fix pc_calc_pvprank_sub cannot hook by plugin
Signed-off-by: HerculesWSAPI <dev@herc.ws>
Fix map server crash when changing display class of floating NPC
Add some data evaluation to the RODEX send mail script commands
Add missing "Card" suffix to Fruit Pom Spider Card
Signed-off-by: HerculesWSAPI <dev@herc.ws>
MishimaHaruna and others added 29 commits March 8, 2021 12:30
Fix possible use after free in unit_skilluse_id2
Report to console if a missing message is requested
Convert some skill packets to structure format
Signed-off-by: HerculesWSAPI <dev@herc.ws>
…plied to HP regeneration

Signed-off-by: Haru <haru@dotalux.com>
…tended behavior.

Closes #2910

Signed-off-by: Haru <haru@dotalux.com>
…nculus config

Signed-off-by: Haru <haru@dotalux.com>
regeneration working on other jobs than Super novice

Signed-off-by: Haru <haru@dotalux.com>
Convert Homunculus database to Libconf
Fixed SC_DEFSET and SC_MDEFSET status icon display.
De-hardcode skills blocked under SC_STASIS and SC_KG_KAGEHUMI.
Fixed manhole shouldn't work on Guardians.
Fix successremovecard doesn't run unequip script
Signed-off-by: HerculesWSAPI <dev@herc.ws>
Signed-off-by: HerculesWSAPI <dev@herc.ws>
Signed-off-by: Haru <haru@dotalux.com>
@Zarbony Zarbony merged commit 6fd80e0 into Zarbony:master Mar 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.