93ae95ce59
adjusted size of rocket, and removed unused methods and import statements
Hanno Fleischer
2024-10-11 09:42:12 +02:00
ffd3951a78
added JavaDocs commects where they where missing and removed outcommented code
Hanno Fleischer
2024-10-11 01:25:10 +02:00
c56767d994
added rest solution for exercise 13 added the representation for the shell element in the map which will be displayed when you shoot,
Hanno Fleischer
2024-10-11 00:45:49 +02:00
264b854cbe
bug fix fixed first few fire frames being displayed at the edge of the map added README.txt files for used images
Timo Brennförder
2024-10-10 23:26:15 +02:00
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
Fleischer Hanno hanno.fleischer@unibw.de
2024-10-10 23:10:39 +02:00
30a735bd6e
added 'Shell' and 'ShellControl' and editet the two visitors 'Visitor' and 'VoidVisitor'
Benjamin Feyer
2024-10-10 22:23:55 +02:00
24f20f855f
solution for number 12 added water splash for misfires added explosion, debris and fire for hit
Timo Brennförder
2024-10-10 21:51:11 +02:00
5dd3df50c5
Adjust particle effects
Felix Koppe
2024-10-10 15:47:21 +02:00
2c4e2fd92d
improved code to pass the code analysis
Daniel Grigencha
2024-10-09 23:30:28 +02:00
08c5eeb63d
added realistic visual effects to the game - imported the jme3-effects library - edited SeaSynchronizer to handle different effects - added to the ShipControl class in the controlUpdate(float tpf) method the handler that moves a destroyed ship downward
Daniel Grigencha
2024-10-09 23:28:02 +02:00
6100e95e76
Aufgabe 13 added class Shell for the feature Airstrike added class ShellControl for the feature Airstrike added new Model Bomb to implement the feature Airstrike added README´S to the Models to show the free to use license edited class ShipMap for the feature Airstrike edited class ImpactEffectManager to improve the Fire and Water Particles edited class MapViewSynchronizer for the feature Airstrike edited class BattleState for the feature Airstrike edited class BattleshipApp for the feature Airstrike
Lukas Bauer
2024-10-09 21:10:31 +02:00
9d5f3ac396
added the feature that a client can host a server
Daniel Grigencha
2024-10-09 18:29:16 +02:00
28ba183b84
fixed BackgroundMusic
Daniel Grigencha
2024-10-09 16:56:38 +02:00
a44cbf2a72
added background music to the game
Daniel Grigencha
2024-10-09 02:14:46 +02:00
a7c3632a59
Add hit/miss effects
Felix Koppe
2024-10-09 07:41:14 +02:00
ec80dd40ce
added JavaDocs to the FloatMath class
Daniel Grigencha
2024-10-09 02:00:27 +02:00
dffb5b4d63
corrected the server based validation in 'WaitState' and 'ServerGameLogic' and 'battleship.properties' and 'battleship_de.properties' and reformatted 'SeaSynchronizer' corrected the 'ServerGameLogic' so it will send new GameLogic and will be still in EditorState, when presented with an invalid map and added in the properties the keys writen in 'WaitState' and added the 'ReceivedGameLogic', to receive new GameDetails
Benjamin Feyer
2024-10-08 23:05:51 +02:00
d53e8577d8
edited 'SeaSynchronizer' and 'ShipControl' for Nr. 12 so now the fire on the ship will be displayed, the seasynchronizer handels it, in the 'ShipControl' the sinking of a sunken ship is implemented
Benjamin Feyer
2024-10-08 21:20:51 +02:00
865b0fc33c
Aufgabe 12 added class ImpactEffectManager to implement the funktionality with hit or miss particles added map4 for particle testing purposes edited class SeaSynchronizer in order to implement the particle feature edited class ShipControl in order to implement the particle feature edited settings.gradle in order to implement the particle feature
Lukas Bauer
2024-10-08 19:43:07 +02:00
54d8ad57cb
added the 'SeaSynchronizer' so if the shot hits or misses, a particle is shown, hereby I modified the visit(Shot shot) handleHit and added the 'createMissParticle' and 'createHitParticle' methods
Benjamin Feyer
2024-10-08 17:16:09 +02:00
05eb0f92ea
Add client host capability
Felix Koppe
2024-10-08 14:14:53 +02:00
f96c63e76e
Add music
Felix Koppe
2024-10-08 12:41:24 +02:00
5a9b0b1de0
fix Aufgabe 11 edited class NetworkDialog to change the logic that the checkbox works now as intended moved BattleshipServer and ReceivedMessage into own folders to separate server from client
Lukas Bauer
2024-10-07 20:11:15 +02:00
da2508395c
fixed minor issues and cleaned up code to not include duplicate code.
Fleischer Hanno hanno.fleischer@unibw.de
2024-10-07 17:54:35 +02:00
9dbac0b226
Add ship models
Felix Koppe
2024-10-06 23:13:29 +02:00
7ef06f2440
Fix logic error
Felix Koppe
2024-10-06 22:09:45 +02:00
95fdd86100
Add clientside and serverside map check
Felix Koppe
2024-10-06 19:33:30 +02:00
5edd4ebe0b
Added Ex. 10 added client hosts a server added javadoc comments
Cedric Beck
2024-10-06 14:29:31 +02:00
4820a76ff0
added the backgroundmusic to listeners in the initsimpleapp and not in the getter of backgroundmusic.
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-05 21:07:00 +02:00
dac84388fc
added different music for different game states
Timo Brennförder
2024-10-05 20:56:26 +02:00
9dc3984f35
renamed the method in BackgroundMusic renamed the method toogleMusic to toggleMusic.
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-05 19:08:57 +02:00
f6f87c4f5d
adjusted the preferences in BackgroundMusic and MainVolume
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-05 18:51:25 +02:00
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.
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-05 18:40:30 +02:00
ecbe486d3b
minor tweaks to make the code pass the check style
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-05 18:25:25 +02:00
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
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-05 17:32:14 +02:00
387bda04b9
edited the 'networkDialog' and added 'battleShipLocalServer' and 'ReceivedMessage' and 'README' edited the networkDialog so the client can decide, whether he want, to connect to a derver or create and host a new one, added the 'BattleshipLocalServer', the class responcible for creating a new server and added 'Receivedmessage' and added a README for the Background-music licence
Benjamin Feyer
2024-10-05 15:33:27 +02:00
586251b2ad
adjusted the paths of the music added the README.txt for each music piece to state the source of the music.
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-05 14:46:08 +02:00
2110555bbc
corrected the code for nr. 8 +10 now the backgroundmusic-settings will be stored correctly and when a invalid map is submitted,the error will be displayed correctly
Benjamin Feyer
2024-10-05 14:12:23 +02:00
ca57507b53
added the missing solution for exercise 12 ships will now sink when destroyed and will be removed when they are fully submerged
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-05 14:06:45 +02:00
216bd60d84
Added models as .j3o file added color & bump texture path in 'ShipModelÃ' added lighting texture for models
Cedric Beck
2024-10-05 13:27:12 +02:00
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
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-05 13:20:34 +02:00
046707642f
fixed bugs in the JSON validation - the method isWithinBounds(Battleship ship) couldn't check if the ship is the bounds of the map
Daniel Grigencha
2024-10-05 13:20:20 +02:00
8650fa5b58
fix edited class EditorState fix edited battleship.properties with the right Key to fix an exception fix edited battleship_de.properties with the right Key to fix an exception
Lukas Bauer
2024-10-05 13:09:05 +02:00
329d3d7372
reworked ex 8 return to EditorState if map is invalid
Timo Brennförder
2024-10-05 12:59:38 +02:00
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
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-05 12:35:49 +02:00
8275778d66
Added functionality for preferences in 'GameMusic'
Cedric Beck
2024-10-05 11:28:15 +02:00
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.
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-05 09:01:48 +02:00
a3b5452fb9
added 3d models for the ships - added different models (see README.txt of the files) - added methods to the SeaSynchronizer class to represent different ships sizes with different models
Daniel Grigencha
2024-10-05 05:41:12 +02:00
eda4f06a75
added server-side and client-side validation for JSON files - added the client-side validation in the EditorState class - added the server-side validation in the WaitState and ServerGameLogic class - added Getter in the ShipMapDTO - added the 'map.invalid' in the properties
Daniel Grigencha
2024-10-05 05:32:26 +02:00
0d2781dbe4
fixed failing tests
Daniel Grigencha
2024-10-04 21:18:58 +02:00
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.
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-04 20:43:37 +02:00
113da79df6
fix edited class NetworkDialog changed Button to Checklist
Lukas Bauer
2024-10-04 18:42:47 +02:00
e41d21584a
Aufgabe 11. added class BattleshipServer, ReceivedMessage to implement the feature that a client is able to start an server edited NetworkDialog to implement the logic to start an server and overhauled the GUI to be appropriate for the new features
Lukas Bauer
2024-10-04 18:33:13 +02:00
22bcd55024
added JavaDocs corrected typos
Timo Brennförder
2024-10-04 18:05:26 +02:00
161fa5cb22
Solution for exercise 11 added possibility to start own Server from client added a Checkbox to the connection menu to manage starting own server
Timo Brennförder
2024-10-04 17:57:45 +02:00
961242bb20
added missing javadocs in the NetworkDialog.java
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-04 17:30:21 +02:00
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.
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-04 15:49:07 +02:00
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
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-04 15:40:38 +02:00
8b6a787115
Added credit for ship1
Cedric Beck
2024-10-04 14:06:00 +02:00
34a0fa2304
Solution for Nr. 10, added 'BackgroundSound.java' and edited 'battleshipApp' and 'Menu' the 'BackgroundMusic' class defines the background music and the function used to control it, in the 'BattleshipApp' is an attribute of BackgrounMusic and a return function and in the Menu the Checkbox and the slider for the backgroundMusic and the update function were implemented
Benjamin Feyer
2024-10-03 23:34:15 +02:00
9cfabdb15d
added background music and improved model code reduced switch case for creating different ship models created a new class for background music added a button to toggle background music added a slider so adjust volume added new style for labeling the slider
Timo Brennförder
2024-10-03 22:08:26 +02:00
5e773ca1ba
Aufgabe 10. added class BackgroundMusic edited BattleshipApp, GameSound, Menu implemented a Slider for the Gui in order to change the Volume Quality of Life implemented feature to Safe the Sound settings to keep them even after shutting down the game implemented feature to mute Sounds/effects implemented feature to mute Music
Lukas Bauer
2024-10-03 19:11:53 +02:00
b2b3bc23bf
Aufgabe 10. added class BackgroundMusic edited BattleshipApp, GameSound, Menu implemented a Slider for the Gui in order to change the Volume Quality of Life implemented feature to Safe the Sound settings to keep them even after shutting down the game implemented feature to mute Sounds/effects implemented feature to mute Music
Lukas Bauer
2024-10-03 19:10:36 +02:00
ce490fb877
Aufgabe 10. added class BackgroundMusic edited BattleshipApp, GameSound, Menu implemented a Slider for the Gui in order to change the Volume Quality of Life implemented feature to Safe the Sound settings to keep them even after shutting down the game implemented feature to mute Sounds/effects implemented feature to mute Music
Lukas Bauer
2024-10-03 19:07:27 +02:00
0f080363f3
adjusted the in/de-crement button adjusted the delta of the slider so the button hav smaller steps in between
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-03 18:33:56 +02:00
6e0a93b74d
fixed toggleMusic in BackgroundMusic.java changed the Preference save form volume to the boolean musicenable
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-03 17:56:12 +02:00
d471f524d0
solution for exercise 10 added BackgroundMusic which is being handled in BackgroundMusic.java changed the menu to incoporate volume controls for the music
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-03 17:39:54 +02:00
3bcaca8810
activated Singlemode and added different ship models depending on size 1 -> Patrol boat 2 -> BattleshipV2 3 -> Uboat 4 -> King George V default -> boxes of given length
Timo Brennförder
2024-10-03 16:49:44 +02:00
6355b98441
Nr.10 edited 'Menu','Sound','battlship.properties' and 'battleship_de.properties' edited the property files to ensure, that in the menu the background music on/off and the background volume slider are named in eng and german, edited the childnotes for the menu, so the checkbox and slider are visible, edited the enum Suonds, for another entry 'BACKGROUNDMUSIC'
Benjamin Feyer
2024-10-03 13:46:18 +02:00
ce5e908349
edited SeaSynchronizer , EditorState, ServerGameLogic added JavaDocs for the new and adapted functions added a new invalid map for testing purposes fixed implemented the logic to check for invalid maps in the method received in ServerGameLogic
Lukas Bauer
2024-10-03 13:28:41 +02:00
b96a3dd270
Number 9' added README.txt for all models
Benjamin Feyer
2024-10-02 22:46:58 +02:00
b6f105202d
corrected 'Editorstate' and 'GameServerLogic' and edited 'SeaSynchronizer' and added assets
Benjamin Feyer
2024-10-02 22:23:10 +02:00
d15f1a3f5f
edited battleship.properties added a new error message in case ships are out of bounds
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-02 21:04:59 +02:00
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
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-02 20:56:05 +02:00
af221ad693
Added documentation to ServerGameLogic.checkMap
Cedric Beck
2024-10-02 20:48:16 +02:00
07e922d01e
Aufgabe 9. edited SeaSynchronizer added 3 Ship Models Small Ship, Medium Ship and Big Ship and tweaked the scaling of all Models
Lukas Bauer
2024-10-02 20:23:05 +02:00
0f70f4691d
added logic for server- and clientside verification of JSON-files
Timo Brennförder
2024-10-02 19:38:42 +02:00
42b442e937
Aufgabe 8. edited class EditorState and ServerGameLogic to check for invalid maps in which ships overlap or are out of the map boundries for clientside and serverside
Lukas Bauer
2024-10-02 18:24:27 +02:00
175059a6e1
corrected 'EditorState' and 'ServerGameLogic'
Benjamin Feyer
2024-10-02 17:41:06 +02:00
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
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-02 17:35:34 +02:00
3ab6b44638
Nr. 8, edited 'EditorState', 'ServerGameLogic' and 'ShipMapDTO' classes
Benjamin Feyer
2024-10-02 16:46:44 +02:00
1f548f5ee5
Merge commit
Felix Koppe
2024-10-02 14:58:36 +02:00
af5d1aaca6
Fix BattleState.receivedEffect
Felix Koppe
2024-10-02 14:57:10 +02:00
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.
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-02 14:50:14 +02:00
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
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-02 14:16:46 +02:00
4dcd53a660
Added part-solution for exercise 8 added the solution for exercise 8 for the sever sided test to ServerGameLogic.java
Hanno Fleischer hanno.fleischer@unibw.de
2024-10-02 13:57:17 +02:00
ef16a3f92b
Revert main branch
Daniel Grigencha
2024-10-02 13:30:55 +02:00
b56f4d35a3
corrected an error in the BattleState class receivedEffect-function added remaining Opponent Ships to ownMap instead of opponentMap
Timo Brennförder
2024-10-02 12:12:51 +02:00
09f3e9e403
corrected an error in ShipMap.java. remove-function called a new ItemAddedEvent instead of a ItemRemovedEvent
Timo Brennförder
2024-10-02 11:48:58 +02:00
Hanno Fleischer
Timo Brennförder
Benjamin Feyer
Felix Koppe
Daniel Grigencha
Lukas Bauer
Cedric Beck
Cedric Beck
Hanno Fleischer hanno.fleischer@unibw.de