Skip to content

Commit 50df417

Browse files
iamthetoasteriamthetoaster
authored
Merge pull request #76 from iamthetoaster/dev
Merging to main
2 parents c99b4c4 + c7e0bb1 commit 50df417

29 files changed

+1200
-891
lines changed

‎.DS_Store

0 Bytes
Binary file not shown.

‎README.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,9 @@ A turn-based game based on [Racetrack](https://en.wikipedia.org/wiki/Racetrack_(
99
- Yesenia Puga
1010
- Calvin Owen
1111
- Brian Chung
12-
- Shauna Maloney
12+
- Shauna Maloney
13+
14+
## How To Play VectorKART
15+
This is a turn based game. You can only move your car during your turn. Each turn you are able to create a small acceleration vector (by clicking) in order to slightly modify your velocity. Try not to crash into the wall. Whoever makes it around the map first or with the least wall crashes wins!
16+
17+
![alt text](https://github.com/iamthetoaster/VectorKart/blob/readme-instructions/cars.png?raw=true)

‎ScrumDocuments/Release Plan - Vector Kart.pdf

45.9 KB
Binary file not shown.

‎ScrumDocuments/Sprint Plan 1.pdf

132 KB
Binary file not shown.

‎ScrumDocuments/Sprint Plan 2.pdf

147 KB
Binary file not shown.

‎ScrumDocuments/Sprint Plan 3.pdf

198 KB
Binary file not shown.

‎ScrumDocuments/Team Working Agreements.pdf

92.7 KB
Binary file not shown.

‎cars.png

44.4 KB
Loading

‎eslint.config.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export default [
3333
}
3434
},
3535
{
36-
files: ["src/engine/*", "src/state-objects/*"],
36+
files: ["src/engine/*", "src/state-objects/*", "tests"],
3737
rules: {
3838
"unicorn/filename-case": ["error", {"case": "pascalCase"}],
3939
}

‎index.html

+40-25
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,54 @@
11
<!doctype html>
22
<html class="no-js" lang="">
3-
<head>
4-
<meta charset="utf-8">
5-
<meta http-equiv="x-ua-compatible" content="ie=edge">
6-
<title>Untitled</title>
7-
<meta name="description" content="">
8-
<meta name="viewport" content="width=device-width, initial-scale=1">
9-
<link rel="stylesheet" href="/src/style.css">
10-
</head>
11-
<body>
12-
<!--[if lt IE 8]>
3+
4+
<head>
5+
<meta charset="utf-8">
6+
<meta http-equiv="x-ua-compatible" content="ie=edge">
7+
<title>VectorKart</title>
8+
<meta name="description" content="">
9+
<meta name="viewport" content="width=device-width, initial-scale=1">
10+
<link rel="stylesheet" href="/src/style.css">
11+
</head>
12+
13+
<body>
14+
<!--[if lt IE 8]>
1315
<p class="browserupgrade">
1416
You are using an <strong>outdated</strong> browser. Please
1517
<a href="http://browsehappy.com/">upgrade your browser</a> to improve
1618
your experience.
1719
</p>
1820
<![endif]-->
1921

20-
<!-- WebGL Canvas -->
21-
<canvas id="c" width=750 height=750></canvas>
22-
<button id="reset-button" width=50 height=50>reset</button>
23-
<!-- input id="testButton" type="button" value="Click me" -->
22+
<!-- WebGL Canvas -->
23+
<canvas id="c" width=750 height=750></canvas>
24+
<button id="reset-button">Reset</button>
25+
<!-- input id="testButton" type="button" value="Click me" -->
26+
27+
<!-- Player Statistics Dashboard -->
28+
<div id="dashboard"></div>
29+
<div id="instructions">
30+
<p class="instruction-title">How To Play VectorKART</p>
31+
<p class="instruction-text">This is a turn based game.
32+
You can only move your car during your turn.
33+
Each turn you are able to create a small acceleration vector (by clicking) in order to slightly modify your
34+
velocity.
35+
Try not to crash into the wall.
36+
Whoever makes it around the map first or with the least wall crashes wins!</p>
37+
<img class="instruction-img" src="./cars.png">
38+
39+
</div>
40+
2441

25-
<!-- Player Statistics Dashboard -->
26-
<div id="dashboard"></div>
42+
<div id="winMessage"></div>
2743

28-
<div id="winMessage"></div>
44+
<!-- Container for the Map -->
45+
<!--div id="mapContainer"></div-->
2946

30-
<!-- Container for the Map -->
31-
<!--div id="mapContainer"></div-->
47+
<!-- Map Script -->
48+
<!--script src="/src/map.js"></script-->
3249

33-
<!-- Map Script -->
34-
<!--script src="/src/map.js"></script-->
50+
<!-- Main Script for Car and Game Logic -->
51+
<script type="module" src="/src/main.js"></script>
52+
</body>
3553

36-
<!-- Main Script for Car and Game Logic -->
37-
<script type="module" src="/src/main.js"></script>
38-
</body>
39-
</html>
54+
</html>

‎jest.config.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ const config = {
174174
// testRunner: "jest-circus/runner",
175175

176176
// A map from regular expressions to paths to transformers
177-
// transform: undefined,
177+
transform: {},
178178

179179
// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
180180
// transformIgnorePatterns: [

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"version": "0.1.0",
44
"type": "module",
55
"description": "A turn-based game based on [Racetrack](https://en.wikipedia.org/wiki/Racetrack_(game)) and made with WebGL.",
6-
"main": "/src/main.js",
6+
"main": "src/main.js",
77
"engines": {
88
"npm": "10.7.x",
99
"node": "20.15.x"
1010
},
1111
"scripts": {
1212
"lint": "eslint src/**/*.js tests/*.test.js",
1313
"lint-fix": "eslint --fix src/**/*.js tests/*.test.js",
14-
"test": "jest"
14+
"test": "node --experimental-vm-modules node_modules/jest/bin/jest.js"
1515
},
1616
"repository": {
1717
"type": "git",

‎src/.DS_Store

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)