peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity
39 Commits 19 Branches 3 Tags
9e591e37c3741a493263b07ce9fc2abc0766bbc9
Commit Graph

39 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fleischer Hanno hanno.fleischer@unibw.de
9e591e37c3 Added sound to rocket firing 2024-10-13 08:58:48 +02:00
Hanno Fleischer
487305dccc added the rocket sound wav and fixed code and check style 
also includes minor fixes
 2024-10-13 08:09:19 +02:00
Hanno Fleischer
22d827b074 adjusted positioning of the modern battle ship and set fullscreen mode to false 2024-10-11 11:53:13 +02:00
Hanno Fleischer
074b38540d Merge branch 'b_Fleischer_Hanno' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into b_Fleischer_Hanno 2024-10-11 11:47:05 +02:00
Hanno Fleischer
3838766504 added a fire effect for hit ships 
this will now display a burning fire at the position where the ships was hit
and displays it until thge ship is removed.
 2024-10-11 11:46:37 +02:00
Fleischer Hanno hanno.fleischer@unibw.de
54e5719edf added README.txt for the rocket model to credit its source 2024-10-11 10:49:04 +02:00
Hanno Fleischer
9df809ded5 adjusted the ModernBattleShip to be a j30 object and load withc its corresponding texture 2024-10-11 09:54:12 +02:00
Hanno Fleischer
93ae95ce59 adjusted size of rocket, and removed unused methods and import statements 2024-10-11 09:42:12 +02:00
Hanno Fleischer
ffd3951a78 added JavaDocs commects where they where missing and removed outcommented code 2024-10-11 01:25:10 +02:00
Hanno Fleischer
c56767d994 added rest solution for exercise 13 
added the representation for the shell element in the map which will be displayed when you shoot,
 2024-10-11 00:48:40 +02:00
Fleischer Hanno hanno.fleischer@unibw.de
f99b91324c part solution for exercise 13 
added an animation state for the server and client and gave it the functionality to display a 3d model representing the shot of the other person
adjusted the server to serialize the new messages for handling the animation states
 2024-10-10 23:10:39 +02:00
Fleischer Hanno hanno.fleischer@unibw.de
da2508395c fixed minor issues and cleaned up code to not include duplicate code. 2024-10-07 17:54:35 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
4820a76ff0 added the backgroundmusic to listeners in the initsimpleapp 
and not in the getter of backgroundmusic.
 2024-10-05 21:07:00 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
9dc3984f35 renamed the method in BackgroundMusic 
renamed the method toogleMusic to toggleMusic.
 2024-10-05 19:08:57 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
f6f87c4f5d adjusted the preferences in BackgroundMusic and MainVolume 2024-10-05 18:51:25 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
d3429bf4f0 fixed a bug at the victory music 
the victory audio node was not part of the set volume method
now implemented the method to set volume for victory music.
 2024-10-05 18:40:30 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
ecbe486d3b minor tweaks to make the code pass the check style 2024-10-05 18:25:25 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
52673dfbce added MainVolume slider in the menu 
added the logic so that the volume of music or sound is multiplied by the main volume
created the class MainVolume to handle the logic of the main volume
adjusted methods in GameSounds and BackgroundMusic to integrate main volume
 2024-10-05 17:32:14 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
586251b2ad adjusted the paths of the music 
added the README.txt for each music piece to state the source of the music.
 2024-10-05 14:46:08 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
ca57507b53 added the missing solution for exercise 12 
ships will now sink when destroyed and will be removed when they are fully submerged
 2024-10-05 14:06:45 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
44a25a2e1f added part solution for exercise 12 
added the Effecthandler class to handle the effects for a shot hit or missed
added jme3-effects libary and used it to display the effects for the shots
minor tweaks the the gui and backgroundmuisc
 2024-10-05 13:20:34 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
dca0875ad5 Adjusted tthe logic of the server and client 
when the client sends a wrong map the server will send the client back to the editro state
 2024-10-05 12:35:49 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
0f629252bc fixed the toggle button for the victory music 
added the pause(gameOverMusicV) to the toggle method for the music control
so that it will be paused when the music is turned off.
 2024-10-05 09:01:48 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
b18705f064 added the logic to play diffrent Background music during diffrent states 
added the a Enum for the Music and the MusicEvent
added a song for the game victory
adjusted the backgroundmusic class to handle the logic of the new song
added the Backgroundmusic to the ClientLogic as a EventListener.
 2024-10-04 20:43:37 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
961242bb20 added missing javadocs in the NetworkDialog.java 2024-10-04 17:30:21 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
05271beded changed the postion of the host server checkbox 
moved the checkbox form below the connect button inside the input
container for the hostname and port. The checkbox is the lowest seated
element in the input container now.
 2024-10-04 15:49:07 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
f6bc65471a added solution for exercise 11 
added a checkbox to start a server from your client
copied the server to the client and removed its main method and changed the constructor to public
 2024-10-04 15:40:38 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
0f080363f3 adjusted the in/de-crement button 
adjusted the delta of the slider so the button hav smaller steps in between
 2024-10-03 18:33:56 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
6e0a93b74d fixed toggleMusic in BackgroundMusic.java 
changed the Preference save form volume to the boolean musicenable
 2024-10-03 17:56:12 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
d471f524d0 solution for exercise 10 
added BackgroundMusic which is being handled in BackgroundMusic.java
changed the menu to incoporate volume controls for the music
 2024-10-03 17:39:54 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
d15f1a3f5f edited battleship.properties 
added a new error message in case ships are out of bounds
 2024-10-02 21:04:59 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
562a478ef8 added solution for exercise 9 
added the models for the 3 remaining ship types
and implemented them in the SeaSynchronizer.java
also added the correct logic for the ships to be displayed correctly
 2024-10-02 20:56:05 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
46f75188cb fixed the code for exercise 8 
fixed the code so that it uses a for each loop instead of an for int i
and adjusted the part for validating ship overlaping to use the
isCollidingWith method of Battleship
 2024-10-02 17:35:34 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
7b70666332 added the solution for exercise 8 for the client 
added the checkMapToLoad() in EditorState.java so if the Player tries to
load a map it will be checked if the placement is correct.
 2024-10-02 14:50:14 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
1bac56c92c adjusted the server Mapcheck 
inverted the else if statement in ServerGameLogic.java received() so that
if the map check returns that the map is correct the programm continues on
instead of throwing an error message and removed the hard limit of an 10x10 map in the checkMap() Method
 2024-10-02 14:16:46 +02:00
Hanno Fleischer hanno.fleischer@unibw.de
4dcd53a660 Added part-solution for exercise 8 
added the solution for exercise 8 for the sever sided test to ServerGameLogic.java
 2024-10-02 13:57:17 +02:00
Fleischer Hanno hanno.fleischer@unibw.de
f759eddda1 solution exercise 7 
edited in BattleState.java the receivedMsg() method so that if the game moves to the game over state
the remaining opponent ships will be added to the list of the opponenets instead of your own list.
edited the ShipMap.java so that when the notifylisteners is called for removing an object it will be
handled as an ItemRemovedEvent instead of an ItemAddedEvent
 2024-10-02 11:01:13 +02:00
Mark Minas
71a4ac8d12 added contents 2024-09-18 17:04:31 +02:00
Mark Minas
d28b17eba5 initial commit 2024-09-18 17:04:31 +02:00