Skip to content

Bugfix/blocks #4

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.

Sign up for GitHub

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

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open

Bugfix/blocks #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2df30af
temp
dev0652 Dec 19, 2023
ce5eea0
fix user routes and middlewares
dev0652 Dec 22, 2023
049020e
tmp
dev0652 Dec 23, 2023
2f2709c
adds controller decorator function
dev0652 Dec 23, 2023
00e7443
making things pretty
dev0652 Dec 23, 2023
0442892
making things prettier
dev0652 Dec 23, 2023
7f75581
adds fighter endpoints
dev0652 Dec 23, 2023
7fa80fa
fixes fighter endpoints
dev0652 Dec 23, 2023
6fb471d
tmp
dev0652 Dec 23, 2023
1274d27
adds fight endpoints
dev0652 Dec 24, 2023
f5fdae5
arena ready
dev0652 Dec 25, 2023
bd14c05
fighter creation fix
dev0652 Dec 25, 2023
84435a6
database fix - health
dev0652 Dec 25, 2023
d159b55
adds fight logic
dev0652 Dec 25, 2023
48fd229
fixed fight logic
dev0652 Dec 26, 2023
567edb7
cleanup tmp
dev0652 Dec 26, 2023
2004059
adds modal and game over logic
dev0652 Dec 26, 2023
6cbf777
return to production settings
dev0652 Dec 26, 2023
df01fe5
Merge pull request #1 from dev0652/feature/import-js-porject
dev0652 Dec 26, 2023
10b74f2
start page state reset fix
dev0652 Dec 26, 2023
71e4f6e
player 2 block fix
dev0652 Dec 26, 2023
d59f432
player2 block fix
dev0652 Dec 26, 2023
8ee5637
Merge branch 'main' into bugfix/blocks
dev0652 Dec 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions client/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<div id="modal-root"></div>

<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
Expand Down
63 changes: 63 additions & 0 deletions client/src/components/arena/arena.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
.arena___root {
display: flex;
flex-direction: column;
justify-content: space-between;
width: 100%;
height: 100%;
background-size: cover;
background-image: url('../../resources/arena.jpg');
background-repeat: no-repeat;
background-position: center;
}

.arena___battlefield {
display: flex;
justify-content: space-around;
margin-bottom: 60px;
}

.arena___right-fighter img {
transform: scaleX(-1);
}

.arena___fighter img {
height: 480px;
}

.arena___fight-status {
display: flex;
margin: 30px;
justify-content: center;
}

.arena___fighter-name {
color: black;
-webkit-text-fill-color: white;
-webkit-text-stroke-width: 1px;
font-size: 26px;
font-family: 'Arial Black';
font-weight: 700;
}

.arena___fighter-indicator {
width: 100%;
display: flex;
align-items: center;
flex-direction: column;
margin: 0 30px;
}

.arena___health-indicator {
width: 100%;
height: 25px;
border: 2px solid;
border-radius: 5px;
margin: 0 10px;
overflow: hidden;
}

.arena___health-bar {
height: 100%;
width: 100%;
background-color: #ebd759;
}
Loading