kjao/archive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing git

Browse Source
This commit is contained in:
ksjdragon 2015-02-14 18:12:38 -05:00
parent 0abfc905e6
commit 162d9d4e95
32 changed files with 38 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
millennium-legacy/.classpath Normal file → Executable file
View File

@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<<<<<<< HEAD
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
=======
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
>>>>>>> 02c13080666632aea0bc8fa372361e43e18af2ef
<classpathentry kind="output" path="bin"/>
</classpath>

6
millennium-legacy/.project Normal file → Executable file
View File

@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<<<<<<< HEAD
<name>EYS</name>
=======
<name>Millenium Legacy</name>
>>>>>>> 02c13080666632aea0bc8fa372361e43e18af2ef
<name>millennium-legacy</name>
<comment></comment>
<projects>
</projects>

10
millennium-legacy/.settings/org.eclipse.jdt.core.prefs Normal file → Executable file
View File

@ -1,21 +1,11 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
<<<<<<< HEAD
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
=======
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
>>>>>>> 02c13080666632aea0bc8fa372361e43e18af2ef
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
<<<<<<< HEAD
org.eclipse.jdt.core.compiler.source=1.8
=======
org.eclipse.jdt.core.compiler.source=1.7
>>>>>>> 02c13080666632aea0bc8fa372361e43e18af2ef

0
millennium-legacy/README.md Normal file → Executable file
View File

0
millennium-legacy/bin/map.txt Normal file → Executable file
View File

BIN
millennium-legacy/bin/milleniumlegacy/Algorithm.class Normal file → Executable file
View File

Binary file not shown.

BIN
millennium-legacy/bin/milleniumlegacy/GUI$1.class Executable file
View File

Binary file not shown.

BIN
millennium-legacy/bin/milleniumlegacy/GUI.class Normal file → Executable file
View File

Binary file not shown.

BIN
millennium-legacy/bin/milleniumlegacy/ImageLoader.class Normal file → Executable file
View File

Binary file not shown.

BIN
millennium-legacy/bin/milleniumlegacy/Item.class Normal file → Executable file
View File

Binary file not shown.

BIN
millennium-legacy/bin/milleniumlegacy/KeyManager.class Normal file → Executable file
View File

Binary file not shown.

BIN
millennium-legacy/bin/milleniumlegacy/MainGame.class Normal file → Executable file
View File

Binary file not shown.

BIN
millennium-legacy/bin/milleniumlegacy/Map.class Normal file → Executable file
View File

Binary file not shown.

BIN
millennium-legacy/bin/milleniumlegacy/MapLoader.class Normal file → Executable file
View File

Binary file not shown.

BIN
millennium-legacy/bin/milleniumlegacy/OptionsPane.class Normal file → Executable file
View File

Binary file not shown.

BIN
millennium-legacy/bin/milleniumlegacy/Tile.class Normal file → Executable file
View File

Binary file not shown.

BIN
millennium-legacy/bin/milleniumlegacy/player.class Normal file → Executable file
View File

Binary file not shown.

BIN
millennium-legacy/resources/sprites/npc.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 266 B

0
millennium-legacy/resources/sprites/player.png Normal file → Executable file
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 440 B

After

Width:  |  Height:  |  Size: 440 B

0
millennium-legacy/resources/textures/grass.png Normal file → Executable file
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 179 B

After

Width:  |  Height:  |  Size: 179 B

0
millennium-legacy/src/map.txt Normal file → Executable file
View File

0
millennium-legacy/src/milleniumlegacy/Algorithm.java Normal file → Executable file
View File

9
millennium-legacy/src/milleniumlegacy/GUI.java Normal file → Executable file
View File

@ -1,19 +1,17 @@
package milleniumlegacy;
<<<<<<< HEAD
import java.awt.Component;
import java.awt.Graphics;
import java.util.HashMap;
import javax.imageio.ImageIO;
=======
>>>>>>> 357779b2c6cc94e69241d389a64fa3959453599f
import javax.swing.*;
public class GUI {
public static void main(String[] args) {
<<<<<<< HEAD
JFrame f = new JFrame("Millenium Legacy");
f.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
f.setContentPane(new JPanel() {
@ -26,7 +24,7 @@ public class GUI {
f.setSize(825, 625);
f.setVisible(true);
Algorithm.research();
=======
SwingUtilities.invokeLater(new Runnable() {
public void run() {
createAndShowGUI();
@ -45,7 +43,6 @@ public class GUI {
f.setSize(825, 625);
f.setVisible(true);
draw.start();
>>>>>>> 357779b2c6cc94e69241d389a64fa3959453599f
}
}

0
millennium-legacy/src/milleniumlegacy/ImageLoader.java Normal file → Executable file
View File

2
millennium-legacy/src/milleniumlegacy/Item.java Normal file → Executable file
View File

@ -3,7 +3,7 @@ import java.util.*;
public class Item {
public static final Map<Integer, String[]> items;
public static final HashMap<Integer, String[]> items;
static
{
//Putting items

0
millennium-legacy/src/milleniumlegacy/KeyManager.java Normal file → Executable file
View File

0
millennium-legacy/src/milleniumlegacy/MainGame.java Normal file → Executable file
View File

0
millennium-legacy/src/milleniumlegacy/Map.java Normal file → Executable file
View File

0
millennium-legacy/src/milleniumlegacy/MapLoader.java Normal file → Executable file
View File

0
millennium-legacy/src/milleniumlegacy/OptionsPane.java Normal file → Executable file
View File

0
millennium-legacy/src/milleniumlegacy/Tile.java Normal file → Executable file
View File

0
millennium-legacy/src/milleniumlegacy/player.java Normal file → Executable file
View File