Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of https://github.com/elsongabriel/canary into fe…
…ature/title-system # Conflicts: # src/creatures/CMakeLists.txt # src/creatures/players/player.cpp # src/creatures/players/player.hpp # src/game/game.cpp # src/game/game.hpp # src/game/game_definitions.hpp # src/io/functions/iologindata_load_player.cpp # src/lua/functions/core/game/game_functions.cpp # src/lua/functions/creatures/player/player_functions.cpp # src/lua/functions/creatures/player/player_functions.hpp # src/server/network/protocol/protocolgame.cpp # src/server/network/protocol/protocolgame.hpp # vcproj/canary.vcxproj
- Loading branch information