Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
901730a
.gitignore is now working
ashinster May 11, 2017
0bc5e85
updated .gitignore
ashinster May 11, 2017
2615475
Fixed repeated conditional statement. Now checks if player and other …
ashinster May 11, 2017
2b4a372
Suspicious comparison of Integer references in Limit.java. Changed fr…
ashinster May 11, 2017
a2252ca
Reduced cyclomatic complexties in ConnectController.java login() and …
ashinster May 12, 2017
217b6b8
Removed unused import net.sf.freecol.common.FreeColException from Con…
ashinster May 12, 2017
1c7fd1c
Removed dead code
AlfredoGuillen May 12, 2017
fdb26d7
Added some MEMES to this great game. Press the 'j' key while the intr…
ashinster May 13, 2017
aab06d2
Unmuted intro video
ashinster May 13, 2017
3dab75a
Fixed Issue #8.
AlfredoGuillen May 13, 2017
106844c
Added type argument to Class
AlfredoGuillen May 13, 2017
785c8cd
Optimized new intro video playback. Audio and video now plays separat…
ashinster May 13, 2017
f9b3743
Removed unnecessary 'cortado.jar' sourcepath reference for cortado-0.…
ashinster May 13, 2017
24a8785
Separated FreeCol.java into 3 Different Classes.
AlfredoGuillen May 14, 2017
7c7cd77
Reduced handleArg() 's Code Complexity of 60 to 6
AlfredoGuillen May 14, 2017
8fefee7
Removed the Playlist class.
May 14, 2017
2ba34f3
Removed the Xml class
May 14, 2017
0e2328b
Replaced Integer reference comparisons with .equals
AlfredoGuillen May 14, 2017
43951b1
Added a bunch of unit tests for StringUtils.java. Since this test cas…
ashinster May 17, 2017
6a6ecb2
modified .gitignore to ignore some files that are generated in the ro…
ashinster May 17, 2017
5d65ac7
Added test cases for refactored classes in net.sf.freecol package
AlfredoGuillen May 20, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test/src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="lib" path="jars/commons-cli-1.1.jar"/>
<classpathentry kind="lib" path="jars/cortado-0.6.0.jar"/>
<classpathentry kind="lib" path="jars/jogg-0.0.17.jar"/>
<classpathentry kind="lib" path="jars/jorbis-0.0.17.jar"/>
<classpathentry kind="lib" path="jars/miglayout-core-4.2.jar"/>
<classpathentry kind="lib" path="jars/miglayout-swing-4.2.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin"/>
</classpath>
53 changes: 53 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
.metadata
/FreeCol.jar
/*.properties
/TESTS-TestSuites.xml
bin/
tmp/
build/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.settings/
.loadpath
.recommenders

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# PyDev specific (Python IDE for Eclipse)
*.pydevproject

# CDT-specific (C/C++ Development Tooling)
.cproject

# Java annotation processor (APT)
.factorypath

# PDT-specific (PHP Development Tools)
.buildpath

# sbteclipse plugin
.target

# Tern plugin
.tern-project

# TeXlipse plugin
.texlipse

# STS (Spring Tool Suite)
.springBeans

# Code Recommenders
.recommenders/

# Scala IDE specific (Scala & Java development for Eclipse)
.cache-main
.scala_dependencies
.worksheet
11 changes: 0 additions & 11 deletions .settings/org.eclipse.jdt.core.prefs

This file was deleted.

Binary file removed FreeCol.jar
Binary file not shown.
Binary file removed bin/net/sf/freecol/FreeCol$1.class
Binary file not shown.
Binary file removed bin/net/sf/freecol/FreeCol.class
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/ClientOptions.class
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/FreeColClient$1.class
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/FreeColClient.class
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/Worker.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/control/InputHandler.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
13 changes: 0 additions & 13 deletions bin/net/sf/freecol/client/control/package.html

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/Canvas$ToolBoxFrame.class
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/Canvas.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/ChatDisplay.class
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/ChoiceItem.class
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/DialogHandler.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/FontLibrary.class
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/FreeColFrame$1.class
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/FreeColFrame.class
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/GUI.class
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/GUIMessage.class
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/GrayLayer.class
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/ImageLibrary.class
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/LoadingSavegameInfo.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/MapViewer.class
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/RoadPainter.class
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/ScrollThread.class
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/SwingGUI.class
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/TerrainCursor.class
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/TilePopup.class
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/TileViewer.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/action/CenterAction.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/action/MapboardAction.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/action/NewAction.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/action/QuitAction.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/action/WaitAction.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
24 changes: 0 additions & 24 deletions bin/net/sf/freecol/client/gui/action/package.html

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/menu/DebugMenu.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
8 changes: 0 additions & 8 deletions bin/net/sf/freecol/client/gui/menu/package.html

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/option/OptionUI.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
5 changes: 0 additions & 5 deletions bin/net/sf/freecol/client/gui/option/package.html

This file was deleted.

31 changes: 0 additions & 31 deletions bin/net/sf/freecol/client/gui/package.html

This file was deleted.

Binary file removed bin/net/sf/freecol/client/gui/panel/AboutPanel.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/panel/CargoPanel.class
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/panel/ChatPanel.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/panel/Draggable.class
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/panel/DropTarget.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/panel/EventPanel.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed bin/net/sf/freecol/client/gui/panel/Flag.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading