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

feat: shared_ptr: familiar, groups and reload: familiars, outfits #2556

Merged
merged 21 commits into from
Jun 12, 2024

Conversation

beats-dh
Copy link
Collaborator

No description provided.

@elsongabriel
Copy link
Contributor

Reload is working pretty well:
image

@beats-dh beats-dh force-pushed the shared branch 5 times, most recently from fc579f0 to c1b4fd5 Compare April 27, 2024 20:57
src/creatures/players/grouping/groups.cpp Outdated Show resolved Hide resolved
src/io/functions/iologindata_load_player.cpp Outdated Show resolved Hide resolved
src/lua/functions/creatures/player/group_functions.cpp Outdated Show resolved Hide resolved
…ared

# Conflicts:
#	src/creatures/appearance/outfit/outfit.cpp
#	src/creatures/appearance/outfit/outfit.hpp
#	src/creatures/players/grouping/familiars.cpp
#	src/creatures/players/grouping/familiars.hpp
#	src/creatures/players/grouping/groups.cpp
#	src/creatures/players/grouping/groups.hpp
#	src/io/functions/iologindata_load_player.cpp
#	src/lua/functions/creatures/player/group_functions.cpp
… 'getOpositeSexOutfitByLookType'. Adjusted reload order.
@elsongabriel elsongabriel merged commit 201aa8c into main Jun 12, 2024
40 checks passed
@elsongabriel elsongabriel deleted the shared branch June 12, 2024 13:43
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.

4 participants