OSDN Git Service

Merge branch 'develop' into feature/diana
authorDeskull <61610939+sikabane-works@users.noreply.github.com>
Wed, 17 Nov 2021 14:44:33 +0000 (06:44 -0800)
committerGitHub <noreply@github.com>
Wed, 17 Nov 2021 14:44:33 +0000 (06:44 -0800)
commit548ed4deca113844ba2f3f1abbcc69bab1aa28cd
tree8f1f54c2e8e4cc5df02cbd1e11f5367eef135047
parent7e5468b7af46885d03e7598d1999df8b9fb3497c
parentcc441189326802baf7a7af098278fac68afc74ee
Merge branch 'develop' into feature/diana
src/artifact/random-art-effects.h
src/object-activation/activation-switcher.cpp
src/object-enchant/activation-info-table.cpp