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

Proj01 #78

Merged
merged 22 commits into from
Mar 9, 2018
Merged

Proj01 #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d48690c
removed javadoc from gitignore
Feb 9, 2018
1c8725f
Javadoc fix
Feb 9, 2018
c47e17d
docs
Feb 9, 2018
5248629
Set theme jekyll-theme-cayman
Aregluss Feb 9, 2018
c475163
javadocs link added
Aregluss Feb 9, 2018
98a9007
AN javadoc update
Feb 15, 2018
0cfb06a
AN/VC javadoc fixes
Feb 16, 2018
0309a96
deleted docs
Feb 16, 2018
56d7f83
VC/ added gameover audio
Feb 23, 2018
da11b27
AN Pacman turning fixed to 'buffer' imput
Feb 26, 2018
e1307fd
AN Javadocs added back in
Feb 26, 2018
d4abd49
Merge pull request #1 from Aregluss/moveBuffer
Aregluss Feb 26, 2018
ae67c49
speed
Feb 26, 2018
29d4313
speed
Feb 26, 2018
6b71b8b
ghost speed decrease when pacman empowered
Feb 26, 2018
83d2e00
AN flashing + newGost color
Feb 26, 2018
f07bf55
mess message
Feb 26, 2018
7319462
fixed leaderboard text
Mar 1, 2018
3d49cf4
Merge pull request #2 from Aregluss/gameover
Mar 1, 2018
ea427cc
flashing
Mar 1, 2018
84cd0e8
Merge branch 'proj01' into playtest
Aregluss Mar 1, 2018
5cba7f2
Merge pull request #3 from Aregluss/playtest
Aregluss Mar 1, 2018
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: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ highScores.txt
# Package Files #
*.war
*.ear
javadoc

1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Pac-Man game, starting with code from http://zetcode.com/tutorials/javagamestuto
![Screenshot Of Pacman Main Menu](http://i.imgur.com/TODmNes.png)

**Documentation**
* Current version of javadocs at: https://aregluss.github.io/cs56-games-pacman/
* PacMan.java contains the `main` function and is the JFrame that displays the game.
* Game controls are documented in the help menu of the game.
* Most of the basic game functionality (start game, end game, collision detection, etc.) is in Board.java, which is the main JPanel where the game is displayed.
Expand Down
Binary file modified assets/ghostblue.png
View file
Open in desktop
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 assets/ghostblue2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 5 additions & 23 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@
<property environment="env"/> <!-- load the environment variables -->
<property name="projectPackage" value="edu.ucsb.cs56.projects.games.pacman" />
<property name="out.assets.dir" value="build/edu/ucsb/cs56/projects/games/pacman/assets" />
<property name="webRoot" value="${env.HOME}/public_html/cs56" />
<property name="webBaseURL" value="http://www.cs.ucsb.edu/~${env.USER}/cs56" />
<property name="projectName" value="cs56-games-pacman" />
<property name="javadocDest" value="${webRoot}/${projectName}/javadoc" />
<property name="javadocURL" value="${webBaseURL}/${projectName}/javadoc" />
<property name="javadocDest" value="$docs/javadoc" />
<property name="javadocLink" value="http://java.sun.com/javase/7/docs/api/" />
<path id="project.class.path">
<pathelement location="./build"/>
Expand Down Expand Up @@ -53,29 +50,14 @@
</target>

<target name="javadoc" depends="compile" description="Generate/publish javadoc.">
<delete dir="javadoc" quiet="true" />
<javadoc destdir="javadoc" author="true" version="true" use="true" >
<delete dir="docs/javadoc" quiet="true" />
<javadoc destdir="docs" author="true" version="true" use="true" >
<!-- destdir changed from javadoc to docs-->
<fileset dir="src" includes="**/*.java"/>
<classpath refid="project.class.path" />
<link href="${javadocLink}" /> <!-- for external links to std API classes -->
</javadoc>

<!-- delete the old javadoc -->
<delete quiet="true" dir="${javadocDest}" />

<!-- copy everything you just made to the javadoc destination,
and then make it readable -->
<copy todir="${javadocDest}" >
<fileset dir="javadoc"/>
</copy>

<!-- Note: this only does the chmod command on the javadoc
subdirectory and its contents. You MIGHT have to MANUALLY do the
chmod on the parent directories. However, you should only need to do
that once. -->
<chmod dir="${javadocDest}" perm="755" type="dir" includes="**" />
<chmod dir="${javadocDest}" perm="755" type="file" includes="**/*" />
<echo>Javadoc deployed to ${javadocURL}</echo>
</target>

<target name="test" depends="compile" description="Run JUnit tests.">
Expand All @@ -93,6 +75,6 @@

<target name="clean" description="Delete unnecessary files and directories.">
<delete dir="build" failonerror="false" verbose="true" />
<delete dir="javadoc" failonerror="false" verbose="true" />
<delete dir="docs" failonerror="false" verbose="true" />
</target>
</project>
1 change: 1 addition & 0 deletions docs/_config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
theme: jekyll-theme-cayman
52 changes: 52 additions & 0 deletions docs/allclasses-frame.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (9.0.4) on Sun Feb 25 20:47:35 PST 2018 -->
<title>All Classes</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="date" content="2018-02-25">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="script.js"></script>
<script type="text/javascript" src="jquery/jszip/dist/jszip.min.js"></script>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils.min.js"></script>
<!--[if IE]>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
<![endif]-->
<script type="text/javascript" src="jquery/jquery-1.10.2.js"></script>
<script type="text/javascript" src="jquery/jquery-ui.js"></script>
</head>
<body>
<h1 class="bar">All&nbsp;Classes</h1>
<div class="indexContainer">
<ul>
<li><a href="edu/ucsb/cs56/projects/games/pacman/Audio.html" title="class in edu.ucsb.cs56.projects.games.pacman" target="classFrame">Audio</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/Board.html" title="class in edu.ucsb.cs56.projects.games.pacman" target="classFrame">Board</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/Character.html" title="class in edu.ucsb.cs56.projects.games.pacman" target="classFrame">Character</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/CharacterTest.html" title="class in edu.ucsb.cs56.projects.games.pacman" target="classFrame">CharacterTest</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/Direction.html" title="class in edu.ucsb.cs56.projects.games.pacman" target="classFrame">Direction</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/GamePlayed.html" title="class in edu.ucsb.cs56.projects.games.pacman" target="classFrame">GamePlayed</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/GamePlayedTest.html" title="class in edu.ucsb.cs56.projects.games.pacman" target="classFrame">GamePlayedTest</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/Ghost.html" title="class in edu.ucsb.cs56.projects.games.pacman" target="classFrame">Ghost</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/GhostHouse.html" title="class in edu.ucsb.cs56.projects.games.pacman" target="classFrame">GhostHouse</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/GhostHouseTest.html" title="class in edu.ucsb.cs56.projects.games.pacman" target="classFrame">GhostHouseTest</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/GhostTest.html" title="class in edu.ucsb.cs56.projects.games.pacman" target="classFrame">GhostTest</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/Grid.html" title="class in edu.ucsb.cs56.projects.games.pacman" target="classFrame">Grid</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/GridData.html" title="class in edu.ucsb.cs56.projects.games.pacman" target="classFrame">GridData</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/editor/GridDataConversion.html" title="class in edu.ucsb.cs56.projects.games.pacman.editor" target="classFrame">GridDataConversion</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/Leaderboard.html" title="class in edu.ucsb.cs56.projects.games.pacman" target="classFrame">Leaderboard</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/LeaderboardGUI.html" title="class in edu.ucsb.cs56.projects.games.pacman" target="classFrame">LeaderboardGUI</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/LeaderboardTest.html" title="class in edu.ucsb.cs56.projects.games.pacman" target="classFrame">LeaderboardTest</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/Location.html" title="class in edu.ucsb.cs56.projects.games.pacman" target="classFrame">Location</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/Node.html" title="class in edu.ucsb.cs56.projects.games.pacman" target="classFrame">Node</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/PacMan.html" title="class in edu.ucsb.cs56.projects.games.pacman" target="classFrame">PacMan</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/editor/PacManLevelDisplay.html" title="class in edu.ucsb.cs56.projects.games.pacman.editor" target="classFrame">PacManLevelDisplay</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/editor/PacManLevelEditor.html" title="class in edu.ucsb.cs56.projects.games.pacman.editor" target="classFrame">PacManLevelEditor</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/PacPlayer.html" title="class in edu.ucsb.cs56.projects.games.pacman" target="classFrame">PacPlayer</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/PacPlayerTest.html" title="class in edu.ucsb.cs56.projects.games.pacman" target="classFrame">PacPlayerTest</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/ScoreLoader.html" title="class in edu.ucsb.cs56.projects.games.pacman" target="classFrame">ScoreLoader</a></li>
</ul>
</div>
</body>
</html>
52 changes: 52 additions & 0 deletions docs/allclasses-noframe.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (9.0.4) on Sun Feb 25 20:47:35 PST 2018 -->
<title>All Classes</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="date" content="2018-02-25">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="script.js"></script>
<script type="text/javascript" src="jquery/jszip/dist/jszip.min.js"></script>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils.min.js"></script>
<!--[if IE]>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
<![endif]-->
<script type="text/javascript" src="jquery/jquery-1.10.2.js"></script>
<script type="text/javascript" src="jquery/jquery-ui.js"></script>
</head>
<body>
<h1 class="bar">All&nbsp;Classes</h1>
<div class="indexContainer">
<ul>
<li><a href="edu/ucsb/cs56/projects/games/pacman/Audio.html" title="class in edu.ucsb.cs56.projects.games.pacman">Audio</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/Board.html" title="class in edu.ucsb.cs56.projects.games.pacman">Board</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/Character.html" title="class in edu.ucsb.cs56.projects.games.pacman">Character</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/CharacterTest.html" title="class in edu.ucsb.cs56.projects.games.pacman">CharacterTest</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/Direction.html" title="class in edu.ucsb.cs56.projects.games.pacman">Direction</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/GamePlayed.html" title="class in edu.ucsb.cs56.projects.games.pacman">GamePlayed</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/GamePlayedTest.html" title="class in edu.ucsb.cs56.projects.games.pacman">GamePlayedTest</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/Ghost.html" title="class in edu.ucsb.cs56.projects.games.pacman">Ghost</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/GhostHouse.html" title="class in edu.ucsb.cs56.projects.games.pacman">GhostHouse</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/GhostHouseTest.html" title="class in edu.ucsb.cs56.projects.games.pacman">GhostHouseTest</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/GhostTest.html" title="class in edu.ucsb.cs56.projects.games.pacman">GhostTest</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/Grid.html" title="class in edu.ucsb.cs56.projects.games.pacman">Grid</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/GridData.html" title="class in edu.ucsb.cs56.projects.games.pacman">GridData</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/editor/GridDataConversion.html" title="class in edu.ucsb.cs56.projects.games.pacman.editor">GridDataConversion</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/Leaderboard.html" title="class in edu.ucsb.cs56.projects.games.pacman">Leaderboard</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/LeaderboardGUI.html" title="class in edu.ucsb.cs56.projects.games.pacman">LeaderboardGUI</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/LeaderboardTest.html" title="class in edu.ucsb.cs56.projects.games.pacman">LeaderboardTest</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/Location.html" title="class in edu.ucsb.cs56.projects.games.pacman">Location</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/Node.html" title="class in edu.ucsb.cs56.projects.games.pacman">Node</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/PacMan.html" title="class in edu.ucsb.cs56.projects.games.pacman">PacMan</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/editor/PacManLevelDisplay.html" title="class in edu.ucsb.cs56.projects.games.pacman.editor">PacManLevelDisplay</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/editor/PacManLevelEditor.html" title="class in edu.ucsb.cs56.projects.games.pacman.editor">PacManLevelEditor</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/PacPlayer.html" title="class in edu.ucsb.cs56.projects.games.pacman">PacPlayer</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/PacPlayerTest.html" title="class in edu.ucsb.cs56.projects.games.pacman">PacPlayerTest</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pacman/ScoreLoader.html" title="class in edu.ucsb.cs56.projects.games.pacman">ScoreLoader</a></li>
</ul>
</div>
</body>
</html>
Loading