Skip to content

Complete interactive programming #3

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
vivienyuwenchen wants to merge 41 commits into
base: master
Choose a base branch
from
Open

Complete interactive programming #3

Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
2de033a
Create main game class
vivienyuwenchen Oct 18, 2017
7d4d56a
Jumping Dot That Moves Side To Side
hthomas60 Oct 19, 2017
7881c09
Add player and keyboard control
vivienyuwenchen Oct 19, 2017
a72aed8
Merge branch 'master' of https://github.com/vivienyuwenchen/Interacti…
vivienyuwenchen Oct 19, 2017
ae5ded3
Add player class, collision detection, and game over
vivienyuwenchen Oct 21, 2017
035bf5d
Added player summuned obsticals
Oct 22, 2017
860cf7c
Add stamina bar
vivienyuwenchen Oct 23, 2017
dd67c71
player two spawns obsticals at different hights
Oct 23, 2017
9f2156e
merged
Oct 23, 2017
a98883f
Ad project writeup and reflection
vivienyuwenchen Oct 24, 2017
41fc448
added player 2 stamia bar
Oct 24, 2017
757dba6
Merge branch 'master' of https://github.com/vivienyuwenchen/Interacti…
Oct 24, 2017
7bab5b1
Fix isCollide to work at different heights
vivienyuwenchen Oct 25, 2017
0ede561
Change restart game key to space bar
vivienyuwenchen Oct 26, 2017
3d5ef9d
Add docstrings and comments
vivienyuwenchen Oct 26, 2017
6b22ee8
Fixed stamina bar regeneration
Oct 28, 2017
d55ede1
Added score and changed endgame scene
Oct 29, 2017
a4057a2
Update project writeup and reflection
vivienyuwenchen Oct 29, 2017
c6a297c
Add screenshots of game
vivienyuwenchen Oct 30, 2017
522df62
Add screenshots of game
vivienyuwenchen Oct 30, 2017
ea85407
Update README.md
vivienyuwenchen Oct 30, 2017
734db7c
Update project writeup and reflection
vivienyuwenchen Oct 30, 2017
4edcbf7
Merge branch 'master' of https://github.com/vivienyuwenchen/Interacti…
vivienyuwenchen Oct 30, 2017
58d7c1b
Added Captions To figures
hthomas60 Oct 30, 2017
af2ed11
Fixed Caption Spacing
hthomas60 Oct 30, 2017
0f26809
Update inline comments
vivienyuwenchen Oct 30, 2017
c66f558
Merge branch 'master' of https://github.com/vivienyuwenchen/Interacti…
vivienyuwenchen Oct 30, 2017
dd5ea39
Replace Barleft with Bar
vivienyuwenchen Oct 30, 2017
f877988
Added Player reviews
hthomas60 Oct 30, 2017
a896506
Added Player reviews
hthomas60 Oct 30, 2017
20ba136
Added Player reviews
hthomas60 Oct 30, 2017
d33d9c2
Added Player reviews
hthomas60 Oct 30, 2017
4441f05
Added Player reviews
hthomas60 Oct 30, 2017
6a55531
Added Player reviews
hthomas60 Oct 30, 2017
5fb8cc9
Added Player reviews
hthomas60 Oct 30, 2017
ce5b8eb
Same
hthomas60 Oct 30, 2017
886ec96
Add UML diagram
vivienyuwenchen Oct 30, 2017
a8bfe17
Merge branch 'master' of https://github.com/vivienyuwenchen/Interacti…
vivienyuwenchen Oct 30, 2017
eea96f3
Add UML diagram
vivienyuwenchen Oct 30, 2017
b97a0c0
Update project writeup and reflection
vivienyuwenchen Oct 30, 2017
cea81cc
Revised for MP5 with suggestions from feedback and start menu
vivienyuwenchen Dec 10, 2017
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
Prev Previous commit
Next Next commit
Update README.md
  • Loading branch information
@vivienyuwenchen
vivienyuwenchen authored Oct 30, 2017
commit ea85407d4119f1b52696ab5b0f751d47b29b0f55
8 changes: 8 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# InteractiveProgramming

This is the base repo for the interactive programming project for Software Design at Olin College.

[Project Writeup and Reflection](https://github.com/vivienyuwenchen/InteractiveProgramming/blob/master/Project_Writeup_and_Reflection.md)

Required packages:
- pip install pygame

To run the game:
- python Game4.py