2970e5cecd 
								
							 
						 
						
							
							
								
								fixed Convo  
							
							
							
						 
						
							2024-03-09 12:03:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								614654692f 
								
							 
						 
						
							
							
								
								changed Book and Convo, renamed Speech  
							
							
							
						 
						
							2024-03-09 11:11:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								bd5ff8b3fe 
								
							 
						 
						
							
							
								
								fixed wall colision  
							
							... 
							
							
							
							added object collision for mobs
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-08 08:36:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								31a9742a9c 
								
							 
						 
						
							
							
								
								attack now with left mouse click  
							
							... 
							
							
							
							emter conversaton now with f
no change to leave conversation
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-07 20:50:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								a68bba70bb 
								
							 
						 
						
							
							
								
								image files changed  
							
							... 
							
							
							
							new mob sprites
relocated all image files
disabled collision between player and npcs and mobs
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-07 14:57:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								b7fb7e1f1e 
								
							 
						 
						
							
							
								
								Merge branch 'main' of  https://git.spafi.eu/Lyzzy/game  
							
							... 
							
							
							
							Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-07 13:56:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								b368fe4665 
								
							 
						 
						
							
							
								
								zombie speech and fireplace  
							
							
							
						 
						
							2024-03-07 12:52:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								af5204857b 
								
							 
						 
						
							
							
								
								some fixes  
							
							... 
							
							
							
							forgot what i did 
							
						 
						
							2024-03-07 09:43:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								1b6ccb17b0 
								
							 
						 
						
							
							
								
								Merge branch 'Development' of  https://git.spafi.eu/InfoProjekt/game  
							
							
							
						 
						
							2024-03-07 07:49:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								6034a8382f 
								
							 
						 
						
							
							
								
								changed image size  
							
							... 
							
							
							
							Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-07 07:49:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								41f8b76b90 
								
							 
						 
						
							
							
								
								added Label class  
							
							... 
							
							
							
							Label class in classes, added text to book, changed wind spell a bit but dunno if really good 
							
						 
						
							2024-03-06 17:40:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								25f04f994f 
								
							 
						 
						
							
							
								
								added Label class  
							
							... 
							
							
							
							added Label class in classes and added text to book, changed wind attack a bit but idk if good 
							
						 
						
							2024-03-06 17:35:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								501e84181f 
								
							 
						 
						
							
							
								
								added a new missile  
							
							... 
							
							
							
							new to character: wind slash attack
added projectile lifetime (in frames, maybe change to 5*fps later)
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-06 14:26:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								953edca694 
								
							 
						 
						
							
							
								
								updated the button class -> can now take any arguments for the onClick Function  
							
							... 
							
							
							
							changed all buttons according to this
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-06 12:10:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								ef3a617e4d 
								
							 
						 
						
							
							
								
								Merge branch 'main' of  https://git.spafi.eu/Spafi/game ; branch 'main' of  https://git.spafi.eu/Lyzzy/game  
							
							
							
						 
						
							2024-03-06 07:42:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								4cfb4b92f0 
								
							 
						 
						
							
							
								
								Dateien nach "/" hochladen  
							
							
							
						 
						
							2024-03-05 15:48:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								3ad2ad6478 
								
							 
						 
						
							
							
								
								optimized collision with npcs and mobs  
							
							... 
							
							
							
							added wall collision
enabled hitboxes for object and wall highlighting
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-04 17:15:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								0cd9444222 
								
							 
						 
						
							
							
								
								Merge branch 'Development' of  https://git.spafi.eu/InfoProjekt/game  
							
							... 
							
							
							
							Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-03 13:36:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								d86f8c360b 
								
							 
						 
						
							
							
								
								fixed bug which stopped movement if colliding with projectiles  
							
							... 
							
							
							
							Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-03 13:31:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								b29a279fb1 
								
							 
						 
						
							
							
								
								Gegner Schaden, Buch, Main Angriff, NPC  
							
							... 
							
							
							
							Dem Gegner kann jetzt durch Main Angriff Schaden zugefügt werden und er kann sterben
Das Buch kann durch Drücken von e geöffnet werden, das Spiel hält an
Der Main kann (nachdem mit NPC geredet) Feuerbälle mit f schießen (Schussrichtung adden!!)
Ein NPC wurde hinzugefügt, der steht. Main redet automatisch mit ihm wenn main reinläuft. Durch Leertaste wird Unterhaltung beendet. 
							
						 
						
							2024-03-01 21:56:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								f6827b5f05 
								
							 
						 
						
							
							
								
								revert  8b2dab980b 
							
							... 
							
							
							
							revert Schaden Gegner, Buch, Angriff 
							
						 
						
							2024-03-01 21:50:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								8b2dab980b 
								
							 
						 
						
							
							
								
								Schaden Gegner, Buch, Angriff  
							
							
							
						 
						
							2024-03-01 21:46:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								218eb2ea7e 
								
							 
						 
						
							
							
								
								added some missing spaces lol  
							
							... 
							
							
							
							added character collisions (not great yet tho)
some simple background elements added and testet WIP 
							
						 
						
							2024-02-29 14:25:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								a9e99da219 
								
							 
						 
						
							
							
								
								fixed arrow oriantation  
							
							... 
							
							
							
							randomised skeletton move speed
changed Iframes to 250 ms 
							
						 
						
							2024-02-26 12:21:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								15d39949b4 
								
							 
						 
						
							
							
								
								pull from main repository  
							
							
							
						 
						
							2024-02-26 08:23:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								2e66145dcc 
								
							 
						 
						
							
							
								
								first movement (wasd) with character integrated  
							
							... 
							
							
							
							started a new class for scenes
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-02-16 17:34:37 +01:00