jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-17 16:02:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

update includes

Browse source
This commit is contained in:
RickyRister 2025-04-20 03:13:39 -07:00
parent 6d3606a631
commit 465b752df0
20 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/client/tabs/tab_game.cpp
View file

@ -3,9 +3,9 @@
#include "../../client/ui/widgets/cards/card_info_frame_widget.h" #include "../../client/ui/widgets/cards/card_info_frame_widget.h"
#include "../../dialogs/dlg_create_game.h" #include "../../dialogs/dlg_create_game.h"
#include "../../game/board/arrow_item.h" #include "../../game/board/arrow_item.h"
#include "../../game/board/card_item.h"
#include "../../game/cards/card_database.h" #include "../../game/cards/card_database.h"
#include "../../game/cards/card_database_manager.h" #include "../../game/cards/card_database_manager.h"
#include "../../game/cards/card_item.h"
#include "../../game/deckview/deck_view_container.h" #include "../../game/deckview/deck_view_container.h"
#include "../../game/game_scene.h" #include "../../game/game_scene.h"
#include "../../game/game_view.h" #include "../../game/game_view.h"

2
cockatrice/src/client/ui/widgets/cards/card_info_display_widget.cpp
View file

@ -1,7 +1,7 @@
#include "card_info_display_widget.h" #include "card_info_display_widget.h"
#include "../../../../game/board/card_item.h"
#include "../../../../game/cards/card_database_manager.h" #include "../../../../game/cards/card_database_manager.h"
#include "../../../../game/cards/card_item.h"
#include "../../../../main.h" #include "../../../../main.h"
#include "card_info_picture_widget.h" #include "card_info_picture_widget.h"
#include "card_info_text_widget.h" #include "card_info_text_widget.h"

2
cockatrice/src/client/ui/widgets/cards/card_info_frame_widget.cpp
View file

@ -1,7 +1,7 @@
#include "card_info_frame_widget.h" #include "card_info_frame_widget.h"
#include "../../../../game/board/card_item.h"
#include "../../../../game/cards/card_database_manager.h" #include "../../../../game/cards/card_database_manager.h"
#include "../../../../game/cards/card_item.h"
#include "../../../../settings/cache_settings.h" #include "../../../../settings/cache_settings.h"
#include "card_info_display_widget.h" #include "card_info_display_widget.h"
#include "card_info_picture_widget.h" #include "card_info_picture_widget.h"

2
cockatrice/src/client/ui/widgets/cards/card_info_picture_widget.cpp
View file

@ -1,7 +1,7 @@
#include "card_info_picture_widget.h" #include "card_info_picture_widget.h"
#include "../../../../game/board/card_item.h"
#include "../../../../game/cards/card_database_manager.h" #include "../../../../game/cards/card_database_manager.h"
#include "../../../../game/cards/card_item.h"
#include "../../../../settings/cache_settings.h" #include "../../../../settings/cache_settings.h"
#include "../../../tabs/tab_supervisor.h" #include "../../../tabs/tab_supervisor.h"
#include "../../picture_loader/picture_loader.h" #include "../../picture_loader/picture_loader.h"

2
cockatrice/src/client/ui/widgets/cards/card_info_text_widget.cpp
View file

@ -1,6 +1,6 @@
#include "card_info_text_widget.h" #include "card_info_text_widget.h"
#include "../../../../game/cards/card_item.h" #include "../../../../game/board/card_item.h"
#include "../../../../game/game_specific_terms.h" #include "../../../../game/game_specific_terms.h"
#include <QGridLayout> #include <QGridLayout>

2
cockatrice/src/game/board/arrow_item.cpp
View file

@ -3,10 +3,10 @@
#include "../../settings/cache_settings.h" #include "../../settings/cache_settings.h"
#include "../cards/card_info.h" #include "../cards/card_info.h"
#include "../cards/card_item.h"
#include "../player/player.h" #include "../player/player.h"
#include "../player/player_target.h" #include "../player/player_target.h"
#include "../zones/card_zone.h" #include "../zones/card_zone.h"
#include "card_item.h"
#include "color.h" #include "color.h"
#include "pb/command_attach_card.pb.h" #include "pb/command_attach_card.pb.h"
#include "pb/command_create_arrow.pb.h" #include "pb/command_create_arrow.pb.h"

2
cockatrice/src/game/deckview/deck_view.h
View file

@ -1,7 +1,7 @@
#ifndef DECKVIEW_H #ifndef DECKVIEW_H
#define DECKVIEW_H #define DECKVIEW_H
#include "../../game/cards/abstract_card_drag_item.h" #include "../board/abstract_card_drag_item.h"
#include "pb/move_card_to_zone.pb.h" #include "pb/move_card_to_zone.pb.h"
#include <QGraphicsScene> #include <QGraphicsScene>

2
cockatrice/src/game/game_scene.cpp
View file

@ -2,7 +2,7 @@
#include "../client/ui/phases_toolbar.h" #include "../client/ui/phases_toolbar.h"
#include "../settings/cache_settings.h" #include "../settings/cache_settings.h"
#include "cards/card_item.h" #include "board/card_item.h"
#include "player/player.h" #include "player/player.h"
#include "zones/view_zone.h" #include "zones/view_zone.h"
#include "zones/view_zone_widget.h" #include "zones/view_zone_widget.h"

4
cockatrice/src/game/player/player.cpp
View file

@ -9,11 +9,11 @@
#include "../../main.h" #include "../../main.h"
#include "../../settings/cache_settings.h" #include "../../settings/cache_settings.h"
#include "../board/arrow_item.h" #include "../board/arrow_item.h"
#include "../board/card_item.h"
#include "../board/card_list.h"
#include "../board/counter_general.h" #include "../board/counter_general.h"
#include "../cards/card_database.h" #include "../cards/card_database.h"
#include "../cards/card_database_manager.h" #include "../cards/card_database_manager.h"
#include "../cards/card_item.h"
#include "../cards/card_list.h"
#include "../game_scene.h" #include "../game_scene.h"
#include "../hand_counter.h" #include "../hand_counter.h"
#include "../zones/card_zone.h" #include "../zones/card_zone.h"

2
cockatrice/src/game/zones/card_zone.cpp
View file

@ -1,7 +1,7 @@
#include "card_zone.h" #include "card_zone.h"
#include "../board/card_item.h"
#include "../cards/card_database_manager.h" #include "../cards/card_database_manager.h"
#include "../cards/card_item.h"
#include "../player/player.h" #include "../player/player.h"
#include "pb/command_move_card.pb.h" #include "pb/command_move_card.pb.h"
#include "pb/serverinfo_user.pb.h" #include "pb/serverinfo_user.pb.h"

2
cockatrice/src/game/zones/card_zone.h
View file

@ -3,7 +3,7 @@
#include "../../client/translation.h" #include "../../client/translation.h"
#include "../board/abstract_graphics_item.h" #include "../board/abstract_graphics_item.h"
#include "../cards/card_list.h" #include "../board/card_list.h"
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QString> #include <QString>

4
cockatrice/src/game/zones/hand_zone.cpp
View file

@ -2,8 +2,8 @@
#include "../../client/ui/theme_manager.h" #include "../../client/ui/theme_manager.h"
#include "../../settings/cache_settings.h" #include "../../settings/cache_settings.h"
#include "../cards/card_drag_item.h" #include "../board/card_drag_item.h"
#include "../cards/card_item.h" #include "../board/card_item.h"
#include "../player/player.h" #include "../player/player.h"
#include "pb/command_move_card.pb.h" #include "pb/command_move_card.pb.h"

4
cockatrice/src/game/zones/pile_zone.cpp
View file

@ -1,7 +1,7 @@
#include "pile_zone.h" #include "pile_zone.h"
#include "../cards/card_drag_item.h" #include "../board/card_drag_item.h"
#include "../cards/card_item.h" #include "../board/card_item.h"
#include "../player/player.h" #include "../player/player.h"
#include "pb/command_move_card.pb.h" #include "pb/command_move_card.pb.h"
#include "view_zone.h" #include "view_zone.h"

2
cockatrice/src/game/zones/select_zone.cpp
View file

@ -1,7 +1,7 @@
#include "select_zone.h" #include "select_zone.h"
#include "../../settings/cache_settings.h" #include "../../settings/cache_settings.h"
#include "../cards/card_item.h" #include "../board/card_item.h"
#include "../game_scene.h" #include "../game_scene.h"
#include <QDebug> #include <QDebug>

4
cockatrice/src/game/zones/stack_zone.cpp
View file

@ -3,8 +3,8 @@
#include "../../client/ui/theme_manager.h" #include "../../client/ui/theme_manager.h"
#include "../../settings/cache_settings.h" #include "../../settings/cache_settings.h"
#include "../board/arrow_item.h" #include "../board/arrow_item.h"
#include "../cards/card_drag_item.h" #include "../board/card_drag_item.h"
#include "../cards/card_item.h" #include "../board/card_item.h"
#include "../player/player.h" #include "../player/player.h"
#include "pb/command_move_card.pb.h" #include "pb/command_move_card.pb.h"

4
cockatrice/src/game/zones/table_zone.cpp
View file

@ -3,9 +3,9 @@
#include "../../client/ui/theme_manager.h" #include "../../client/ui/theme_manager.h"
#include "../../settings/cache_settings.h" #include "../../settings/cache_settings.h"
#include "../board/arrow_item.h" #include "../board/arrow_item.h"
#include "../cards/card_drag_item.h" #include "../board/card_drag_item.h"
#include "../board/card_item.h"
#include "../cards/card_info.h" #include "../cards/card_info.h"
#include "../cards/card_item.h"
#include "../player/player.h" #include "../player/player.h"
#include "pb/command_move_card.pb.h" #include "pb/command_move_card.pb.h"
#include "pb/command_set_card_attr.pb.h" #include "pb/command_set_card_attr.pb.h"

2
cockatrice/src/game/zones/table_zone.h
View file

@ -1,7 +1,7 @@
#ifndef TABLEZONE_H #ifndef TABLEZONE_H
#define TABLEZONE_H #define TABLEZONE_H
#include "../cards/abstract_card_item.h" #include "../board/abstract_card_item.h"
#include "select_zone.h" #include "select_zone.h"
/* /*

4
cockatrice/src/game/zones/view_zone.cpp
View file

@ -1,9 +1,9 @@
#include "view_zone.h" #include "view_zone.h"
#include "../../server/pending_command.h" #include "../../server/pending_command.h"
#include "../cards/card_drag_item.h" #include "../board/card_drag_item.h"
#include "../board/card_item.h"
#include "../cards/card_info.h" #include "../cards/card_info.h"
#include "../cards/card_item.h"
#include "../player/player.h" #include "../player/player.h"
#include "pb/command_dump_zone.pb.h" #include "pb/command_dump_zone.pb.h"
#include "pb/command_move_card.pb.h" #include "pb/command_move_card.pb.h"

2
cockatrice/src/game/zones/view_zone_widget.cpp
View file

@ -2,7 +2,7 @@
#include "../../client/ui/pixel_map_generator.h" #include "../../client/ui/pixel_map_generator.h"
#include "../../settings/cache_settings.h" #include "../../settings/cache_settings.h"
#include "../cards/card_item.h" #include "../board/card_item.h"
#include "../filters/syntax_help.h" #include "../filters/syntax_help.h"
#include "../game_scene.h" #include "../game_scene.h"
#include "../player/player.h" #include "../player/player.h"

2
cockatrice/src/server/message_log_widget.cpp
View file

@ -2,7 +2,7 @@
#include "../client/sound_engine.h" #include "../client/sound_engine.h"
#include "../client/translate_counter_name.h" #include "../client/translate_counter_name.h"
#include "../game/cards/card_item.h" #include "../game/board/card_item.h"
#include "../game/phase.h" #include "../game/phase.h"
#include "../game/player/player.h" #include "../game/player/player.h"
#include "../game/zones/card_zone.h" #include "../game/zones/card_zone.h"