nEEtdo0d f17d6cc221 Merge remote-tracking branch 'origin/master' into reward_shop_rebirth

2021-07-31 22:13:23 -04:00

..

assets.py

Fix: [JP] MEOWFFICER_INFO & guild boss assets

2021-07-26 16:01:25 +08:00

base.py

Fix: Guild side bar and equipment side bar

2021-07-25 19:36:56 -04:00

guild_combat.py

Mov: *_CF references and assets to module guild from combat

2021-01-16 13:53:46 -05:00

guild_reward.py

Del: Remove GUILD_POPUP_TRIGGERED because AL can receive guild missions automatically now

2021-06-20 16:39:14 +08:00

lobby.py

Del: Unused .BUTTON assets for module guild

2021-01-16 19:23:37 -05:00

logistics.py

Fix: Resolve merge conflict ui/assets.py

2021-07-23 10:21:26 -04:00

operations.py

Fix: Resolve merge conflict ui/assets.py

2021-07-23 10:21:26 -04:00