Permalink
Browse files

Merge branch 'master' of github.com:johanbrook/medioqre

  • Loading branch information...
2 parents 102139f + ea70285 commit 0c3a4ef339d56396c8b0e46a17d4026c16e6a723 @Pungsnigel Pungsnigel committed May 22, 2012
Showing with 8 additions and 13 deletions.
  1. +6 −0 README.md
  2. +1 −13 src/main/Main.java
  3. +1 −0 src/model/GameModel.java
View
@@ -32,6 +32,12 @@ The application needs the following VM arguments passed when running on Windows:
-Dsun.java2d.noddraw=true
+The application may be slow to start on Windows - just hang in there.
+
+## For the graders
+
+- The bit tag functionality present in the model (see the ITaggable interface) is not used in the 1.0 release. We have delayed a view refactor until 1.1, where the bit tagging functionality will be used along with restructured rendering techniques.
+
## We are
- [John Barbero Unenge](http://github.com/JBarberU)
View
@@ -3,13 +3,11 @@
import gui.Launcher;
-import java.awt.Dimension;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Field;
import javax.imageio.ImageIO;
-import javax.swing.JFrame;
import tools.Logger;
@@ -31,7 +29,7 @@
*/
public class Main {
- public static final String VERSION = "0.9";
+ public static final String VERSION = "1.0";
/**
* @param args
@@ -48,9 +46,6 @@ public static void main(String[] args) {
if (os.indexOf("mac") != -1)
OSXOptions();
- if (os.indexOf("windows") != -1)
- windowsOptions();
-
if (MODE == PRODUCTION) {
new Launcher();
} else {
@@ -74,13 +69,6 @@ private static void OSXOptions() {
}
- private static void windowsOptions() {
-
- }
-
- private static void linuxOptions() {
-
- }
private static void setAudioNativeDir(){
System.setProperty( "java.library.path", new File(new File(System.getProperty("user.dir"), "libs/lwjgl/native"), LWJGLUtil.getPlatformName()).getAbsolutePath()) ;
View
@@ -226,6 +226,7 @@ public void newGame() {
public void gameOver() {
log("Noob, game over");
this.objects.clear();
+ this.portals = new Portal[2];
EventBus.INSTANCE.publish(new Event(Event.Property.GAME_OVER));
}

0 comments on commit 0c3a4ef

Please sign in to comment.