sprechtl/RaspberryRocketeer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'leaderboard-pagination' into develop

Browse source 
# Conflicts:
#	frontend/package-lock.json
This commit is contained in:
j-weissen 2023-01-20 14:01:41 +01:00
commit 030189aa52
15 changed files with 354 additions and 1291 deletions
Download patch file Download diff file Expand all files Collapse all files

5
frontend/public/index.html
View file

@ -8,9 +8,10 @@
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
<script src="./game/build.js"></script>
<title><%= htmlWebpackPlugin.options.title %></title>
<script src="https://cdn.jsdelivr.net/npm/p5@1.5.0/lib/p5.js"></script>
<script src="./game.js"></script>
<script src="https://cdn.jsdelivr.net/npm/p5@1.5.0/lib/p5.js"></script>
</head>
<body style="background-color: beige;">
<noscript>

12
frontend/public/main.js
View file

@ -1,12 +0,0 @@
function setup() {
createCanvas(400, 400);
}
function draw() {
if (mouseIsPressed) {
fill(0);
} else {
fill(255);
}
ellipse(mouseX, mouseY, 80, 80);
}