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

Fix sideboard #3025

Merged
merged 7 commits into from
Jan 19, 2018
Merged

Fix sideboard #3025

merged 7 commits into from
Jan 19, 2018

Conversation

ZeldaZach
Copy link
Member

Fix #3022

General code cleanup

@ZeldaZach ZeldaZach requested a review from tooomm January 19, 2018 02:31
Copy link
Member

@tooomm tooomm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UI improved 👍
fix
fix2

Could we remove the red frames around the buttons as long as no deck is loaded too?

@ZeldaZach
Copy link
Member Author

@tooomm No, I can't remove the red borders, sorry. They're hard coded in between red and green; adding another state would be confusing and not worth it imo

@ZeldaZach ZeldaZach merged commit 691bf36 into Cockatrice:master Jan 19, 2018
@tooomm
Copy link
Member

tooomm commented Jan 19, 2018

Actually, I'm seeing issues with this build (4a2feff at appveyor).

Can you properly play a game after you load a deck @ZeldaZach ?
I can't draw or move cards and the battlefield is slightly missplaced.

Client Version: 2.5.0-custom(4a2feff) (2018-01-19)
Client Operating System: Windows 10 (10.0)
Build Architecture: 64-bit
Qt Version: 5.9.2
QWindowsWindow::setGeometry: Unable to set geometry 120x30+583+330 on QWidgetWindow/'QInputDialogClassWindow'. Resulting geometry:  195x90+583+330 (frame: 8, 31, 8, 8, custom margin: 0, 0, 0, 0, minimum size: 195x90, maximum size: 524287x90).
Adding room: ID= 0 name= ""
Server::loginUser: LocalServerInterface(0x175043a46d0) name= "Player 1"
session id: 0
gameEvent: invalid gameId
Server_AbstractUserInterface::playerAddedToGame(): gameId = 1
GameScene::addPlayer name= "Player 1"
cache fail for "_trice_card_back_274297"
QWindowsWindow::setGeometry: Unable to set geometry 1366x971+0+23 on QWidgetWindow/'MainWindowClassWindow'. Resulting geometry:  1366x705+0+23 (frame: 8, 31, 8, 8, custom margin: 0, 0, 0, 0, minimum size: 640x971, maximum size: 16777215x16777215).
cache fail for "_trice_card_back_274204"
Loaded from ".../AppData/Local/Cockatrice/Cockatrice/decks/AKH Pre-Release Deck.cod" - true
Deck was loaded - true
Trying to load picture (set:  "AKH"  card:  "Angel of Sanctions" )
Picture found on disk (set:  "AKH"  file:  "Angel of Sanctions" )
...
Trying to load picture (set:  "AKH"  card:  "Ahn-Crop Crasher" )
Picture found on disk (set:  "AKH"  file:  "Ahn-Crop Crasher" )
addCounter: "Player 1" 0 "life"
addCounter: "Player 1" 1 "w"
addCounter: "Player 1" 2 "u"
addCounter: "Player 1" 3 "b"
addCounter: "Player 1" 4 "r"
addCounter: "Player 1" 5 "g"
addCounter: "Player 1" 6 "x"
addCounter: "Player 1" 7 "storm"
libpng warning: iCCP: known incorrect sRGB profile
libpng warning: iCCP: known incorrect sRGB profile
libpng warning: iCCP: known incorrect sRGB profile
libpng warning: iCCP: known incorrect sRGB profile
libpng warning: iCCP: known incorrect sRGB profile
libpng warning: iCCP: known incorrect sRGB profile
libpng warning: iCCP: known incorrect sRGB profile
libpng warning: iCCP: known incorrect sRGB profile
libpng warning: iCCP: known incorrect sRGB profile
libpng warning: iCCP: known incorrect sRGB profile
libpng warning: iCCP: known incorrect sRGB profile
libpng warning: iCCP: known incorrect sRGB profile
cache fail for "_trice_card_back_96136"
libpng warning: iCCP: known incorrect sRGB profile
libpng warning: iCCP: known incorrect sRGB profile
libpng warning: iCCP: known incorrect sRGB profile
libpng warning: iCCP: known incorrect sRGB profile
libpng warning: iCCP: known incorrect sRGB profile
QPixmap::scaled: Pixmap is a null pixmap
libpng warning: iCCP: known incorrect sRGB profile
libpng warning: iCCP: known incorrect sRGB profile
QPainter::end: Painter ended with 2 saved states
QWindowsWindow::setGeometry: Unable to set geometry 120x30+583+463 on QWidgetWindow/'QInputDialogClassWindow'. Resulting geometry:  178x90+583+463 (frame: 8, 31, 8, 8, custom margin: 0, 0, 0, 0, minimum size: 178x90, maximum size: 524287x90).

Errors like the geometry or card back cache are not new and have been there for a long long time for me btw.

@ZeldaZach ZeldaZach mentioned this pull request Jan 20, 2018
@ZeldaZach ZeldaZach deleted the fix_sideboard branch January 20, 2018 01:35
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.

None yet

2 participants