Skip to content

Aaron #2

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

Aaron #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
429dc47
Merge branch 'master' into jamesBranch
jralston64 Apr 19, 2016
05079d7
created profile
kchumbley Apr 29, 2016
b6dbee2
Merge branch 'master' into jamesBranch
jralston64 Apr 29, 2016
a624bea
Merge remote-tracking branch 'origin/kevsbranch' into jamesBranch
jralston64 Apr 29, 2016
fb9c3f6
Unit test for GameCharacter
clarkanine Apr 29, 2016
a72ace9
Merge branch 'master' into kevsbranch
kchumbley Apr 29, 2016
103bcae
Merge remote-tracking branch 'origin/aaron' into jamesBranch
jralston64 Apr 29, 2016
7f64292
descpit
jralston64 Apr 29, 2016
da6546e
Renamed PlayerCharacter to ConcreteGameCharacter
clarkanine Apr 29, 2016
ce99975
Merge branch 'aaron' into jamesBranch
jralston64 Apr 29, 2016
a3cd458
Merge remote-tracking branch 'origin/kevsbranch' into aaron
clarkanine Apr 29, 2016
aeab641
In the process of completing ConcretePlayer.java
clarkanine May 1, 2016
6dc7c26
Changed some doubles to ints, made unit test for GamePlayer.
clarkanine May 1, 2016
7ebe312
Committing new knight stuff
clarkanine May 1, 2016
c79ef45
game enemy and snake classes
jralston64 May 1, 2016
6b5324f
KnightPlayer.java has been created.
clarkanine May 1, 2016
83c31e9
Merge branch 'aaron' into jamesBranch
clarkanine May 1, 2016
0353ac3
I've got jamesBranch now
clarkanine May 1, 2016
9d7c820
Merge remote-tracking branch 'origin/jamesBranch' into aaron
clarkanine May 1, 2016
d089410
Merge branch 'aaron' into jamesBranch
clarkanine May 1, 2016
2d03c35
Removed KnightPlayer.java that was in the wrong directory
clarkanine May 2, 2016
ae40290
Merge branch 'aaron' into kevsbranch
kchumbley May 2, 2016
a1ac0ee
some more work finished on map state and profiles as well as merged work
kchumbley May 2, 2016
72831a0
knight added to gameCharacter pack
clarkanine May 3, 2016
ba3fd24
Merge branch 'kevsbranch' into aaron
clarkanine May 3, 2016
5fea1f4
Working on AttackBehavior
clarkanine May 3, 2016
9f3e6f2
added some gui throughout
kchumbley May 6, 2016
68a0ca0
Made thief and peasant. In the process of editting heirarchies for be…
clarkanine May 7, 2016
c22582a
Merge branch 'kevsbranch' into aaron
clarkanine May 7, 2016
70be116
Merge branch 'aaron' of
kchumbley May 7, 2016
a768b8b
added characterPack_Aaron into gameEntityPack
clarkanine May 24, 2016
7b6dead
GUI stuff updated
kchumbley May 24, 2016
beb8335
Merge remote-tracking branch 'origin/aaron' into kevsbranch
kchumbley May 24, 2016
654d8d2
don't break please
clarkanine Jun 3, 2016
2f146ca
gui stuff ++++++
kchumbley Jun 3, 2016
00bc112
Friday commit
clarkanine Jun 3, 2016
2fefcc4
Merge branch 'aaron' into kevsbranch
kchumbley Jun 3, 2016
3448a7e
basic map switching and entity population +++kevZZZ
kchumbley Jun 4, 2016
5370995
more changes uhg
kchumbley Jun 4, 2016
cb8da83
more changes to kind of help ensure system stability.
kchumbley Jun 5, 2016
20daafd
testing comit
clarkanine Jun 5, 2016
279fd74
test commit
clarkanine Jun 5, 2016
8d8d7d9
Merge remote-tracking branch 'origin/kevsbranch' into aaron
clarkanine Jun 5, 2016
5f673bf
hopefully this is pretty much it
kchumbley Jun 6, 2016
a0a8666
merging with kevin...
clarkanine Jun 6, 2016
7b6f914
Merge branch 'kevsbranch' of https://github.com/clarkanine/softwareEn…
clarkanine Jun 6, 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
2 changes: 0 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@

*.classpath
*.idea
*.project
*.eml
*.iml
*TestLogs
*bin
Binary file added GameFromAaron.zip
View file
Open in desktop
Binary file not shown.
60 changes: 0 additions & 60 deletions MineSweeper/ReadMe.txt
View file
Open in desktop

This file was deleted.

220 changes: 0 additions & 220 deletions MineSweeper/input.txt
View file
Open in desktop

This file was deleted.

60 changes: 0 additions & 60 deletions MineSweeperkev/ReadMe.txt
View file
Open in desktop

This file was deleted.

220 changes: 0 additions & 220 deletions MineSweeperkev/input.txt
View file
Open in desktop

This file was deleted.

17 changes: 17 additions & 0 deletions SoftwareEngineeringGame/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>SoftwareEngineeringGame</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
25 changes: 25 additions & 0 deletions SoftwareEngineeringGame/Backgrounds/DefaultPlayerAscii
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

ND
MMMMMM
NMMMMMMN
NMMMMMM
NMMMMMMMMMMMMMN
MMMM8I,. MMMMN
MMM: 8MMMMMN
IMM: NMMZ MM
MMM MMND?
MMM +DDNNND
NMM
MMM
MMM
DD MMMMMM$
$MMMZ ,MMO NMMMN
.MMMM~ 8MM MMM
.MMMMM MMM
:D MM8
MM
8MM
ZMMMD
DMMM


34 changes: 34 additions & 0 deletions SoftwareEngineeringGame/Backgrounds/WorldMapAscii
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@

. ... .......... ... .
.. . . .. ....... . ......... .
............ . . . ... ..... ....... ..... ..........................
................... . .. .. ........................................
. ........... .. . . . . ............................... .
..................... . ......................... ....... .
................ ..........................................
.......... . ..... .... .... .... .. .......................
............... ... . ... . ... .......................
.............. . .. ...... ..................... . ..
............ ........ . ...........................
.... ................... .......................
... ................ ...... ................
... . . ................. ...... ..... ....
... ................... ... .. ...
................... . . ..
....... .................... . .
......... ............ .. ..
............ ....... ... . .. . .
............... ......... . ...
.............. ......... . .
............ ......... .. .
.......... ........ .. .......
.......... ...... . ...........
...... ...... .............
....... .... ............
.... . ....
... .
... .
..
.


Loading