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

Fixed Issues #59 #64 #66 #67 #68 #69

Merged
merged 12 commits into from
Nov 25, 2017
Merged

Fixed Issues #59 #64 #66 #67 #68 #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a774276
updated javadoc
brandontran24 Nov 7, 2017
087468f
edited collision handling
brandontran24 Nov 8, 2017
7ad7189
updated collision handling
brandontran24 Nov 8, 2017
c7ef9ff
updated animation to move one tile per key press
daniellerobinson Nov 8, 2017
c7bdd69
fixed map boundary collisions
brandontran24 Nov 8, 2017
8da5327
added a building and flowers using assets
brandontran24 Nov 8, 2017
e1e876a
added arrow key functionality
brandontran24 Nov 8, 2017
3c8e82a
fixed javadocs
brandontran24 Nov 15, 2017
527a239
updated readme
brandontran24 Nov 15, 2017
bc9e9e6
updated readme
brandontran24 Nov 15, 2017
3dbbcff
updated readme
brandontran24 Nov 15, 2017
22e77b8
updated MovementSystem.java
brandontran24 Nov 15, 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
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ jws/
# Intellij files #
*.iml
.idea/*
out/*
out/*
*.metadata
*.project
9 changes: 9 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
cs56-games-pokemon-map
======================

Website:
* <https://brandontran24.github.io/Pokemon-Project/>
* <https://ucsb-cs56-projects.github.io/cs56-games-pokemon-map/>

Javadoc:
* <https://brandontran24.github.io/Pokemon-Project/docs>
* <https://ucsb-cs56-projects.github.io/cs56-games-pokemon-map/docs>


The goal of the program is to create a 2D Rendering engine in the style of the Pokemon games for Gameboy Advance. The engine will render the exact tileset from the actual games.

Currently, after a massive architectural rewrite, the player can control Professor Oak walking around on a map. It should be relatively easy to add new features in a non-coupling way.
Expand Down
29 changes: 5 additions & 24 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
name: Sam Baldwin for CS56, S12 -->

<!-- cleaned up by John Bowman, Devon Porcher -->

<!-- added to GitHub pages by Brandon Tran, Danielle Robinson -->
<property environment="env"/> <!-- load the environment variables -->





<property name="mainClass" value="edu.ucsb.cs56.projects.games.pokemon.framework.Main" />

<property name="javadoc_absolute_path" location="docs"/>


<path id="project.class.path">
Expand Down Expand Up @@ -42,7 +42,7 @@

<target name="clean" description="Cleans old compiled files">
<delete dir="build" quiet="true" />
<delete dir="javadoc" quiet="true" />
<delete dir="${javadoc_absolute_path}" quiet="true" />
<delete dir="dist" quiet="true" />
<delete dir="download" quiet="true" />
<delete dir="temp" quiet="true" />
Expand All @@ -65,39 +65,20 @@
</junit>
</target>

<property name="javadoc_absolute_path" location="javadoc"/>
<property name="public_javadoc_absolute_path" location="../cs56-games-pokemon-map-javadoc/javadoc"/>

<target name="javadoc" depends="compile" description="generate javadoc">
<delete quiet="true">
<fileset dir="javadoc" />
<fileset dir="${javadoc_absolute_path}" />
</delete>
<javadoc destdir="javadoc" packagenames="edu.ucsb.cs56.projects.games.pokemon.*" sourcepath="src">
<javadoc destdir="${javadoc_absolute_path}" packagenames="edu.ucsb.cs56.projects.games.pokemon.*" sourcepath="src">

<classpath refid="project.class.path" />
<link href="https://docs.oracle.com/javase/8/docs/api/" />
</javadoc>
<echo>
javadoc written to file://${javadoc_absolute_path}/index.html
copying to ${public_javadoc_absolute_path}/index.html
</echo>
<delete quiet="true">
<fileset dir="${public_javadoc_absolute_path}" />
</delete>
<mkdir dir="${public_javadoc_absolute_path}" />
<copy todir="${public_javadoc_absolute_path}">
<fileset dir="javadoc" />
</copy>
<echo>
javadoc copied to ${public_javadoc_absolute_path}/index.html
TO PUBLISH: cd into that repo, then git add javadoc;
git commit -m "update javadoc"; git push origin gh-pages
</echo>
</target>




<target name="jar" depends="compile" description="create a jar file">
<jar destfile="build/pokemon_map.jar">
<fileset dir="build" includes="*.class"/>
Expand Down
60 changes: 60 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,60 @@
<!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 (1.8.0_144) on Wed Nov 15 14:26:26 PST 2017 -->
<title>All Classes</title>
<meta name="date" content="2017-11-15">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
<body>
<h1 class="bar">All&nbsp;Classes</h1>
<div class="indexContainer">
<ul>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/graphics/Animation.html" title="class in edu.ucsb.cs56.projects.games.pokemon.graphics" target="classFrame">Animation</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/graphics/AnimationFrame.html" title="class in edu.ucsb.cs56.projects.games.pokemon.graphics" target="classFrame">AnimationFrame</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/Assets.html" title="class in edu.ucsb.cs56.projects.games.pokemon" target="classFrame">Assets</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/factories/BuildingFactory.html" title="class in edu.ucsb.cs56.projects.games.pokemon.factories" target="classFrame">BuildingFactory</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/CollisionComponent.html" title="class in edu.ucsb.cs56.projects.games.pokemon.components" target="classFrame">CollisionComponent</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/commands/Command.html" title="interface in edu.ucsb.cs56.projects.games.pokemon.commands" target="classFrame"><span class="interfaceName">Command</span></a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/Component.html" title="class in edu.ucsb.cs56.projects.games.pokemon.components" target="classFrame">Component</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/ControllableComponent.html" title="class in edu.ucsb.cs56.projects.games.pokemon.components" target="classFrame">ControllableComponent</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/Controller.html" title="class in edu.ucsb.cs56.projects.games.pokemon.components" target="classFrame">Controller</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/Entity.html" title="class in edu.ucsb.cs56.projects.games.pokemon.components" target="classFrame">Entity</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/Game.html" title="class in edu.ucsb.cs56.projects.games.pokemon" target="classFrame">Game</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/GraphicsComponent.html" title="class in edu.ucsb.cs56.projects.games.pokemon.components" target="classFrame">GraphicsComponent</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/InputHandler.html" title="class in edu.ucsb.cs56.projects.games.pokemon" target="classFrame">InputHandler</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/commands/InteractCommand.html" title="class in edu.ucsb.cs56.projects.games.pokemon.commands" target="classFrame">InteractCommand</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/IO/IOHelper.html" title="class in edu.ucsb.cs56.projects.games.pokemon.IO" target="classFrame">IOHelper</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/framework/Main.html" title="class in edu.ucsb.cs56.projects.games.pokemon.framework" target="classFrame">Main</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/framework/MainWindow.html" title="class in edu.ucsb.cs56.projects.games.pokemon.framework" target="classFrame">MainWindow</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/IO/MapLoader.html" title="class in edu.ucsb.cs56.projects.games.pokemon.IO" target="classFrame">MapLoader</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/commands/MoveCommand.html" title="class in edu.ucsb.cs56.projects.games.pokemon.commands" target="classFrame">MoveCommand</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/MovementComponent.html" title="class in edu.ucsb.cs56.projects.games.pokemon.components" target="classFrame">MovementComponent</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/MovementComponent.Direction.html" title="enum in edu.ucsb.cs56.projects.games.pokemon.components" target="classFrame">MovementComponent.Direction</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/systems/MovementSystem.html" title="class in edu.ucsb.cs56.projects.games.pokemon.systems" target="classFrame">MovementSystem</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/factories/ObstacleFactory.html" title="class in edu.ucsb.cs56.projects.games.pokemon.factories" target="classFrame">ObstacleFactory</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/framework/Pair.html" title="class in edu.ucsb.cs56.projects.games.pokemon.framework" target="classFrame">Pair</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/PlayerController.html" title="class in edu.ucsb.cs56.projects.games.pokemon.components" target="classFrame">PlayerController</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/PokemonController.html" title="class in edu.ucsb.cs56.projects.games.pokemon.components" target="classFrame">PokemonController</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/PositionComponent.html" title="class in edu.ucsb.cs56.projects.games.pokemon.components" target="classFrame">PositionComponent</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/IO/ReadFile.html" title="class in edu.ucsb.cs56.projects.games.pokemon.IO" target="classFrame">ReadFile</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/framework/Ref.html" title="class in edu.ucsb.cs56.projects.games.pokemon.framework" target="classFrame">Ref</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/systems/RenderSystem.html" title="class in edu.ucsb.cs56.projects.games.pokemon.systems" target="classFrame">RenderSystem</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/graphics/SpriteBatch.html" title="class in edu.ucsb.cs56.projects.games.pokemon.graphics" target="classFrame">SpriteBatch</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/systems/SystemBase.html" title="class in edu.ucsb.cs56.projects.games.pokemon.systems" target="classFrame">SystemBase</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/systems/SystemMessage.html" title="class in edu.ucsb.cs56.projects.games.pokemon.systems" target="classFrame">SystemMessage</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/systems/SystemMessenger.html" title="class in edu.ucsb.cs56.projects.games.pokemon.systems" target="classFrame">SystemMessenger</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/TextBox.html" title="class in edu.ucsb.cs56.projects.games.pokemon" target="classFrame">TextBox</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/graphics/Texture.html" title="class in edu.ucsb.cs56.projects.games.pokemon.graphics" target="classFrame">Texture</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/TileComponent.html" title="class in edu.ucsb.cs56.projects.games.pokemon.components" target="classFrame">TileComponent</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/TileData.html" title="class in edu.ucsb.cs56.projects.games.pokemon" target="classFrame">TileData</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/IO/TileDataLoader.html" title="class in edu.ucsb.cs56.projects.games.pokemon.IO" target="classFrame">TileDataLoader</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/Vector2.html" title="class in edu.ucsb.cs56.projects.games.pokemon" target="classFrame">Vector2</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/tests/Vector2Test.html" title="class in edu.ucsb.cs56.projects.games.pokemon.tests" target="classFrame">Vector2Test</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/World.html" title="class in edu.ucsb.cs56.projects.games.pokemon" target="classFrame">World</a></li>
</ul>
</div>
</body>
</html>
60 changes: 60 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,60 @@
<!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 (1.8.0_144) on Wed Nov 15 14:26:26 PST 2017 -->
<title>All Classes</title>
<meta name="date" content="2017-11-15">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
<body>
<h1 class="bar">All&nbsp;Classes</h1>
<div class="indexContainer">
<ul>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/graphics/Animation.html" title="class in edu.ucsb.cs56.projects.games.pokemon.graphics">Animation</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/graphics/AnimationFrame.html" title="class in edu.ucsb.cs56.projects.games.pokemon.graphics">AnimationFrame</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/Assets.html" title="class in edu.ucsb.cs56.projects.games.pokemon">Assets</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/factories/BuildingFactory.html" title="class in edu.ucsb.cs56.projects.games.pokemon.factories">BuildingFactory</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/CollisionComponent.html" title="class in edu.ucsb.cs56.projects.games.pokemon.components">CollisionComponent</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/commands/Command.html" title="interface in edu.ucsb.cs56.projects.games.pokemon.commands"><span class="interfaceName">Command</span></a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/Component.html" title="class in edu.ucsb.cs56.projects.games.pokemon.components">Component</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/ControllableComponent.html" title="class in edu.ucsb.cs56.projects.games.pokemon.components">ControllableComponent</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/Controller.html" title="class in edu.ucsb.cs56.projects.games.pokemon.components">Controller</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/Entity.html" title="class in edu.ucsb.cs56.projects.games.pokemon.components">Entity</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/Game.html" title="class in edu.ucsb.cs56.projects.games.pokemon">Game</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/GraphicsComponent.html" title="class in edu.ucsb.cs56.projects.games.pokemon.components">GraphicsComponent</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/InputHandler.html" title="class in edu.ucsb.cs56.projects.games.pokemon">InputHandler</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/commands/InteractCommand.html" title="class in edu.ucsb.cs56.projects.games.pokemon.commands">InteractCommand</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/IO/IOHelper.html" title="class in edu.ucsb.cs56.projects.games.pokemon.IO">IOHelper</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/framework/Main.html" title="class in edu.ucsb.cs56.projects.games.pokemon.framework">Main</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/framework/MainWindow.html" title="class in edu.ucsb.cs56.projects.games.pokemon.framework">MainWindow</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/IO/MapLoader.html" title="class in edu.ucsb.cs56.projects.games.pokemon.IO">MapLoader</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/commands/MoveCommand.html" title="class in edu.ucsb.cs56.projects.games.pokemon.commands">MoveCommand</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/MovementComponent.html" title="class in edu.ucsb.cs56.projects.games.pokemon.components">MovementComponent</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/MovementComponent.Direction.html" title="enum in edu.ucsb.cs56.projects.games.pokemon.components">MovementComponent.Direction</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/systems/MovementSystem.html" title="class in edu.ucsb.cs56.projects.games.pokemon.systems">MovementSystem</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/factories/ObstacleFactory.html" title="class in edu.ucsb.cs56.projects.games.pokemon.factories">ObstacleFactory</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/framework/Pair.html" title="class in edu.ucsb.cs56.projects.games.pokemon.framework">Pair</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/PlayerController.html" title="class in edu.ucsb.cs56.projects.games.pokemon.components">PlayerController</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/PokemonController.html" title="class in edu.ucsb.cs56.projects.games.pokemon.components">PokemonController</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/PositionComponent.html" title="class in edu.ucsb.cs56.projects.games.pokemon.components">PositionComponent</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/IO/ReadFile.html" title="class in edu.ucsb.cs56.projects.games.pokemon.IO">ReadFile</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/framework/Ref.html" title="class in edu.ucsb.cs56.projects.games.pokemon.framework">Ref</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/systems/RenderSystem.html" title="class in edu.ucsb.cs56.projects.games.pokemon.systems">RenderSystem</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/graphics/SpriteBatch.html" title="class in edu.ucsb.cs56.projects.games.pokemon.graphics">SpriteBatch</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/systems/SystemBase.html" title="class in edu.ucsb.cs56.projects.games.pokemon.systems">SystemBase</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/systems/SystemMessage.html" title="class in edu.ucsb.cs56.projects.games.pokemon.systems">SystemMessage</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/systems/SystemMessenger.html" title="class in edu.ucsb.cs56.projects.games.pokemon.systems">SystemMessenger</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/TextBox.html" title="class in edu.ucsb.cs56.projects.games.pokemon">TextBox</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/graphics/Texture.html" title="class in edu.ucsb.cs56.projects.games.pokemon.graphics">Texture</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/components/TileComponent.html" title="class in edu.ucsb.cs56.projects.games.pokemon.components">TileComponent</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/TileData.html" title="class in edu.ucsb.cs56.projects.games.pokemon">TileData</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/IO/TileDataLoader.html" title="class in edu.ucsb.cs56.projects.games.pokemon.IO">TileDataLoader</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/Vector2.html" title="class in edu.ucsb.cs56.projects.games.pokemon">Vector2</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/tests/Vector2Test.html" title="class in edu.ucsb.cs56.projects.games.pokemon.tests">Vector2Test</a></li>
<li><a href="edu/ucsb/cs56/projects/games/pokemon/World.html" title="class in edu.ucsb.cs56.projects.games.pokemon">World</a></li>
</ul>
</div>
</body>
</html>
Loading