Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
886c239
Create intialstatement.md
Kovenwei Mar 22, 2016
acc61ab
Rename intialstatement.md to initialstatement.md
Kovenwei Mar 22, 2016
052c80b
Update initialstatement.md
Kovenwei Mar 22, 2016
ee03afa
Create initialprojectstatement.md
johnswanson3 Mar 22, 2016
efe27ea
Testing
Kovenwei Jun 14, 2016
e7d0b55
Create PCP
johnswanson3 Jun 14, 2016
d5cbd93
Delete PCP
johnswanson3 Jun 14, 2016
fd0f9c6
Create PCP.py
johnswanson3 Jun 14, 2016
79e3c46
Merge pull request #1 from Kovenwei/Koven-Wei
Kovenwei Jun 14, 2016
a4c3acb
Delete Koven's Part.py
Kovenwei Jun 14, 2016
f388188
created file
Kovenwei Jun 14, 2016
82b13c8
Delete mixtape_jump.py
Kovenwei Jun 14, 2016
310981e
File Creation
Kovenwei Jun 14, 2016
ee7f51f
Merge remote-tracking branch 'origin/master'
Kovenwei Jun 14, 2016
95cde66
Delete test.py
Kovenwei Jun 14, 2016
8cbc569
Merge pull request #2 from johnswanson3/John
Kovenwei Jun 14, 2016
a8b9434
Delete PCP.py
Kovenwei Jun 14, 2016
2ebd572
testing
Kovenwei Jun 14, 2016
6b3e321
Merge remote-tracking branch 'origin/Koven-Wei' into Koven-Wei
Kovenwei Jun 14, 2016
d885491
testing
Kovenwei Jun 14, 2016
1ed90d6
testing
Kovenwei Jun 14, 2016
c355b09
test1
johnswanson3 Jun 15, 2016
cbf82e1
Create initialprojectstatement.md
johnswanson3 Mar 22, 2016
37f8dc1
Create PCP
johnswanson3 Jun 14, 2016
6f8fd47
Delete PCP
johnswanson3 Jun 14, 2016
92839e9
Create PCP.py
johnswanson3 Jun 14, 2016
2975f10
File Creation
Kovenwei Jun 14, 2016
40be644
Delete test.py
Kovenwei Jun 14, 2016
ec2a506
Delete PCP.py
Kovenwei Jun 14, 2016
9c53f56
Merge pull request #3 from Kovenwei/John
Kovenwei Jun 15, 2016
84dd262
test2
johnswanson3 Jun 15, 2016
726f2db
OKOKOKOKO
Kovenwei Jun 15, 2016
1e8a3da
Merge pull request #4 from Kovenwei/John
Kovenwei Jun 15, 2016
0751808
Merge branch 'master' into Koven-Wei
Kovenwei Jun 15, 2016
04aec1f
Merge branch 'Koven-Wei'
Kovenwei Jun 15, 2016
10537e8
Test1
YutaroM Jun 15, 2016
a565c56
Merge remote-tracking branch 'origin/master'
Kovenwei Jun 15, 2016
1cc86df
class widgetdrawer
YutaroM Jun 15, 2016
c086404
Added imports
Kovenwei Jun 15, 2016
219b4cf
imports
johnswanson3 Jun 15, 2016
fdcc17b
Merge remote-tracking branch 'remotes/origin/master' into Koven-Wei
Kovenwei Jun 15, 2016
71d3467
Merge remote-tracking branch 'remotes/origin/master' into Koven-Wei
Kovenwei Jun 15, 2016
327afed
Created widgetdrawer class, initialized, determined size of widget
YutaroM Jun 15, 2016
cfd37d1
Created class GUI(widget)
Kovenwei Jun 15, 2016
87fa751
imports and my code
johnswanson3 Jun 15, 2016
2f28a4f
Merge remote-tracking branch 'remotes/origin/master' into Koven-Wei
Kovenwei Jun 15, 2016
0c4e729
created clas widgetdrawer, initialized widget sizes and movement, cen…
YutaroM Jun 15, 2016
6904c1a
Created check score function
Kovenwei Jun 15, 2016
b33a0d3
Merge remote-tracking branch 'remotes/origin/master' into Koven-Wei
Kovenwei Jun 15, 2016
538cb9b
acidentally added yutaro's
Kovenwei Jun 15, 2016
e9a45e5
fixed self placement
Kovenwei Jun 15, 2016
f5a45b5
my code with yutaro
johnswanson3 Jun 15, 2016
df048f1
Created next function add rapper and fixed def check_score placement
Kovenwei Jun 15, 2016
e382b7c
Created function addrapper(self)
Kovenwei Jun 15, 2016
26f2052
Merge branch 'Koven-Wei'
Kovenwei Jun 15, 2016
edffe3f
Created function on_touch_down(self,touch)
Kovenwei Jun 15, 2016
862ad67
Added a few docstrings
Kovenwei Jun 15, 2016
a9aa1fc
Added a few docstrings
Kovenwei Jun 15, 2016
2a63e3d
Merge branch 'Koven-Wei'
Kovenwei Jun 15, 2016
16b3a0b
Added function update(self,dt)
Kovenwei Jun 15, 2016
10896df
Added function update(self,dt)
Kovenwei Jun 15, 2016
cfc59a2
Merge remote-tracking branch 'remotes/origin/master' into Koven-Wei
Kovenwei Jun 15, 2016
769c149
Created class ClientApp(App)
Kovenwei Jun 15, 2016
afdb25b
Created class ClientApp(App)
Kovenwei Jun 15, 2016
e2d0745
Merge branch 'Koven-Wei'
Kovenwei Jun 15, 2016
024df64
fixing merging error
Kovenwei Jun 15, 2016
729791e
Merge branch 'Koven-Wei'
Kovenwei Jun 15, 2016
38bd4f2
my code with Kovens for merge
johnswanson3 Jun 15, 2016
c7d3f1e
Merge branch 'master' into John
Kovenwei Jun 15, 2016
7f15bff
Merge pull request #10 from Kovenwei/John
Kovenwei Jun 15, 2016
acafc8a
added a return docstring to the init function under misxtape
johnswanson3 Jun 15, 2016
df987ed
adding velocity to the rapper heads
YutaroM Jun 16, 2016
a5354ef
Making sure the rapper heads can now move
YutaroM Jun 16, 2016
eb0df23
Added docstrings, comments and white space
YutaroM Jun 16, 2016
5bd4390
added docstrings, comments and white space
YutaroM Jun 16, 2016
e79f489
Fixed some merging conflicts
Kovenwei Jun 16, 2016
94a03b6
Added images
Kovenwei Jun 16, 2016
ec875c8
instructions
Kovenwei Jun 16, 2016
f541515
Create GANTTERLINK
Kovenwei Jun 16, 2016
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 .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions GANTTERLINK
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
GANT CHART LINK

https://drive.google.com/a/ycdsbk12.ca/file/d/0ByQKAYunrGpnVF9WV2RtNXhXaVk/view?usp=sharing
Binary file added Photoshopped/image1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Photoshopped/image2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Photoshopped/image3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Photoshopped/image4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Photoshopped/image5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Photoshopped/image6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Photoshopped/image7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Photoshopped/mmixtape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions initialprojectstatement.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Initial Project Statement

## Objective
Simple 2D side-scrolling platformer with various obstacles such as bots and terrain using unity and c#

## Motivations
Our motivation comes from the simplicity a platformer gives as well as the side scrolling possibility that gives a platform its unique appearance. We chose to create a platformer because it is one of the main genres of gaming which dwells on the curiosity we had in our childhood on the gameplay and now with our developing abilities with code, we can further our understanding of games and break the creation down to our understanding.

## Languages
C# and Unity

## Technology
We plan on using monodevelop or visual studio for coding in c#
to design the game we will use unity.

## Benefits
How will you benefit from this project?
We will learn to code in c# and further develop our passion for computer science and game programing. Hopefully, this project will open our minds to the various applications for computer science in our daily and professional lives.

## Foreseeable Challenges
- Learning a new programming language
- Artwork for the game
- Debugging the game
- Creating the basic foundation of its functionality
- Time management



## High-Level Learning & Action Outline
* Brainstorm application functionality - 1 Week
* Learn C# and Unity - 5 Weeks
* Application Mock-Ups - 1 Week
* Development - 6 Weeks
* Testing & Fixing - 1 Week
* Documentation - 1 Week
39 changes: 39 additions & 0 deletions initialstatement.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Initial Project Statement

## Objective
Simple 2D side-scrolling platformer with various obstacles such as bots and terrain using unity and c#

## Motivations
Our motivation comes from the simplicity a platformer gives as well as the side scrolling possibility that gives a platform its unique appearance. We chose to create a platformer because it is one of the main genres of gaming which dwells on the curiosity we had in our childhood on the gameplay and now with our developing abilities with code, we can further our understanding of games and break the creation down to our understanding.

## Languages
C# and Unity

## Technology
We plan on using monodevelop or visual studio for coding in c#
to design the game we will use unity.

## Benefits
How will you benefit from this project?
We will learn to code in c# and further develop our passion for computer science and game programing. Hopefully, this project will open our minds to the various applications for computer science in our daily and professional lives.

## Foreseeable Challenges
- Learning a new programming language
- Artwork for the game
- Debugging the game
- Creating the basic foundation of its functionality
- Time management

## High-Level Learning & Action Outline
* Brainstorm application functionality - 1 Week
* Learn C# and Unity - 5 Weeks
* Application Mock-Ups - 1 Week
* Development - 6 Weeks
* Testing & Fixing - 1 Week
* Documentation - 1 Week

##Members
- Koven Wei
- John Han
- Yutaro Miyata
- Matthew Hope
8 changes: 8 additions & 0 deletions instructions.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
In class GUI
for def __init__ and def addrapper, you have to specify the file path in the code (line 172, line 191)

e.g for

'C:\Users\Koven\desktop\photoshopped\image'+str(imageNumber)+'.png'

Specify wherever the photoshopped folder is which is in the repository
Loading