external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

* this revision

Browse Source 
* revert to older substance version
 * missing symbols
* r1424
 * starting work on new GUI
 * new Hand functionality
 * drag and drop to order cards via left or right mouse button, right mouse button default action is play card, so try not to use it for dragging as you might accidentally play the card you don't want to
 * WIP animations, new play area
 * new picture panel
This commit is contained in:
jendave
2011-08-06 05:15:57 +00:00
parent 22725a4ede
commit 74e6e2af24
4 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -28,6 +28,7 @@ res/images/symbols-13/12.png -text svneol=unset#image/png
res/images/symbols-13/15.png -text svneol=unset#image/png res/images/symbols-13/15.png -text svneol=unset#image/png
res/images/symbols-13/16.png -text svneol=unset#image/png res/images/symbols-13/16.png -text svneol=unset#image/png
res/images/symbols-13/2.png -text svneol=unset#image/png res/images/symbols-13/2.png -text svneol=unset#image/png
res/images/symbols-13/20.png -text svneol=unset#image/png
res/images/symbols-13/2B.png -text svneol=unset#image/png res/images/symbols-13/2B.png -text svneol=unset#image/png
res/images/symbols-13/2G.png -text svneol=unset#image/png res/images/symbols-13/2G.png -text svneol=unset#image/png
res/images/symbols-13/2R.png -text svneol=unset#image/png res/images/symbols-13/2R.png -text svneol=unset#image/png
@@ -43,6 +44,7 @@ res/images/symbols-13/9.png -text svneol=unset#image/png
res/images/symbols-13/B.png -text svneol=unset#image/png res/images/symbols-13/B.png -text svneol=unset#image/png
res/images/symbols-13/BG.png -text svneol=unset#image/png res/images/symbols-13/BG.png -text svneol=unset#image/png
res/images/symbols-13/BR.png -text svneol=unset#image/png res/images/symbols-13/BR.png -text svneol=unset#image/png
res/images/symbols-13/C.png -text svneol=unset#image/png
res/images/symbols-13/G.png -text svneol=unset#image/png res/images/symbols-13/G.png -text svneol=unset#image/png
res/images/symbols-13/GU.png -text svneol=unset#image/png res/images/symbols-13/GU.png -text svneol=unset#image/png
res/images/symbols-13/GW.png -text svneol=unset#image/png res/images/symbols-13/GW.png -text svneol=unset#image/png

BIN
res/images/symbols-13/20.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
res/images/symbols-13/C.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

55
src/forge/Gui_NewGame.java
View File

@@ -673,38 +673,35 @@ public class Gui_NewGame extends JFrame implements NewConstants, NewConstants.LA
for(int i = 0; i < info.length; i++) for(int i = 0; i < info.length; i++)
LAFMap.put(info[i].getName(), info[i].getClassName()); LAFMap.put(info[i].getName(), info[i].getClassName());
//NapkinLookAndFeel napkin = new NapkinLookAndFeel();
//NimRODLookAndFeel nrLAF = new NimRODLookAndFeel();
//add Substance LAFs: //add Substance LAFs:
LAFMap.put("Autumn", "org.pushingpixels.substance.api.skin.SubstanceAutumnLookAndFeel"); LAFMap.put("Autumn", "org.jvnet.substance.skin.SubstanceAutumnLookAndFeel");
LAFMap.put("Business", "org.pushingpixels.substance.api.skin.SubstanceBusinessLookAndFeel"); LAFMap.put("Business", "org.jvnet.substance.skin.SubstanceBusinessLookAndFeel");
LAFMap.put("Business Black Steel", "org.pushingpixels.substance.api.skin.SubstanceBusinessBlackSteelLookAndFeel"); LAFMap.put("Business Black Steel", "org.jvnet.substance.skin.SubstanceBusinessBlackSteelLookAndFeel");
LAFMap.put("Business Blue Steel", "org.pushingpixels.substance.api.skin.SubstanceBusinessBlueSteelLookAndFeel"); LAFMap.put("Business Blue Steel", "org.jvnet.substance.skin.SubstanceBusinessBlueSteelLookAndFeel");
LAFMap.put("Challenger Deep", "org.pushingpixels.substance.api.skin.SubstanceChallengerDeepLookAndFeel"); LAFMap.put("Challenger Deep", "org.jvnet.substance.skin.SubstanceChallengerDeepLookAndFeel");
LAFMap.put("Creme", "org.pushingpixels.substance.api.skin.SubstanceCremeLookAndFeel"); LAFMap.put("Creme", "org.jvnet.substance.skin.SubstanceCremeLookAndFeel");
LAFMap.put("Creme Coffee", "org.pushingpixels.substance.api.skin.SubstanceCremeCoffeeLookAndFeel"); LAFMap.put("Creme Coffee", "org.jvnet.substance.skin.SubstanceCremeCoffeeLookAndFeel");
LAFMap.put("Dust", "org.pushingpixels.substance.api.skin.SubstanceDustLookAndFeel"); LAFMap.put("Dust", "org.jvnet.substance.skin.SubstanceDustLookAndFeel");
LAFMap.put("Dust Coffee", "org.pushingpixels.substance.api.skin.SubstanceDustCoffeeLookAndFeel"); LAFMap.put("Dust Coffee", "org.jvnet.substance.skin.SubstanceDustCoffeeLookAndFeel");
LAFMap.put("Emerald Dusk", "org.pushingpixels.substance.api.skin.SubstanceEmeraldDuskLookAndFeel"); LAFMap.put("Emerald Dusk", "org.jvnet.substance.skin.SubstanceEmeraldDuskLookAndFeel");
LAFMap.put("Gemini", "org.pushingpixels.substance.api.skin.SubstanceGeminiLookAndFeel"); LAFMap.put("Gemini", "org.jvnet.substance.api.skin.SubstanceGeminiLookAndFeel");
LAFMap.put("Graphite", "org.pushingpixels.substance.api.skin.SubstanceGraphiteLookAndFeel"); LAFMap.put("Graphite Aqua", "org.jvnet.substance.api.skin.SubstanceGraphiteAquaLookAndFeel");
LAFMap.put("Graphite Aqua", "org.pushingpixels.substance.api.skin.SubstanceGraphiteAquaLookAndFeel"); LAFMap.put("Moderate", "org.jvnet.substance.skin.SubstanceModerateLookAndFeel");
LAFMap.put("Graphite Glass", "org.pushingpixels.substance.api.skin.SubstanceGraphiteGlassLookAndFeel"); LAFMap.put("Magellan", "org.jvnet.substance.api.skin.SubstanceMagellanLookAndFeel");
LAFMap.put("Magellan", "org.pushingpixels.substance.api.skin.SubstanceMagellanLookAndFeel"); LAFMap.put("Magma", "org.jvnet.substance.skin.SubstanceMagmaLookAndFeel");
LAFMap.put("Magma", "org.pushingpixels.substance.api.skin.SubstanceMagmaLookAndFeel"); LAFMap.put("Mist Aqua", "org.jvnet.substance.skin.SubstanceMistAquaLookAndFeel");
LAFMap.put("Mist Aqua", "org.pushingpixels.substance.api.skin.SubstanceMistAquaLookAndFeel"); LAFMap.put("Mist Silver", "org.jvnet.substance.skin.SubstanceMistSilverLookAndFeel");
LAFMap.put("Mist Silver", "org.pushingpixels.substance.api.skin.SubstanceMistSilverLookAndFeel");
LAFMap.put("Moderate", "org.pushingpixels.substance.api.skin.SubstanceModerateLookAndFeel");
LAFMap.put("Napkin", "net.sourceforge.napkinlaf.NapkinLookAndFeel"); LAFMap.put("Napkin", "net.sourceforge.napkinlaf.NapkinLookAndFeel");
LAFMap.put("Nebula", "org.pushingpixels.substance.api.skin.SubstanceNebulaLookAndFeel"); LAFMap.put("Nebula", "org.jvnet.substance.skin.SubstanceNebulaLookAndFeel");
LAFMap.put("Nebula Brick Wall", "org.pushingpixels.substance.api.skin.SubstanceNebulaBrickWallLookAndFeel"); LAFMap.put("Nebula Brick Wall", "org.jvnet.substance.skin.SubstanceNebulaBrickWallLookAndFeel");
LAFMap.put("NimROD", "com.nilo.plaf.nimrod.NimRODLookAndFeel"); LAFMap.put("NimROD", "com.nilo.plaf.nimrod.NimRODLookAndFeel");
LAFMap.put("Office Blue 2007", "org.pushingpixels.substance.api.skin.SubstanceOfficeBlue2007LookAndFeel"); LAFMap.put("Office Blue 2007", "org.jvnet.substance.skin.SubstanceOfficeBlue2007LookAndFeel");
LAFMap.put("Office Silver 2007", "org.pushingpixels.substance.api.skin.SubstanceOfficeSilver2007LookAndFeel"); LAFMap.put("Office Silver 2007", "org.jvnet.substance.skin.SubstanceOfficeSilver2007LookAndFeel");
LAFMap.put("Raven", "org.pushingpixels.substance.api.skin.SubstanceRavenLookAndFeel"); LAFMap.put("Raven", "org.jvnet.substance.skin.SubstanceRavenLookAndFeel");
LAFMap.put("Sahara", "org.pushingpixels.substance.api.skin.SubstanceSaharaLookAndFeel"); LAFMap.put("Raven Graphite", "org.jvnet.substance.skin.SubstanceRavenGraphiteLookAndFeel");
LAFMap.put("Twilight", "org.pushingpixels.substance.api.skin.SubstanceTwilightLookAndFeel"); LAFMap.put("Raven Graphite Glass", "org.jvnet.substance.skin.SubstanceRavenGraphiteGlassLookAndFeel");
LAFMap.put("Sahara", "org.jvnet.substance.skin.SubstanceSaharaLookAndFeel");
LAFMap.put("Twilight", "org.jvnet.substance.skin.SubstanceTwilightLookAndFeel");
String[] keys = new String[LAFMap.size()]; String[] keys = new String[LAFMap.size()];
int count = 0; int count = 0;