Skip to content
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

Jump to bottom

what? #13

Open
wants to merge 240 commits into
base: master
Choose a base branch
from
Open

what? #13

wants to merge 240 commits into from

Conversation

zkfazal
Copy link

@zkfazal zkfazal commented Feb 11, 2020

huh

zkfazal and others added 30 commits January 30, 2020 09:35
@zkfazal
Sample Message
f5fb503
@zkfazal
Changed index.html to HW0 link
5bd648e
@zkfazal
Added everything needed for breakout template to work
a3ddf83
@zkfazal
Does this work? Hopefully get breakout to work.
3bb8c4c
@zkfazal
Does this work? Hopefully get breakout to work. Part 2
1a1926e
@zkfazal
Does this work? Hopefully get breakout to work. Part 3
7bb76af
@zkfazal
Something
6ea8427
@zkfazal
Something
358a810
@zkfazal
Update index.html
6d1fed2
@zkfazal
Yeet
4adb308
@zkfazal
Made it working
b5b7267
@zkfazal
Added initial Digital Assignment 2, Might Not Work Yet
452b3db
@zkfazal
Added initial Digital Assignment 2, Might Not Work Yet
36bca3b
@zkfazal
Added initial Digital Assignment 2, Might Not Work Yet
8a34aee
@zkfazal
Added initial Digital Assignment 2, Might Not Work Yet
3fe07de
@zkfazal
Added initial Digital Assignment 2, Might Not Work Yet
9b92048
@zkfazal
Changed planes.js
ab1e304
@zkfazal
Added initial Digital Assignment 2, Might Not Work Yet
b430348
@zkfazal
Changed planes.js A bit
a87ea7f
@zkfazal
Added initial Digital Assignment 2, Might Not Work Yet
0b9b7a5
@zkfazal
Changed planes.js again
d94ffd0
@zkfazal
Changed planes.js to add rotation for second plane
29e1669
@zkfazal
Added initial Digital Assignment 2, Might Not Work Yets
185f532
@zkfazal
Changed planes.js again!
fb1020b
@zkfazal
Changed planes.js to add rotation for second plane
1540457
@zkfazal
Changed planes.js to add rotation for second plane
d0b884a
@zkfazal
Hopefully planes are actually moving correctly now
7a8b23a
@zkfazal
Hopefully planes are actually moving correctly now
63412d6
@zkfazal
Added input
6690b23
@zkfazal
Added input
9cb1ee7
@zkfazal
Cleaning up house
e519318
@zkfazal
Deleted
858157c 
Tried rebasing. Idk if it worked.
@zkfazal
Cleaning up the house
a2b8d02
@zkfazal
Cleaning up house
bda0a2d
@zkfazal
Cleaning up house
d882e92
@zkfazal
Fixed Digital assignment 1
10e0ec5
@zkfazal
Added functionality to Digital Assignment 1
7f190e3
@zkfazal
Increased functionality to Digital Assignment 1
7afacac
@zkfazal
Deciding to work with Yoshi instead of Jack
118702f
@zkfazal
Improved yoshi animations. How will I get the collision boxes to work…
ae22e13 
… correctly?
@zkfazal
Removed some files
8f17c94
@zkfazal
Removed some unused dependencies. There is still a missing dependency…
41f2f79 
… somewhere, as evidenced by the green and black box. But where?
@zkfazal
Added workig yoshi movement
21ecb4f
@zkfazal
Yoshi animation bug found
0c8bdba
@zkfazal
Added collision detection
36ef22f
@zkfazal
Working collision with ground. Proper jump implemented
d49ea92
@zkfazal
Added DA 10. Fixed transition to end scene, so there's an actually pl…
b28e03c 
…ayable game
@zkfazal
Started from beginning, removed unnecessary files
4b91259
@zkfazal
Restarted the entire thing, and trying to get ES6 Webpack to work
8b681ff
@zkfazal
More changes for setting up
d0c5cc0
@zkfazal
Temp changes
22c92a9
@zkfazal
Fixed adding phasermattercollisionplugin issue
e2c0de9
@zkfazal
Added v0.2 and 0.3
130879b
@zkfazal
Working on 0.4 now, and adding animations and key combos
a1de323
@zkfazal
Added beginnings of StateMachine and will soon add player movement
ab5e9ac
@zkfazal
Added some more animation chains, but realizing that state machines w…
da49d7d 
…ere probably a bad idea
@zkfazal
Temp changes
4d74d62
@zkfazal
Punches now work, need to make it look smoother and add kick animatio…
4a7de18 
…ns, then make it transition between each other and idle and guard
@zkfazal
Merge branch 'master' of https://github.com/zkfazal/cs325-game-protot…
e43ee08 
…ypesidk an
@zkfazal
FIxed index.html....hopefully
d48f0d9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@zkfazal @yig