Merge branch 'ryzom/marauder-gameplay' into main/gingo-test
commitdb7bf790457cabf3e4ac3167307051aabd725da3
authorNuno <ulukyn@gmail.com>
Mon, 15 May 2023 13:36:50 +0000 (15 15:36 +0200)
committerNuno <ulukyn@gmail.com>
Mon, 15 May 2023 13:36:50 +0000 (15 15:36 +0200)
treef15248d575e1932504126f19b29734caaa33a0de
parent242eeea8dd882f80ef24f3750551f7c743627cee
parentb0a61fa9bbd0bce9e2bdd71a0f2b3a2661f921bd
Merge branch 'ryzom/marauder-gameplay' into main/gingo-test
ryzom/server/src/entities_game_service/game_item_manager/player_inv_equip.cpp
ryzom/server/src/entities_game_service/player_manager/character.cpp
ryzom/server/src/entities_game_service/player_manager/character.h
ryzom/server/src/entities_game_service/player_manager/character_inlines.h
ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp