mirrors
/
freecol
mirror of https://github.com/FreeCol/freecol.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
13,102 Commits 13 Branches 58 Tags 878 MiB
Commit Graph

13102 Commits

Author SHA1 Message Date
calebrw 383f46e494 configure directories for freecol.iml properly 2016-09-22 11:14:22 -05:00
calebrw 631ff19f8b Correct bad merge of CanvasMouseListener.java so that original remains, not one utilizing .equals or Equals() 2016-09-22 10:18:21 -05:00
calebrw 8e9a0e9439 Merge branch 'master' into code-cleanup 2016-09-22 10:06:26 -05:00
calebrw efd04c008f Merge branch 'master' of ssh://git.code.sf.net/p/freecol/git 
# Conflicts:
#	src/net/sf/freecol/client/gui/CanvasMouseListener.java
 2016-09-22 10:05:08 -05:00
calebrw 920621e109 Improve OSUtils implementation and abstraction 
In order to make the OSUtils class more robust, I have eliminated the operating system input to only the method that requires it. I have also implemented use of the Desktop API (from Java 1.6+) which should work more universally. If that doesn't work, the system then falls back to the old browser launch method.

All errors are logged if thrown. The Desktop API will throw errors as well if the Desktop is not available and then the old method kicks in.
 2016-09-22 10:02:42 -05:00
Michael Pope f5fc8dad3a Paper over latest NPE in BR#2982. 2016-09-22 17:45:20 +09:30
Mike Pope be252de817 Try to rationalize double clicks, BR#1637. 2016-09-22 16:59:21 +09:30
Michael Pope d377e35827 Simplify ImageResource sort. 2016-09-22 16:57:35 +09:30
Michael Pope 7528472fdc Omitted Modifier sort. 2016-09-22 16:56:16 +09:30
Niklas Laxström d8c4cb80ef Localisation updates from https://translatewiki.net. 2016-09-22 09:28:01 +02:00
calebrw 52670e8cb7 Cleanup OSUtils a bit 2016-09-22 00:22:48 -05:00
calebrw 6d21dc66ba Add and implement OSUtils.java 2016-09-21 23:50:47 -05:00
calebrw 1fd6cdeef7 Replace == with .equals() 2016-09-21 22:59:27 -05:00
calebrw bb47f2b5ff Block further updates to freecol.iml for IntelliJ Idea users 
This file may become too personalized past this point
 2016-09-21 20:27:34 -05:00
calebrw 73e1dd6b83 Revert "Revert "Fix for jar finding in freecol.sh, from Michael Vetter."" 
This reverts commit ac5128075e.
 2016-09-21 16:56:33 -05:00
Mike Pope 58f0b3ee6b One more refinement to the RCCP comparator. 2016-09-21 17:08:16 +09:30
Mike Pope 8f40715c4f Sort all modifier collections explicitly. 2016-09-21 17:02:39 +09:30
Mike Pope 34ea1a4d47 Drop time sorting for LastSale, it is irrelevant. 2016-09-21 16:24:06 +09:30
Mike Pope ab3dd63643 Improve building comparison further. 2016-09-21 16:06:11 +09:30
Mike Pope c4ebf1528e Use explicit comparator for building sorts. 2016-09-21 14:25:02 +09:30
Mike Pope 805688c4c5 Make score sorting use an explicit comparator. 2016-09-21 13:53:30 +09:30
calebrw 0caee46548 Add Javadoc to BuildQueuePanel and CaptureGoodsDialog classes. 2016-09-20 22:42:44 -05:00
calebrw ac5128075e Revert "Fix for jar finding in freecol.sh, from Michael Vetter." 
This reverts commit d74dff90cb.
 2016-09-20 21:32:31 -05:00
Mike Pope 5a077f510c Drop the specific id tag for AI objects, BR#2985. 2016-09-21 09:30:43 +09:30
Mike Pope 49127057c5 Next cut at BR#2985. 2016-09-21 07:15:47 +09:30
Mike Pope 0017d293dd Sorting of AIObjects is breaking saves, BR#2985. 2016-09-20 20:16:02 +09:30
Mike Pope d74dff90cb Fix for jar finding in freecol.sh, from Michael Vetter. 2016-09-20 19:43:54 +09:30
Mike Pope d1f475e83d Add logging for save failure. 2016-09-20 18:56:33 +09:30
Michael Pope 3a6ff1d2a8 Simplify askHandling. 2016-09-20 18:31:25 +09:30
Mike Pope c2f1dc124f Revert incorrect import removals. 2016-09-20 18:29:14 +09:30
calebrw 2459f5d28d Add documentation to SwingGUI and Canvas classes 2016-09-19 23:44:42 -05:00
Michael Pope 88071107b2 Clean up the last javadoc warnings. 2016-09-19 18:16:41 +09:30
Michael Pope e2871a73e9 Fix unit-specific demotion messages. 2016-09-19 18:12:21 +09:30
calebrw 9de71cbe3e Javadoc cleanup to AboutPanel and InformationPanel 
A missing word is added to the InformationPanel.java file, while the Panel Layout section of the Javadoc is updated to show better after Javadoc generation.
 2016-09-18 23:19:16 -05:00
calebrw 0abd6c6356 Fix for bug #2899 
This bug is intended to to fix bug #2899 Unnecessary Scrolling after Battle, which appears when multiple messages are displayed by InformationPanel.java. Scrolling may still occur if the number of messages goes above two, but the spacing has been improved dramatically so that each set of text is grouped together better.
 2016-09-18 23:16:08 -05:00
calebrw 82f4968f01 Merge branch 'master' of ssh://git.code.sf.net/p/freecol/git 2016-09-18 17:37:23 -05:00
calebrw 7bc283e355 Update history.html on the FreeCol website. 2016-09-18 17:37:13 -05:00
calebrw 52d8cca823 Add @since to packages created during versions 0.5.x 2016-09-18 17:36:39 -05:00
Mike Pope 00d03e3088 Clean up magic numbers in InformationPanel. 2016-09-19 07:37:44 +09:30
calebrw 8031ffbb82 Add @since to packages created during versions 0.4.0 2016-09-18 16:26:03 -05:00
calebrw 7307a703ab Add @since to packages created during versions 0.2.0 and 0.2.1 
0.2.0 is documented in the "old code" section of the website. 0.2.1 is documented in the Git repository.
 2016-09-18 16:07:38 -05:00
calebrw 1e6d0c045c Update LaTeX-based document files 
This primarily fixes a few typos, but also makes the number of spaces after a period (full stop) consistent at a single space.

Some other minor grammatical bits are updated.
 2016-09-18 14:11:10 -05:00
calebrw a493a7a29a Update formatting of package-info.java files 2016-09-17 21:31:18 -05:00
calebrw c16bb6c16f Continue Javadoc Cleanup with a few missed items 2016-09-17 19:25:58 -05:00
calebrw f2861e2ba8 Merge branch 'master' of ssh://git.code.sf.net/p/freecol/git 
# Conflicts:
#	src/net/sf/freecol/common/model/Settlement.java
#	src/net/sf/freecol/common/util/CollectionUtils.java
 2016-09-17 18:59:10 -05:00
calebrw 3fffa8591a Cleanup Javadoc Warnings and Errors 2016-09-17 18:56:46 -05:00
Mike Pope fee3ea1553 Minor followon javadoc changes consequent to git.1a254b8. 2016-09-18 08:37:16 +09:30
calebrw 0dec38bc0a Replace package.html with package-info.java for all packages 
Created new package-info.java  files that did not previously exist.

Cleaned up HTML tags for as many package-info.java files as possible.
 2016-09-17 17:23:50 -05:00
calebrw 1a254b8b74 Cleanup Javadoc @param tags 
This fixes typos and changed method parameters
 2016-09-17 15:10:16 -05:00
calebrw 89c0ffa400 Improve Javadoc use of save method within OptionGroup and FreeColObject 2016-09-17 14:56:21 -05:00