Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: FreeCol/freecol
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.2.0
Choose a base ref
...
head repository: FreeCol/freecol
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: sf-auto-merge
Choose a head ref

Commits on Jul 4, 2024

  1. Fixes typo in changelog.

    stiangre committed Jul 4, 2024
    Copy the full SHA
    6588429 View commit details
  2. Copy the full SHA
    de29282 View commit details
  3. Copy the full SHA
    89da386 View commit details

Commits on Jul 6, 2024

  1. Scrolling increments is now adjusted according to the current font si…

    …ze. This applies when scrolling with the mouse wheel or the scroll bar buttons. The calculation has now been moved into the LaF class for the scroll pane. Components can still specify a block increment if there's a logical amount of pixels to scroll (for example to completely show a new item.
    stiangre committed Jul 6, 2024
    Copy the full SHA
    4472b16 View commit details

Commits on Jul 8, 2024

  1. Copy the full SHA
    c74b55d View commit details
  2. Copy the full SHA
    ed336bb View commit details
  3. Copy the full SHA
    835e876 View commit details
  4. Website: Adding download link to Intel mac build. Make the developmen…

    …t version link less prominent.
    stiangre committed Jul 8, 2024
    Copy the full SHA
    fa5e59f View commit details
  5. Copy the full SHA
    bcbdc20 View commit details
  6. Fixes a bug that caused full repaints when moving units. The bug was …

    …caused by zero size dirty area rectangles influencing the x,y position of the dirty area. This has been fixed by using negative width and height.
    stiangre committed Jul 8, 2024
    Copy the full SHA
    bef6d77 View commit details
  7. Copy the full SHA
    79111f8 View commit details
  8. Copy the full SHA
    2cfda49 View commit details
  9. Copy the full SHA
    bb7f894 View commit details
  10. Copy the full SHA
    17be545 View commit details
  11. Fixes the calculation of the maximum tile production (with tile impro…

    …vements and efficiency bonuses).
    stiangre committed Jul 8, 2024
    Copy the full SHA
    bdcd2d6 View commit details
  12. Copy the full SHA
    7fad340 View commit details

Commits on Jul 9, 2024

  1. Disabling "expertsHaveConnections" for the classic ruleset. Verified …

    …it's not in the original game for the viceroy difficulty.
    stiangre committed Jul 9, 2024
    Copy the full SHA
    3365eae View commit details
  2. Copy the full SHA
    14d7f79 View commit details

Commits on Jul 10, 2024

  1. Adding a new AI ColonyPlan that will eventually replace the old one a…

    …nd logic that is currently inside AIColony.
    
    So far, this implementation only includes defining what's the perfect colony for a given location and a debug utility to watch the result. Later, we will be adding a class for refining this plan with the current available workers, buildings and production multipliers -- so that it can be used by AIColony.
    
    The results so far will be verified before improving the committed code, writing tests for edge cases and continuing the work with the AI colony management code.
    stiangre committed Jul 10, 2024
    Copy the full SHA
    29b132c View commit details
  2. Fixes an issue where debug created colonies lack the secondary produc…

    …tion on the colony tile.
    stiangre committed Jul 10, 2024
    Copy the full SHA
    8a1445c View commit details
  3. Copy the full SHA
    b3250bd View commit details

Commits on Jul 11, 2024

  1. Copy the full SHA
    698f21a View commit details
  2. Allow mods to add modifiers for the education teaching time. Scope ch…

    …ecks are applied to the teacher.
    stiangre committed Jul 11, 2024
    Copy the full SHA
    a99a13c View commit details
  3. Copy the full SHA
    fd99eb4 View commit details

Commits on Jul 12, 2024

  1. Copy the full SHA
    f107cdd View commit details
  2. Copy the full SHA
    1f121b6 View commit details
  3. Copy the full SHA
    8243743 View commit details

Commits on Jul 13, 2024

  1. Copy the full SHA
    5616e40 View commit details
  2. Adds functionality for making custom modal internal frame dialogs. St…

    …andard confirm and input dialogs are now using this new functionality.
    stiangre committed Jul 13, 2024
    Copy the full SHA
    afc077e View commit details
  3. Changes the default for most confirm dialogs to OK. Operations that w…

    …e consider too destructive should have Cancel as the default.
    stiangre committed Jul 13, 2024
    Copy the full SHA
    ceca64e View commit details
  4. Copy the full SHA
    80a685a View commit details

Commits on Jul 14, 2024

  1. Copy the full SHA
    01ff729 View commit details
  2. Copy the full SHA
    8b52a39 View commit details
  3. Copy the full SHA
    b005bbe View commit details
  4. Copy the full SHA
    f668b47 View commit details

Commits on Jul 15, 2024

  1. Copy the full SHA
    a3f4260 View commit details
  2. Fixes the icon between the status elements on menubar on Windows. The…

    … issue was caused by the source code being built with iso-8859-1 instead of utf-8. I have fixed the build so that UTF-8 characters can be used, in addition to using the unicode escape for the character causing the problem (both fixes the problem alone).
    stiangre committed Jul 15, 2024
    Copy the full SHA
    57af674 View commit details
  3. Copy the full SHA
    e87456e View commit details

Commits on Jul 16, 2024

  1. Copy the full SHA
    b52d325 View commit details
  2. Converting the meeting the natives dialog into a normal panel. Moving…

    … the tutorial message into a help button.
    stiangre committed Jul 16, 2024
    Copy the full SHA
    3f53f28 View commit details
  3. Fixes the ok button focus.

    stiangre committed Jul 16, 2024
    Copy the full SHA
    432dc08 View commit details
  4. Copy the full SHA
    5fc3f28 View commit details
  5. The diplomacy dialog has now been converted to a normal panel. Also, …

    …fixes lots of layout issues and allows peace to be rechosen as a stance on first contact.
    stiangre committed Jul 16, 2024
    Copy the full SHA
    8390c81 View commit details
  6. Quickfix for a bug that prevented AI players from initiating diplomac…

    …y. The reason for the bug was that the diplomacy session was invalidated at end-of-turn ... and this happend automatically (almost no time to respond). The quickfix is waiting until all sessions have been resolved before ending the turn. This allows the human player to answer the request (and similar for other sessions). The problem with the quickfix is that the progress might be blocked indefinitely. That's why reconnect/logout now completes all sessions.
    stiangre committed Jul 16, 2024
    Copy the full SHA
    ab3e8ef View commit details
  7. Copy the full SHA
    0832ea7 View commit details

Commits on Jul 17, 2024

  1. Copy the full SHA
    f54d6e7 View commit details
  2. Copy the full SHA
    7330210 View commit details

Commits on Jul 18, 2024

  1. Copy the full SHA
    9632e93 View commit details

Commits on Jul 22, 2024

  1. Copy the full SHA
    14662ba View commit details
  2. Fixes lots of IDE warnings.

    stiangre committed Jul 22, 2024
    Copy the full SHA
    097af54 View commit details
Loading