Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
0a9c269
Setting up GitHub Classroom Feedback
github-classroom[bot] Mar 20, 2023
c1c2f80
Add files via upload
RyanADahlke Mar 22, 2023
89a0128
Merge pull request #2 from Spring-2023-CISC374/boyuan
boyuan1228 Mar 22, 2023
e16b838
add plan
boyuan1228 Mar 22, 2023
ea7ca0e
fixing stuff
RyanADahlke Mar 22, 2023
6485124
Delete public
RyanADahlke Mar 22, 2023
d98cac4
Delete src
RyanADahlke Mar 22, 2023
c82abdf
Merge branch 'Start-Up' of https://github.com/Spring-2023-CISC374/gro…
RyanADahlke Mar 22, 2023
2680ffb
Start up files added
RyanADahlke Mar 22, 2023
f339e39
add phaser ts files
boyuan1228 Mar 22, 2023
fcce2fb
Merge pull request #3 from Spring-2023-CISC374/boyuan
boyuan1228 Mar 22, 2023
79f15b2
Got Start Up working
RyanADahlke Mar 22, 2023
4e8ad80
Merge branch 'main' into Start-Up
RyanADahlke Mar 22, 2023
842adab
Merge pull request #4 from Spring-2023-CISC374/Start-Up
RyanADahlke Mar 22, 2023
5e35f57
Got a switch to display a change when someone
RyanADahlke Mar 30, 2023
1aa78d2
Buttons now toggle on and off
RyanADahlke Mar 30, 2023
4f478e9
Merge pull request #5 from Spring-2023-CISC374/Switch-and-Button
RyanADahlke Mar 30, 2023
231e75e
sence transition update
boyuan1228 Apr 2, 2023
7f97c5c
Merge pull request #6 from Spring-2023-CISC374/Scene
boyuan1228 Apr 2, 2023
17c9e33
- added demo level, made top platform, made object
bennewlin Apr 2, 2023
b5c747f
Merge pull request #7 from Spring-2023-CISC374/bn_firstlevel_physics
RyanADahlke Apr 2, 2023
4101dd4
two chars
BinghongLiu Apr 3, 2023
42e3675
Merge pull request #8 from Spring-2023-CISC374/2characters
BinghongLiu Apr 3, 2023
b6664bb
added to scenes
BinghongLiu Apr 3, 2023
6fef491
Merge pull request #9 from Spring-2023-CISC374/2characters
BinghongLiu Apr 3, 2023
970fd95
update 4scene and reset button
boyuan1228 Apr 7, 2023
1c90104
Merge pull request #10 from Spring-2023-CISC374/reset_and_4scene
boyuan1228 Apr 7, 2023
6eeafcc
Added box asset and base design for first level
bennewlin Apr 10, 2023
555e798
Started a Gate class
RyanADahlke Apr 11, 2023
47539bd
Struggling to get import working
RyanADahlke Apr 11, 2023
e26a2cf
moved switches and buttons to their own classes
RyanADahlke Apr 12, 2023
1397be3
Changed Switches and Buttons to classes
RyanADahlke Apr 12, 2023
ccc1d42
Gate hooked up to exactly one switch now work
RyanADahlke Apr 12, 2023
f450047
Textures working, buttons still aren't
RyanADahlke Apr 12, 2023
50f6a83
Textures working, buttons still not
RyanADahlke Apr 12, 2023
ec514a3
Null
RyanADahlke Apr 12, 2023
2a3641d
Merge pull request #11 from Spring-2023-CISC374/bn_box_level
RyanADahlke Apr 12, 2023
4216109
Merge branch 'main' into Gates
RyanADahlke Apr 12, 2023
28049d8
Merge pull request #12 from Spring-2023-CISC374/Gates
RyanADahlke Apr 12, 2023
e9929cc
finished first level for now - change later
bennewlin Apr 13, 2023
d9329d6
Merge pull request #13 from Spring-2023-CISC374/bn_alpha_level
RyanADahlke Apr 14, 2023
134989f
Began, nothing broken at least
RyanADahlke Apr 14, 2023
79a2cbc
BUTTONS WORK! Gates still can't take multiple
RyanADahlke Apr 17, 2023
6868607
Merge pull request #14 from Spring-2023-CISC374/Post-Alpha-Cleanup
RyanADahlke Apr 17, 2023
4754fe6
Buttons Gates and Switches working as intended
RyanADahlke Apr 17, 2023
22adb22
Everything works as intended
RyanADahlke Apr 17, 2023
1e03aa1
Merge pull request #15 from Spring-2023-CISC374/Gates-2
RyanADahlke Apr 17, 2023
b3ec7cf
SwitchA and ButtonA are no longer implemented.
RyanADahlke Apr 20, 2023
4569a2b
Merge pull request #16 from Spring-2023-CISC374/Switches-and-Buttons-…
RyanADahlke Apr 20, 2023
49ace9f
upload the menu and tour scene
boyuan1228 Apr 20, 2023
a67eb25
Merge pull request #17 from Spring-2023-CISC374/menu_and_tutor
boyuan1228 Apr 20, 2023
7476546
main_background
boyuan1228 Apr 20, 2023
efcccac
Merge pull request #18 from Spring-2023-CISC374/bg
boyuan1228 Apr 20, 2023
f6f1487
oops
BinghongLiu Apr 21, 2023
695a286
Finished level 1 for now, PULL THIS ITS CLEAN
bennewlin Apr 21, 2023
59f6d46
Merge pull request #19 from Spring-2023-CISC374/bn_beta_v2
RyanADahlke Apr 21, 2023
eab4f7d
Changed directory pathways
bennewlin Apr 21, 2023
cec310d
deploy
BinghongLiu Apr 26, 2023
6fa44b6
Added level 2 and fixed errors on HelloWorldScene
bennewlin Apr 27, 2023
d70a72d
Merge pull request #20 from Spring-2023-CISC374/bn_beta_v3
RyanADahlke Apr 27, 2023
7cc377b
clean up unuse scene and add EndScene for beta use
boyuan1228 Apr 27, 2023
864efaf
Merge pull request #21 from Spring-2023-CISC374/clean_up_unuse_scene
boyuan1228 Apr 27, 2023
fcf3608
very minor commit, just fixed some errors
bennewlin Apr 27, 2023
dcebc91
Merge pull request #22 from Spring-2023-CISC374/bn_beta_refactor
bennewlin Apr 27, 2023
cc4caf5
change the pointer lines, fixed error for 1st dep
boyuan1228 Apr 27, 2023
503ddf6
Merge pull request #23 from Spring-2023-CISC374/fixed_error_4deploy
boyuan1228 Apr 27, 2023
3eb81be
Refactored text scenes, still need to do levels
bennewlin Apr 27, 2023
2f91bb6
Merge pull request #24 from Spring-2023-CISC374/bn_beta_refact_v2
bennewlin Apr 27, 2023
8f5d325
refact level scenes and make a preload 4 base scen
boyuan1228 Apr 28, 2023
84c25e4
Merge pull request #26 from Spring-2023-CISC374/refact_level_make_pre…
boyuan1228 Apr 28, 2023
41f71d7
add detal to tour, cuz get feedback from catfe
boyuan1228 Apr 29, 2023
c34e1c9
Merge pull request #27 from Spring-2023-CISC374/detail_tour
boyuan1228 Apr 29, 2023
f4615da
update ui
boyuan1228 Apr 29, 2023
a77d4bd
Merge pull request #28 from Spring-2023-CISC374/ui_1.0
boyuan1228 Apr 29, 2023
32a5a27
pre deploy
boyuan1228 Apr 29, 2023
611039f
little fix
boyuan1228 Apr 29, 2023
cb3f5cc
deleted unnecessary files, add funtion to levell
boyuan1228 May 4, 2023
bde4f8c
Merge pull request #29 from Spring-2023-CISC374/add_function_level1
boyuan1228 May 4, 2023
f7eec14
Trap Buttons implemented
RyanADahlke May 8, 2023
2431529
Button Traps implemented
RyanADahlke May 8, 2023
951a808
Merge pull request #30 from Spring-2023-CISC374/buttonTraps
RyanADahlke May 8, 2023
97c6155
Added level 3 and fixed some errors
bennewlin May 9, 2023
48ad57f
Merge pull request #31 from Spring-2023-CISC374/bn_cd_v1
bennewlin May 9, 2023
ce5fa40
add movie on start
boyuan1228 May 9, 2023
2ad88f1
Merge pull request #32 from Spring-2023-CISC374/refactor_debug_movie
boyuan1228 May 9, 2023
14853bb
fixed little bug on level2
boyuan1228 May 9, 2023
711155a
Merge pull request #33 from Spring-2023-CISC374/bug_fixed
boyuan1228 May 9, 2023
e67d0c4
change the tittle
boyuan1228 May 9, 2023
69d0f3e
Merge pull request #34 from Spring-2023-CISC374/web_name
boyuan1228 May 9, 2023
da3c0f8
updated-sprite
BinghongLiu May 10, 2023
ef56127
update
BinghongLiu May 10, 2023
87d7189
Fixed bu/sw bug and got rid of redundant code
bennewlin May 10, 2023
78858bd
Merge pull request #35 from Spring-2023-CISC374/bn_button_switch_test
bennewlin May 10, 2023
1ea73f2
updated
BinghongLiu May 10, 2023
28741c6
fixed level2 bug
boyuan1228 May 10, 2023
014c977
Merge pull request #36 from Spring-2023-CISC374/bug_fixed_l2
boyuan1228 May 10, 2023
e814002
update background
BinghongLiu May 10, 2023
c753396
Merge branch 'main' of https://github.com/Spring-2023-CISC374/group-p…
BinghongLiu May 10, 2023
7c645ca
final
BinghongLiu May 10, 2023
aaea3c8
fix video, bg, add warmup level
boyuan1228 May 15, 2023
79aa5fa
Merge pull request #37 from Spring-2023-CISC374/add_0_level
boyuan1228 May 15, 2023
a44e621
add arrow key on tour
boyuan1228 May 15, 2023
82ff0a1
Merge pull request #38 from Spring-2023-CISC374/litte_fix
boyuan1228 May 15, 2023
dedef7a
0213 the level order
boyuan1228 May 15, 2023
f129a8d
Merge pull request #39 from Spring-2023-CISC374/0213
boyuan1228 May 15, 2023
ef3d37a
Did tons of refactoring and spruced up the README
bennewlin May 18, 2023
d5aa6b8
Merge pull request #40 from Spring-2023-CISC374/bn_final_refactor
bennewlin May 18, 2023
c8e9512
Looks like level 0 works again
bennewlin May 19, 2023
6c8302f
Merge pull request #41 from Spring-2023-CISC374/bn_pleasegodhelpmefix…
bennewlin May 19, 2023
beb8a7f
lets see if this fixes l0 deploy
bennewlin May 19, 2023
deea463
Merge pull request #42 from Spring-2023-CISC374/bn_tries_something
bennewlin May 19, 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
6 changes: 6 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# don't ever lint node_modules
node_modules
# don't lint build output (make sure it's set to your correct build folder name)
dist
index.html
.eslintrc.cjs
20 changes: 20 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
module.exports = {
env: {
browser: true,
es2021: true,
},
extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended'],
overrides: [],
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
},
plugins: ['@typescript-eslint'],
rules: {
'@typescript-eslint/explicit-function-return-type': 0,
'@typescript-eslint/ban-ts-ignore': 0,
'@typescript-eslint/member-delimiter-style': 0,
'@typescript-eslint/no-explicit-any': 0,
},
}
52 changes: 52 additions & 0 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# This workflow will do a clean install of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Node.js CI

on:
push:
branches: [main]

jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
- id: get-repo-values
run: |
url=https://$(echo "${{github.repository}}" | sed "s/\//.github.io\//")
echo "::set-output name=url::$url"
- name: Update package.json homepage
uses: jossef/action-set-json-field@v1
with:
file: package.json
field: homepage
value: ${{ steps.get-repo-values.outputs.url }}
- run: npm ci
#- run: npm run lint
- run: npm run test -- --coverage |& tee ./public/test_report.txt
- run: echo "<html><head><meta http-equiv='refresh' content='0; URL=${{github.server_url}}/${{github.repository}}' /></head><body>Redirecting to repository</body></html>" > ./public/github.html
- run: npm run build --if-present

- name: Deploy
run: |
git config --global user.name ${user_name}
git config --global user.email ${user_email}
git remote set-url origin https://${github_token}@github.com/${repository}
npm run deploy
env:
user_name: "github-actions[bot]"
user_email: "github-actions[bot]@users.noreply.github.com"
github_token: ${{ secrets.GH_TOKEN }}
repository: ${{ github.repository }}
24 changes: 24 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist
dist-ssr
*.local

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
20 changes: 19 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
[![Open in Visual Studio Code](https://classroom.github.com/assets/open-in-vscode-c66648af7eb3fe8bc4f294546bfd86ef473780cde1dea487d3c4ff354943c9ae.svg)](https://classroom.github.com/online_ide?assignment_repo_id=10563170&assignment_repo_type=AssignmentRepo)
# group-game-project

This assignment is where you will submit your code for your MVP as well as the rest of the versions of your educational game.
Reflect:

Reflect is a 2D platformer who's goal is to teach the basics of college-level concepts to younger audiences! In particular, the game is meant to teach the basic ideas of parallelism.

Jump around, hit switches, step on buttons, and beat levels while thinking of multiple characters moving simultaneously!

The Reflect Team are:

Ryan Dalke:
Level Transitions, level resets and endings, interactables

Ben Newlin:
Lead level designer, platforming physics programming

Boyuan Yang:
Color, level transitions, level related

Bing Liu:
Character design, control input, possible sprite animations
30 changes: 30 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Reflect</title>
</head>

<body>
<div id="app"></div>
<script type="module" src="src/main.ts"></script>
</body>

</html>

<!DOCTYPE html>
<html>
<head>
<title>My Phaser Game</title>
<style>
body {
font-family: Arial, sans-serif;
}
</style>
</head>
<body>
<!-- Your game content here -->
</body>
</html>
Loading