From 426baa7f2546c0c434cb06d499c077a3372ea1cc Mon Sep 17 00:00:00 2001 From: Jannik Niebuhr Date: Wed, 11 May 2022 19:09:22 +0200 Subject: [PATCH] =?UTF-8?q?=C3=84nderung=20HA4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- prog2-codebase/.metadata/.log | 53 ++++++++++++++++++ .../.root/{14.tree => 15.tree} | Bin 18091 -> 18018 bytes .../.safetable/org.eclipse.core.resources | Bin 847 -> 854 bytes .../org.eclipse.e4.workbench/workbench.xmi | 6 +- .../externalLibsTimeStamps | Bin 1508 -> 1508 bytes .../0.log | 1 + .../org.eclipse.ui.ide/dialog_settings.xml | 8 +++ prog2-codebase/.metadata/version.ini | 2 +- spaceinvaders/.gitignore | 1 + spaceinvaders/GameProject/bin/.gitignore | 8 +++ .../bin/playground/LevelWithBox.class | Bin 685 -> 929 bytes spaceinvaders/GameProject/log/log4j.log | 28 +++++++++ .../src/playground/LevelWithBox.java | 4 +- 13 files changed, 106 insertions(+), 5 deletions(-) rename prog2-codebase/.metadata/.plugins/org.eclipse.core.resources/.root/{14.tree => 15.tree} (98%) create mode 100644 spaceinvaders/.gitignore create mode 100644 spaceinvaders/GameProject/bin/.gitignore diff --git a/prog2-codebase/.metadata/.log b/prog2-codebase/.metadata/.log index 8fdb582..11b841d 100644 --- a/prog2-codebase/.metadata/.log +++ b/prog2-codebase/.metadata/.log @@ -765,3 +765,56 @@ user global configuration and to define the default location to store repositori not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and EGit might behave differently since they see different configuration options. This warning can be switched off on the Team > Git > Confirmations and Warnings preference page. +!SESSION 2022-05-11 16:41:37.328 ----------------------------------------------- +eclipse.buildId=4.23.0.I20220308-0310 +java.version=17.0.1 +java.vendor=Oracle Corporation +BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=de_DE +Framework arguments: -product org.eclipse.epp.package.java.product +Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.java.product + +!ENTRY org.eclipse.jface 2 0 2022-05-11 16:41:57.902 +!MESSAGE Keybinding conflicts occurred. They may interfere with normal accelerator operation. +!SUBENTRY 1 org.eclipse.jface 2 0 2022-05-11 16:41:57.903 +!MESSAGE A conflict occurred for CTRL+SHIFT+T: +Binding(CTRL+SHIFT+T, + ParameterizedCommand(Command(org.eclipse.jdt.ui.navigate.open.type,Open Type, + Open a type in a Java editor, + Category(org.eclipse.ui.category.navigate,Navigate,null,true), + org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@f3876ef, + ,,true),null), + org.eclipse.ui.defaultAcceleratorConfiguration, + org.eclipse.ui.contexts.window,,,system) +Binding(CTRL+SHIFT+T, + ParameterizedCommand(Command(org.eclipse.lsp4e.symbolinworkspace,Go to Symbol in Workspace, + , + Category(org.eclipse.lsp4e.category,Language Servers,null,true), + org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@6b751cb1, + ,,true),null), + org.eclipse.ui.defaultAcceleratorConfiguration, + org.eclipse.ui.contexts.window,,,system) +!SUBENTRY 1 org.eclipse.jface 2 0 2022-05-11 16:41:57.903 +!MESSAGE A conflict occurred for ALT+SHIFT+R: +Binding(ALT+SHIFT+R, + ParameterizedCommand(Command(org.eclipse.jdt.ui.edit.text.java.rename.element,Rename - Refactoring , + Rename the selected element, + Category(org.eclipse.jdt.ui.category.refactoring,Refactor - Java,Java Refactoring Actions,true), + org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@df9d400, + ,,true),null), + org.eclipse.ui.defaultAcceleratorConfiguration, + org.eclipse.ui.contexts.window,,,system) +Binding(ALT+SHIFT+R, + ParameterizedCommand(Command(org.eclipse.ui.edit.rename,Rename, + Rename the selected item, + Category(org.eclipse.ui.category.file,File,null,true), + org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@4ec427, + ,,true),null), + org.eclipse.ui.defaultAcceleratorConfiguration, + org.eclipse.ui.contexts.window,,,system) + +!ENTRY org.eclipse.egit.ui 2 0 2022-05-11 16:42:17.687 +!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git +user global configuration and to define the default location to store repositories: 'C:\Users\birgi'. If this is +not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and +EGit might behave differently since they see different configuration options. +This warning can be switched off on the Team > Git > Confirmations and Warnings preference page. diff --git a/prog2-codebase/.metadata/.plugins/org.eclipse.core.resources/.root/14.tree b/prog2-codebase/.metadata/.plugins/org.eclipse.core.resources/.root/15.tree similarity index 98% rename from prog2-codebase/.metadata/.plugins/org.eclipse.core.resources/.root/14.tree rename to prog2-codebase/.metadata/.plugins/org.eclipse.core.resources/.root/15.tree index 01593a3e83a96e426bb71467dc4850cebb637c03..c1956995113b7b4ddffb4133d6e94601f8d0d1f3 100644 GIT binary patch delta 37 ncmZ48%lN2=k%xtuiHQLWctj`i7_u@jGBGl2Y?g6j0SN*CeTfB9 delta 94 zcmaFV!??Pak%xtuiHQLWxb{!vF%)2A;C4^UO${i@&q_@$VNjS{z$mJil~|UTRGOKS bl3D~*imHT>nTdgMqmzsq4>x^a`76yi9#wI4F6AP6#n=`R8GMY}F#OQ!Wfv_nr*MW%N SpOyD8h)4x~?y25gehdKj5E+#K delta 167 zcmcb{cAjm59;>mrm8r$#dyHlr=9U)b76z8a6AP7?ONvS-KV*`c9K*y3WAmk?CY7e^ zCFd8V+Crq|CU0P3g-Xj!ZeV0(fl6o~33BoS6{qrY>FbpgrKZ{%noOR_=zzu6jfLur Z!X~_22O@rdR^G!PA{F?#r+Rn!F#xd4Hxd8< diff --git a/prog2-codebase/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/prog2-codebase/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi index b8e9461..5a7215c 100644 --- a/prog2-codebase/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ b/prog2-codebase/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -394,7 +394,7 @@ Draggable - + toolbarSeparator @@ -425,7 +425,7 @@ Draggable - + toolbarSeparator @@ -2182,7 +2182,7 @@ - + diff --git a/prog2-codebase/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps b/prog2-codebase/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps index 6b36e050e18228eee33c4a955346d23b88ed258b..a665ce17eb1fa563570a493991d9e5c76ac0802d 100644 GIT binary patch delta 55 zcmaFD{e*kNK_N{R3=w5znXlCC7LmM@@W>M$un4t7=yv8 HB3Ziu0Ra)M delta 49 zcmaFD{e*kNL8i&_%;u91GQ}}^O+Lt?GP#=h)#L*#sf>X@p3&qPEE
+
+ + +
+
+ + +
diff --git a/prog2-codebase/.metadata/version.ini b/prog2-codebase/.metadata/version.ini index f97df4e..34675d0 100644 --- a/prog2-codebase/.metadata/version.ini +++ b/prog2-codebase/.metadata/version.ini @@ -1,3 +1,3 @@ -#Tue May 10 18:50:44 CEST 2022 +#Wed May 11 16:41:46 CEST 2022 org.eclipse.core.runtime=2 org.eclipse.platform=4.23.0.v20220308-0310 diff --git a/spaceinvaders/.gitignore b/spaceinvaders/.gitignore new file mode 100644 index 0000000..e10e727 --- /dev/null +++ b/spaceinvaders/.gitignore @@ -0,0 +1 @@ +/.metadata/ diff --git a/spaceinvaders/GameProject/bin/.gitignore b/spaceinvaders/GameProject/bin/.gitignore new file mode 100644 index 0000000..aa21310 --- /dev/null +++ b/spaceinvaders/GameProject/bin/.gitignore @@ -0,0 +1,8 @@ +/base/ +/collider/ +/controller/ +/gameobjects/ +/log4j2.xml +/playground/ +/rendering/ +/ui/ diff --git a/spaceinvaders/GameProject/bin/playground/LevelWithBox.class b/spaceinvaders/GameProject/bin/playground/LevelWithBox.class index 4d9c8a78336ff7906eb032109f4f2b25206375f6..929c98999e4b6c1e17acba3a596e3d118a15f387 100644 GIT binary patch literal 929 zcmZ`&ZEn**5Pcg5=L6SigBw~(fk1)8B{kpt2trX?Kp;a=gM#{V6R%uXt{pi}fCF$J zKtLprH~^>UNf6_8giHZT-ksTCY!hhw( z`Di8#PjiCUqml?-xmy3I~;Jo$0INCXNUQC-y1P3 zXDelepb;*(BJRdKipRreVl?6|VHu6)-)xI88Oo$yOCr=6v|%KMJQ6d(7XQ&=vzN%R zpra?_@BUura8|^nvHyzd_rp>de5rfvT<>Fbvc_VrhzVpHcrn@i|zDq{sQNr#b*Ej delta 406 zcmZ9H%}xR_6opSg1S*OSDE=+F6G#jjR&I^aoi23YvM?1!XWFq85)u>QBM_dz2QbkU zi6*-DC43X(kFe%?L+)UiM0$HV&)%Z?iCfo+VwS$&YkCPV&K z_GB%Tx>Y-|*4PY643AgZs*VYJ$`?%&#X%@tV6=#>X@n{|5