Fix merge conflicts in #281#288

Closed

heuermh wants to merge 203 commits intopiccolo2d:masterfrom

heuermh:42kbytes-master

Commits on Nov 20, 2023

Collections are now parametric

Otthon
authored and
Otthon
committed
List<PCamera paramerreization

Otthon
authored and
Otthon
committed
Parametrrization

Otthon
authored and
Otthon
committed
Deprecated Event Constants are updated

Otthon
authored and
Otthon
committed
Parametrization

Otthon
authored and
Otthon
committed
Parametrization

Otthon
authored and
Otthon
committed
Eclipse warning message supressed

Otthon
authored and
Otthon
committed
Eclipse warning message supressed

Otthon
authored and
Otthon
committed
Eclipse warning message supressed

Otthon
authored and
Otthon
committed
Event handler constant updated

Otthon
authored and
Otthon
committed
Parametrization

Otthon
authored and
Otthon
committed
Parametrization

Otthon
authored and
Otthon
committed
ZMarkObjectOutputStream was not closed before

Otthon
authored and
Otthon
committed
Parametrization

Otthon
authored and
Otthon
committed
Parametrization

Otthon
authored and
Otthon
committed
Parametrization

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Deprecated event Constant updated

Otthon
authored and
Otthon
committed
Deprecated event constant updated

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Parameterzation

Otthon
authored and
Otthon
committed
Unnecessary Import

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Deprecated event constant updated

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Deprecated event constant updated

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Deprecated event constant updated

Otthon
authored and
Otthon
committed
Serialization warning fixed

Otthon
authored and
Otthon
committed
Serialization warning fixed

Otthon
authored and
Otthon
committed
Serialization warning fixed

Otthon
authored and
Otthon
committed
Serialization warning fixed

Otthon
authored and
Otthon
committed
Unnecessary imports have been removed

Otthon
authored and
Otthon
committed
Unnecessary import is removed

Otthon
authored and
Otthon
committed
Deprecated method is updated

Otthon
authored and
Otthon
committed
Deprecated method is updated

Otthon
authored and
Otthon
committed
Deprecated method is updated

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Eclipse serialization warning fixed

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Unnecessary import removed

Otthon
authored and
Otthon
committed
Deprecated event constant updated

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
serialization warning fixed

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Reverted to original

Otthon
authored and
Otthon
committed
Nothing

Otthon
authored and
Otthon
committed

Commits on Nov 22, 2023

Nothing

Otthon
authored and
Otthon
committed
Parameterization, Warning messages fixed

Otthon
authored and
Otthon
committed
Parameterization, Warning messages fixed

Otthon
authored and
Otthon
committed
Parameterization, Warning messages fixed

Otthon
authored and
Otthon
committed
Parameterization, Warning messages fixed

Otthon
authored and
Otthon
committed
Parameterization, Warning messages fixed

Otthon
authored and
Otthon
committed
Parameterization, Warning messages fixed

Otthon
authored and
Otthon
committed
Parameterization, Warning messages fixed

Otthon
authored and
Otthon
committed
Parameterization, Warning messages fixed

Otthon
authored and
Otthon
committed
Parameterization, Warning messages fixed

Otthon
authored and
Otthon
committed
Parameterization, Warning messages fixed

Otthon
authored and
Otthon
committed
Parameterization, Warning messages fixed

Otthon
authored and
Otthon
committed
Parameterization, Warning messages fixed

Otthon
authored and
Otthon
committed
Unnecessary imports removed

Otthon
authored and
Otthon
committed
Unnecessary imports removed

Otthon
authored and
Otthon
committed
Unnecessary imports removed

Otthon
authored and
Otthon
committed
Removing ser warning messages

Otthon
authored and
Otthon
committed
Fixing serialization warnings

Otthon
authored and
Otthon
committed
Unnecessary imports

Otthon
authored and
Otthon
committed
KeyEvent.CHAR_UNDEFINED was added as a parameter to the constructor

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Nothing

Otthon
authored and
Otthon
committed
Serialization warning fixed

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Unnecesary import

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Deprecated event constants are updated

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
InputSrtream was not closed before

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Unnecessary import removed

Otthon
authored and
Otthon
committed
Unnecessary import removed

Otthon
authored and
Otthon
committed
Unnecessary import removed

Otthon
authored and
Otthon
committed
Unnecessary import removed

Otthon
authored and
Otthon
committed
Unnecessary import removed

Otthon
authored and
Otthon
committed
Unnecessary import removed

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
Unnecessary import

Otthon
authored and
Otthon
committed
waring fixed

Otthon
authored and
Otthon
committed
warning fixed

Otthon
authored and
Otthon
committed
event constant updated

Otthon
authored and
Otthon
committed
event constants are updated

Otthon
authored and
Otthon
committed
event constants are updated

Otthon
authored and
Otthon
committed
unnecessary import

Otthon
authored and
Otthon
committed
serilaization warning message fixed

Otthon
authored and
Otthon
committed
Parameterzation

Otthon
authored and
Otthon
committed
Parametrization

Otthon
authored and
Otthon
committed
warning message fixed

Otthon
authored and
Otthon
committed
Parameterzation

Otthon
authored and
Otthon
committed
warning message fixed

Otthon
authored and
Otthon
committed
Event constant updated

Otthon
authored and
Otthon
committed
Parameterization

Otthon
authored and
Otthon
committed
Warning messages fixed

Otthon
authored and
Otthon
committed
PArametrization

Otthon
authored and
Otthon
committed
Parameterzation

Otthon
authored and
Otthon
committed
Parametrization

Otthon
authored and
Otthon
committed
Parametrization

Otthon
authored and
Otthon
committed
Parametrization

Otthon
authored and
Otthon
committed
Nothing

Otthon
authored and
Otthon
committed
Parametrization

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Source code reformatted

Otthon
authored and
Otthon
committed
warnings removed

Otthon
authored and
Otthon
committed
Deprecate method has been removed

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed
Packages 'core' and 'extras' are merged.

Otthon
authored and
Otthon
committed

Commits on Feb 15, 2025

Fix merge conflicts.
heuermh
committed

Fix merge conflicts in #281#288heuermh wants to merge 203 commits intopiccolo2d:masterpiccolo2d/piccolo2d.java:masterfrom heuermh:42kbytes-masterheuermh/piccolo2d.java:42kbytes-masterCopy head branch name to clipboard

Commits

Commits on Nov 20, 2023

Commits on Nov 22, 2023

Fix merge conflicts in #281#288
heuermh wants to merge 203 commits intopiccolo2d:masterfrom
heuermh:42kbytes-master