Merge branch 'master' of https://github.com/CS383-Team1/project into …

…blai1919

Conflicts:
	.gitignore
	src/core/assets/area/demo.txt

.gitignore

@@ -11,7 +11,10 @@
 
 # LaTeX Generated PDFs
 *.pdf
+<<<<<<< HEAD
 
 # PlantUML Generated PNGs
 *.png
-/src/.nb-gradle/private/
+/src/.nb-gradle/private/
+=======
+>>>>>>> 4b17d78d67180596b952d8d4220b2ab601a594b3

README.md

@@ -13,6 +13,9 @@ they are in the form `<username>-<branchname>`.
 Please hardwrap all text files at 80 characters. Some of us have smaller
 displays, and not all editors handle soft wraps gracefully.
 
+Please indent with tabs. You can set them to be as wide as you like, but
+for the purpose of hard wrapping lines treat tabs as 4 spaces.
+
 Please use line endings of `\n` instead of `\n\r`. The last thing we need
 is a commit war where contributors alternatively add and remove `\r`
 characters from source files.

doc/.gitignore

@@ -0,0 +1,2 @@
+# PlantUML Generated PNGs
+*.png

doc/backlog/project.tex

@@ -12,27 +12,51 @@
 
 \begin{section}{Unfinished}
 \begin{enumerate}
-\item design game content, storyline, in a broad arc
+
+\item design game content, storyline, in a broad arc (DONE)
+\item refine game storyline, add characters and setting details (IN PROGRESS)
+
 \item design major data structures, software architecture (class
-	hierarchies and public interface)
-\item design game levels and concept of completion
-\item design combat types and mechanics
+	hierarchies and public interface) (ONGOING) (REFINE THIS ITEM)
+
+\item design game levels based on story (IN PROGRESS)
+\item design combat types and mechanics (IN PROGRESS)
+
 \item character model: statistics, advancement, depiction
-\item select development tools/environment
-\item selection and evaluation of libraries
-\item stable threaded game loop
-\item build a user interface and read player input
-\item opponent A/I
-\item network communication
-\item design how tile-based views will look
-\item graphics and sound
-\item program documentation
+
+\item select development tools/environment (DONE) (GDX)
+\item selection and evaluation of libraries (DONE?)
+
+\item stable threaded game loop (DONE)
+\item improve and update game loop (ONGOING)
+\item build a user interface (ONGOING)
+\item refine user input system (IN PROGRESS)
+
+\item NPC AI (IN PROGRESS)
+\item opponent A/I (TO DO)
+
+\item network communication (IN PROGRESS)
+
+\item design how tile-based views will look (DONE)
+%\item graphics and sound
+\item find or create sound effects/music to be used (TO DO)
+\item create tile graphics (ONGOING)
+\item create sprites (ONGOING)
+\item create graphics for combat area (TO DO)
+
+%\item program documentation
+\item create design document (ONGOING)
+\item keep code commented (ONGOING)
+
+
 \end{enumerate}
 \end{section}
 
 \begin{section}{Finished}
 \begin{enumerate}
+
 \item project specification document
+
 \end{enumerate}
 \end{section}
 

doc/backlog/sprint.tex

@@ -10,6 +10,24 @@
 
 \maketitle
 
+
+\begin{section}{For Sprint 3/25/15 to 4/??/15}
+\begin{enumerate}
+\item design two game levels for the demo, base levels on story (Ronnie)
+\item working multiple levels code and transition (Lance, Ronnie)
+\item computer-controlled entity: interaction (Casey)
+\item make a chat interface or dialogue (Casey)
+\item continue on combat mechanics (Robin, Tessa?)
+\item go through story (whole team)
+\item rework player input classes and have them reviewed (Tessa) 
+\item start on networking: two computers sharing one game map (Mason, Arthur)
+\itm backlog grooming (Robin)
+\item design new NPC sprite (Majeed)
+\end{enumerate}
+\end{section}
+
+
+
 \begin{section}{For Sprint 3/5/15 to 3/?/15}
 \begin{enumerate}