search

nguillaumin / slick2d-maven

Maven distribution of the Slick2D Gava game development library
BSD 3-Clause "New" or "Revised" License
66 stars 36 forks source link

Merge development branch from upstream #10

Closed SagaciousZed closed 8 years ago

SagaciousZed commented 10 years ago

Note while merging Image.java: This changes Image.getScaledCopy to behave as in b235068e and produces a resampled image upon drawing. Image.getColor still does not account for scaled images but no longer throws ArrayOutOfBoundsExcepeption when getting new coordinates, instead it returns the unscaled color and if coordinates are larger than the original texture, the texture wraps.

This merely fixes the exception that arrises and does not the correct Image.getColor to be logically correct. The proper fix to Image.getColor would be to return the color as rendered by the Image draw call, regardless of the underlying implementation.

Conflicts: slick2d-core/src/main/java/org/newdawn/slick/Image.java slick2d-core/src/main/java/org/newdawn/slick/geom/Rectangle.java slick2d-core/src/test/java/org/newdawn/slick/tests/UnicodeFontTest.java

nguillaumin commented 10 years ago

Hi,

That's a lot of changes in one go :) Am I correct in assuming that's the content of the dev branch from BitBucket? Was it really that different from the master one?

SagaciousZed commented 10 years ago

Yes, this was all from the tip of development of the BitBucket repo. It had like a year worth of commits.

nguillaumin commented 10 years ago

Is there any chance you could submit those as individual commits (to mirror the development branch history)? I'm a bit reluctant to merge that many changes in a single commit as it goes again the philosophy of a version control system and might cause problems in the future (e.g. it will make difficult to track down bugs, and prevents us to use git bisect if needed, etc.)

SagaciousZed commented 10 years ago

I am not against doing it, and I will look into doing this without too much manual work. That having been said, much of the development history has already been destroyed in the git history.