Skip to content

Commit

Permalink
Gameplay (#15)
Browse files Browse the repository at this point in the history
* Spelling errors

* Created Turn Text above game board

* Display yellow player text in infoBar correctly

* Make Player 3's text color lighter | address minor changes

* Add reserved card assets | server bugfix

* Created buttons that allow chips to be taken (WIP)

* You can now take chips (but not return them)

* The player can now take and return chips

* bug fix for taking chips

* server message typo

* fixed possible plusChip bug

Co-authored-by: gheskett <[email protected]>
  • Loading branch information
zheskett and gheskett authored Aug 17, 2020
1 parent 7684ce8 commit 6925865
Show file tree
Hide file tree
Showing 27 changed files with 2,120 additions and 981 deletions.
110 changes: 45 additions & 65 deletions phaser/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 18 additions & 15 deletions phaser/src/assets/html/info_bar_username.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
<!DOCTYPE html>
<link href='https://fonts.googleapis.com/css?family=Quintessential' rel='stylesheet'>
<link href="https://fonts.googleapis.com/css?family=Quintessential" rel="stylesheet" />

<style>

#nameText {
font-family: Quintessential;
font-size: 32px;
max-width: 366px;
max-height: 50px;
color: white;
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

#nameText {
font-family: Quintessential;
font-size: 32px;
max-width: 366px;
max-height: 50px;
color: white;
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
-khtml-user-select: none;
-o-user-select: none;
-moz-user-select: none;
-webkit-user-select: none;
user-select: none;
}
</style>

<label id="nameText">John Cena</label>
<label id="nameText">John Cena</label>
43 changes: 43 additions & 0 deletions phaser/src/assets/html/player_turn.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<!DOCTYPE html>
<link href="https://fonts.googleapis.com/css?family=Quintessential" rel="stylesheet" />

<style>
* {
box-sizing: border-box;
}

.wholeTurn {
font-family: Quintessential;
font-size: 60px;
color: white;
text-align: center;
overflow: hidden;
max-height: 90px;
white-space: nowrap;
display: inline-block;
padding: 0;
margin: 0;
-khtml-user-select: none;
-o-user-select: none;
-moz-user-select: none;
-webkit-user-select: none;
user-select: none;
}

#turnValue {
max-width: 650px;
text-overflow: ellipsis;
font-weight: bold;
}

#turnHolder {
width: max-content;
margin: 0;
padding: 0;
}
</style>

<div id="turnHolder">
<label id="turnValue" class="wholeTurn">undefined</label>
<label id="turnText" class="wholeTurn">'s Turn</label>
</div>
Loading

0 comments on commit 6925865

Please sign in to comment.