FreeCol Final Project#5

Open

AlfredoGuillen wants to merge 21 commits intocosc442spring2017:masterfrom

AlfredoGuillen:master

Commits on May 12, 2017

Reduced cyclomatic complexties in ConnectController.java login() and joinMultiplayerGame() methods. Methods extracted as private methods
ashinster
committed
Removed unused import net.sf.freecol.common.FreeColException from ConnectController.java.
ashinster
committed
Removed dead code
AlfredoGuillen
committed

Commits on May 13, 2017

Added some MEMES to this great game. Press the 'j' key while the intro video is playing. Converted a video to .ogg format and placed into data/rules/classic/resources/video/. Then had to add a prop…
ashinster
committed
Unmuted intro video
ashinster
committed
Fixed Issue #8.
AlfredoGuillen
committed
Added type argument to Class
AlfredoGuillen
committed
Optimized new intro video playback. Audio and video now plays separately. The new intro video is muted, and another audio file is played in the background while the video is playing. This is done b…
ashinster
committed
Removed unnecessary 'cortado.jar' sourcepath reference for cortado-0.6.0.jar dependency. Thought we needed it but we don't.
ashinster
committed

Commits on May 17, 2017

Commits on May 20, 2017

Added test cases for refactored classes in net.sf.freecol package
AlfredoGuillen
committed