search

zbaker94 / GameDesign_spring15_FinalProject

Final project for game design class at KSU fall 2015.
0 stars 0 forks source link

Randomness in my pull requests #11

Open wallace989 opened 9 years ago

wallace989 commented 9 years ago

randomness

wallace989 commented 9 years ago

Here is the file you requested

On Wed, Apr 15, 2015 at 1:25 PM, Ryan Southern notifications@github.com wrote:

Closed #11 https://github.com/zbaker94/GameDesign_spring15_FinalProject/issues/11.

— Reply to this email directly or view it on GitHub https://github.com/zbaker94/GameDesign_spring15_FinalProject/issues/11#event-282328501 .

From 8d9d154cc2510220564af2e876311ccf1b7933aa Mon Sep 17 00:00:00 2001 From: Brett Wallace bwalla989@gmail.com Date: Wed, 15 Apr 2015 16:25:55 -0400 Subject: [PATCH] Added a custom 8 bit style Cathedral image

.../images/FranceCathedral.jpg | Bin 0 -> 3888 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/images/FranceCathedral.jpg

diff --git a/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/images/FranceCathedral.jpg b/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/images/FranceCathedral.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5ce41e4f4cac81b9d28c51b7fab489805c098c52 GIT binary patch literal 3888 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 U?u$Wr6K8hEFgE(N}e_KFaFF_S^xk5

literal 0 HcmV?d00001

1.9.5.msysgit.0

From d2279e26b0afb728db979c746039753c4427f596 Mon Sep 17 00:00:00 2001 From: Brett Wallace bwalla989@gmail.com Date: Wed, 15 Apr 2015 16:25:13 -0400 Subject: [PATCH] Replaced bomb image

.../images/bomb.png | Bin 0 -> 2683 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/images/bomb.png

diff --git a/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/images/bomb.png b/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/images/bomb.png new file mode 100644 index 0000000000000000000000000000000000000000..f7df0c6704279719b481399bea603f120bde9ffc GIT binary patch literal 2683 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

literal 0 HcmV?d00001

1.9.5.msysgit.0

From f3234c08be348d84a4aaa8f281b71d8b4b501a1d Mon Sep 17 00:00:00 2001 From: Brett Wallace bwalla989@gmail.com Date: Wed, 15 Apr 2015 16:24:24 -0400 Subject: [PATCH] Made changes to various images

.../project.greenfoot | 97 +++++++++++++--------- 1 file changed, 60 insertions(+), 37 deletions(-)

diff --git a/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/project.greenfoot b/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/project.greenfoot index c84b624..0c3b34d 100644 --- a/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/project.greenfoot
+++ b/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/project.greenfoot
@@ -4,12 +4,13 @@

=a635364b685898461ef09e03125948e3f1b22a77 class.Ammo.image=ammo.png class.Ammo.superclass=greenfoot.Actor -class.Bomb.image=skull.png +class.Bomb.image=bomb.png class.Bomb.superclass=greenfoot.Actor class.Bullet.image=blue-draught.png class.Bullet.superclass=Mover -class.Cathedral.image=St_Peters_Italy.png +class.Cathedral.image=dome.png class.Cathedral.superclass=greenfoot.Actor +class.Counter.superclass=greenfoot.Actor class.Country.image=smiley5.png class.Country.superclass=greenfoot.World class.Enemy.image=Police1.png @@ -93,6 +94,15 @@ dependency29.type=UsesDependency dependency3.from=France dependency3.to=Cathedral dependency3.type=UsesDependency +dependency30.from=Bomb +dependency30.to=Explosion +dependency30.type=UsesDependency +dependency31.from=Player +dependency31.to=Bomb +dependency31.type=UsesDependency +dependency32.from=Country +dependency32.to=Counter +dependency32.type=UsesDependency dependency4.from=Enemy dependency4.to=France dependency4.type=UsesDependency @@ -112,17 +122,17 @@ dependency9.from=Player dependency9.to=Enemy dependency9.type=UsesDependency mainWindow.height=807 -mainWindow.width=1440 -mainWindow.x=-1592 -mainWindow.y=33 -package.numDependencies=29 -package.numTargets=12 +mainWindow.width=1075 +mainWindow.x=-1498 +mainWindow.y=28 +package.numDependencies=32 +package.numTargets=13 project.charset=UTF-8 simulation.speed=50 target1.editor.height=810 target1.editor.width=960 -target1.editor.x=72 -target1.editor.y=75 +target1.editor.x=-948 +target1.editor.y=76 target1.height=50 target1.name=Bullet target1.naviview.expanded=false @@ -132,45 +142,58 @@ target1.typeParameters= target1.width=80 target1.x=10 target1.y=190 -target10.editor.height=810 +target10.editor.height=1032 target10.editor.width=960 target10.editor.x=0 -target10.editor.y=23 +target10.editor.y=0 target10.height=50 -target10.name=Country +target10.name=Enemy target10.naviview.expanded=true target10.showInterface=false target10.type=ClassTarget target10.typeParameters= target10.width=80 -target10.x=70 -target10.y=10 +target10.x=160 +target10.y=70 target11.editor.height=810 target11.editor.width=960 -target11.editor.x=226 -target11.editor.y=23 +target11.editor.x=-1760 +target11.editor.y=141 target11.height=50 -target11.name=France +target11.name=Country target11.naviview.expanded=true target11.showInterface=false target11.type=ClassTarget target11.typeParameters= target11.width=80 -target11.x=160 +target11.x=70 target11.y=10 -target12.editor.height=564 -target12.editor.width=669 -target12.editor.x=-1407 -target12.editor.y=52 +target12.editor.height=810 +target12.editor.width=960 +target12.editor.x=226 +target12.editor.y=23 target12.height=50 -target12.name=Bomb +target12.name=France target12.naviview.expanded=true target12.showInterface=false target12.type=ClassTarget target12.typeParameters= target12.width=80 -target12.x=190 -target12.y=250 +target12.x=160 +target12.y=10 +target13.editor.height=818 +target13.editor.width=755 +target13.editor.x=-1743 +target13.editor.y=93 +target13.height=50 +target13.name=Bomb +target13.naviview.expanded=false +target13.showInterface=false +target13.type=ClassTarget +target13.typeParameters= +target13.width=80 +target13.x=190 +target13.y=250 target2.editor.height=700 target2.editor.width=900 target2.editor.x=540 @@ -186,8 +209,8 @@ target2.x=100 target2.y=190 target3.editor.height=1032 target3.editor.width=960 -target3.editor.x=960 -target3.editor.y=0 +target3.editor.x=-1852 +target3.editor.y=20 target3.height=50 target3.name=Player target3.naviview.expanded=true @@ -212,8 +235,8 @@ target4.x=100 target4.y=250 target5.editor.height=810 target5.editor.width=1440 -target5.editor.x=-86 -target5.editor.y=56 +target5.editor.x=141 +target5.editor.y=40 target5.height=50 target5.name=Cathedral target5.naviview.expanded=false @@ -262,18 +285,18 @@ target8.typeParameters= target8.width=80 target8.x=190 target8.y=130 -target9.editor.height=1032 -target9.editor.width=960 -target9.editor.x=0 -target9.editor.y=0 +target9.editor.height=700 +target9.editor.width=900 +target9.editor.x=-1835 +target9.editor.y=56 target9.height=50 -target9.name=Enemy -target9.naviview.expanded=true +target9.name=Counter +target9.naviview.expanded=false target9.showInterface=false target9.type=ClassTarget target9.typeParameters= target9.width=80 -target9.x=160 -target9.y=70 +target9.x=10 +target9.y=310 version=2.6.0

world.lastInstantiated=France

1.9.5.msysgit.0

From 55045627ad7adc41376837a41b4dc7c39f203681 Mon Sep 17 00:00:00 2001 From: Brett Wallace bwalla989@gmail.com Date: Wed, 15 Apr 2015 16:23:38 -0400 Subject: [PATCH] Edits to counter

.../Counter.java | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Counter.java

diff --git a/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Counter.java b/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Counter.java new file mode 100644 index 0000000..ee734e7 --- /dev/null +++ b/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Counter.java
@@ -0,0 +1,57 @@ +import greenfoot.; // (World, Actor, GreenfootImage, and Greenfoot) + +import java.awt.Color; +import java.awt.Graphics; + +/*

From 3f9ab873f54f8e96ef1fcad06028949015a0eab7 Mon Sep 17 00:00:00 2001 From: Brett Wallace bwalla989@gmail.com Date: Wed, 15 Apr 2015 16:22:30 -0400 Subject: [PATCH] Reworked WASD controls E should place bomb

.../Player.java | 35 ++++++++++++++++++---- 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Player.java b/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Player.java index 941e0ed..1a2099d 100644 --- a/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Player.java
+++ b/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Player.java
@@ -1,5 +1,6 @@ import greenfoot.; import javax.swing.JOptionPane; +import java.util.List; /*

1.9.5.msysgit.0

From 1d3c8e7de043d24de76c9a3f73752d2c85d195d8 Mon Sep 17 00:00:00 2001 From: Brett Wallace bwalla989@gmail.com Date: Wed, 15 Apr 2015 16:21:40 -0400 Subject: [PATCH] Added WASD style controls also E places a bomb

Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Player.ctxt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Player.ctxt b/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Player.ctxt index 8d0b5b2..0982749 100644 --- a/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Player.ctxt
+++ b/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Player.ctxt
@@ -14,4 +14,7 @@ comment5.params= comment5.target=void\ shoot() comment6.params= comment6.target=void\ die() -numComments=7 +comment7.params= +comment7.target=void\ bomb() +comment7.text=\r\n\ Place\ bombs.\r\n

+numComments=8

1.9.5.msysgit.0

From c3f9421875d66124cba7ec157722328cd137312d Mon Sep 17 00:00:00 2001 From: Brett Wallace bwalla989@gmail.com Date: Wed, 15 Apr 2015 16:21:04 -0400 Subject: [PATCH] Made some changes to bomb class

Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Bomb.ctxt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Bomb.ctxt b/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Bomb.ctxt index 7bea0e3..c780b6a 100644 --- a/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Bomb.ctxt
+++ b/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Bomb.ctxt
@@ -1,5 +1,7 @@

BlueJ class context

comment0.params= -comment0.target=void\ act() -comment0.text=\r\n\ Act\ -\ do\ whatever\ the\ Bomb\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n -numComments=1 +comment0.target=Bomb() +comment1.params= +comment1.target=void\ act() +comment1.text=\r\n\ Act\ -\ do\ whatever\ the\ Bomb\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n

+numComments=2

1.9.5.msysgit.0

From 877bfb3d3bc0eabed6c9bf5a5564c0bf84f01b03 Mon Sep 17 00:00:00 2001 From: Brett Wallace bwalla989@gmail.com Date: Wed, 15 Apr 2015 16:19:57 -0400 Subject: [PATCH] put comment tags on public Cathedral(String img) so that it would comple

.../DESTROYING THE GREAT CATHEDRALS OF EUROPE/Cathedral.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Cathedral.java b/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Cathedral.java index 0d1b718..6edd106 100644 --- a/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Cathedral.java +++ b/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Cathedral.java @@ -19,13 +19,13 @@ public class Cathedral extends Actor }

 public Cathedral(String img){

-<<<<<<< HEAD

-=======

->>>>>>> a635364b685898461ef09e03125948e3f1b22a77 + }

 /**

1.9.5.msysgit.0

From 3300a9e4ccebab5698dcd8b4757075a607fbac91 Mon Sep 17 00:00:00 2001 From: Brett Wallace bwalla989@gmail.com Date: Wed, 15 Apr 2015 16:18:36 -0400 Subject: [PATCH] Made a counter class havenet got it to work yet

.../Counter.ctxt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Counter.ctxt

diff --git a/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Counter.ctxt b/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Counter.ctxt new file mode 100644 index 0000000..face90f --- /dev/null +++ b/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Counter.ctxt
@@ -0,0 +1,15 @@ +#BlueJ class context +comment0.params= +comment0.target=Counter() +comment1.params=prefix +comment1.target=Counter(java.lang.String) +comment2.params= +comment2.target=void\ act() +comment3.params=value +comment3.target=void\ set(java.lang.String) +comment4.params= +comment4.target=java.lang.String\ getValue() +comment5.params= +comment5.target=void\ updateImage() +comment5.text=\r\n\ Update\ the\ image.\r\n

+numComments=6

1.9.5.msysgit.0

From 2b1ffe22b0eb35ac4d2fab1f787cfb41be595544 Mon Sep 17 00:00:00 2001 From: Brett Wallace bwalla989@gmail.com Date: Wed, 15 Apr 2015 12:34:00 -0400 Subject: [PATCH] More changes to bomb class

.../Bomb.java | 20 ++ .../project.greenfoot | 288 ++++++--------------- 2 files changed, 96 insertions(+), 212 deletions(-)

diff --git a/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Bomb.java b/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Bomb.java index 773f128..9299123 100644 --- a/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Bomb.java
+++ b/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Bomb.java
@@ -8,6 +8,18 @@ import greenfoot.; // (World, Actor, GreenfootImage, Greenfoot and MouseInfo) / public class Bomb extends Actor {

From d6bddf964a759198c1e1ad0ee989da9ed5ed5d10 Mon Sep 17 00:00:00 2001 From: Brett Wallace bwalla989@gmail.com Date: Wed, 15 Apr 2015 12:31:49 -0400 Subject: [PATCH] used the in class example for the bomb with a timer and damage modifier

Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Bomb.ctxt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Bomb.ctxt b/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Bomb.ctxt index 71a0e6c..7bea0e3 100644 --- a/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Bomb.ctxt
+++ b/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Bomb.ctxt
@@ -1,5 +1,5 @@

BlueJ class context

comment0.params= comment0.target=void\ act() -comment0.text=\n\ Act\ -\ do\ whatever\ the\ Bomb\ wants\ to\ do.\ This\ method\ is\ called\ whenever\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\n +comment0.text=\r\n\ Act\ -\ do\ whatever\ the\ Bomb\ wants\ to\ do.\ This\ method\ is\ called\ whenever\r\n\ the\ 'Act'\ or\ 'Run'\ button\ gets\ pressed\ in\ the\ environment.\r\n

numComments=1

1.9.5.msysgit.0

From a635364b685898461ef09e03125948e3f1b22a77 Mon Sep 17 00:00:00 2001 From: unknown dblack20@bellsouth.net Date: Thu, 2 Apr 2015 15:13:43 -0400 Subject: [PATCH] I have combined Brett's work with mine and added some notes for review by the group. This is due tomorrow midnight. The unused text is at the bottom. ONly the first 2.5 pages are for submission.

Documents/Pitch Document ver 1a.docx | Bin 0 -> 19696 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Documents/Pitch Document ver 1a.docx

diff --git a/Documents/Pitch Document ver 1a.docx b/Documents/Pitch Document ver 1a.docx new file mode 100644 index 0000000000000000000000000000000000000000..baa34041960ec93967c78d54e72e5b7fff177d1f GIT binary patch literal 19696 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%0DM3Y~7fh9?^r%60sdwf3adEM4k;ogy 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

literal 0 HcmV?d00001

1.9.5.msysgit.0

From fb8f5582bb33c0bb40da49b16bb931459527c7d7 Mon Sep 17 00:00:00 2001 From: Zack Baker zbaker94@gmail.com Date: Thu, 26 Mar 2015 16:32:01 -0400 Subject: [PATCH] add destroy cathedral when player walks over it

.../Cathedral.java | 5 +- .../Enemy.java | 4 +- .../EnemyBullet.java | 2 +- .../Explosion.ctxt | 5 ++ .../France.ctxt | 4 +- .../France.java | 3 ++ .../Player.java | 22 ++------- .../project.greenfoot | 54 ++++------------------ 8 files changed, 29 insertions(+), 70 deletions(-) create mode 100644 Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Explosion.ctxt

diff --git a/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Cathedral.java b/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Cathedral.java index f8b5d67..c05d07b 100644 --- a/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Cathedral.java +++ b/Scenario/DESTROYING THE GREAT CATHEDRALS OF EUROPE/Cathedral.java @@ -10,7 +10,7 @@ public class Cathedral extends Actor { public Cathedral(){

setImage("St_Peters_Italy.png");

- }

ryansouthern commented 9 years ago

can you try this?

http://stackoverflow.com/questions/16800280/how-to-interactively-visually-resolve-conflicts-in-sourcetree-git

wallace989 commented 9 years ago

I had all of those settings already

On Wed, Apr 15, 2015 at 10:07 PM, Ryan Southern notifications@github.com wrote:

can you try this?

http://stackoverflow.com/questions/16800280/how-to-interactively-visually-resolve-conflicts-in-sourcetree-git

— Reply to this email directly or view it on GitHub https://github.com/zbaker94/GameDesign_spring15_FinalProject/issues/11#issuecomment-93617872 .