Commit Graph

  • 90fb6e4133 added the method tryMove and the methods used by it into serverstate Hanno Fleischer 2024-11-17 17:52:25 +01:00
  • 9662e1f684 fixed a Bug where the import statement thought a package was a class because they where written the same Hanno Fleischer 2024-11-17 15:34:39 +01:00
  • aae7ed9a87 added classes for client and server state machine - a client state machine consits out of a 'ClientState' (every state of the machine) and a 'ClientStateMachine' (every state, which consists out of states), the machine starts with the ClientAutomaton - analog for server - started to implement logic for the server, transition from 'Lobby' to 'GameState' Daniel Grigencha 2024-11-17 15:27:09 +01:00
  • 07bd7dfa3d Merge branch 'development' into 'dev/test' Hanno Fleischer 2024-11-17 14:20:53 +00:00
  • b15dd96a86 Improve music fade and mock Felix 2024-11-17 14:28:48 +01:00
  • ada90e787d Improve mock Felix 2024-11-17 13:03:54 +01:00
  • cbeb296a44 Mock differen Views Felix 2024-11-17 12:42:20 +01:00
  • a9fd13caab Merge branch 'dev/client' into 'development' Hanno Fleischer 2024-11-17 11:24:45 +00:00
  • a926554709 adjusted for check style Hanno Fleischer 2024-11-17 12:01:00 +01:00
  • bbd84dd961 added code + checkstyle Cedric Beck 2024-11-17 11:26:45 +01:00
  • e22f675f8b fixed merge conflict Cedric Beck 2024-11-17 11:07:53 +01:00
  • 956e9dd2fd merge from dev/client Cedric Beck 2024-11-17 10:57:05 +01:00
  • 020aa92cab added 4 more Notifications for Model -> View interaction Hanno Fleischer 2024-11-17 10:39:36 +01:00
  • bb55ba7273 Merge branch 'dev/client_koppe' into 'dev/client' Felix Koppe 2024-11-17 09:09:13 +00:00
  • a2c7b9e299 added all assets; added node array; added node/piece_control saving Cedric Beck 2024-11-16 23:05:30 +01:00
  • 0845aa80f9 adjusted the model infield creation to represent the current view postion regarding the placement of the teams on the board Hanno Fleischer 2024-11-16 22:31:11 +01:00
  • 44b623f9fd added all Notifications for the model view communication added all required notifications with their content and getter methods. Hanno Fleischer 2024-11-16 18:58:33 +01:00
  • 48cd614b4a Merge branch 'dev/client_koppe' into 'dev_client' dev_client Felix Koppe 2024-11-16 17:21:21 +00:00
  • bf678000b8 Minor changes Felix 2024-11-16 18:21:02 +01:00
  • e128d9e4cc Add docs to Acoustic Felix 2024-11-16 16:33:21 +01:00
  • 8c10e69eff General improvements Felix 2024-11-16 16:15:08 +01:00
  • 6b2d775534 added 2 methods for Test usage in Board and PlayerData Hanno Fleischer 2024-11-16 13:31:56 +01:00
  • b509ab772d Add subVolume and delay Felix 2024-11-16 13:07:39 +01:00
  • d0be65323e added rotation compability to map.mdga Cedric Beck 2024-11-15 22:47:23 +01:00
  • 81facb869f added playerMap for location playerAssets Cedric Beck 2024-11-15 21:26:23 +01:00
  • b317bb957a Add sound Felix 2024-11-15 16:52:40 +01:00
  • 202cd7c0e6 Add music credits Felix 2024-11-15 14:57:36 +01:00
  • e345edc38e Add game_3 music Felix 2024-11-15 14:42:52 +01:00
  • 133bffbd6b Add game_6 music Felix 2024-11-15 14:42:41 +01:00
  • 2287fdc88f Add game_5 music Felix 2024-11-15 14:42:27 +01:00
  • 976002ddd0 Add game_2 music Felix 2024-11-15 14:42:10 +01:00
  • 205cb654c7 Add game_1 music Felix 2024-11-15 14:41:52 +01:00
  • d8544cc042 Add game_4 music Felix 2024-11-15 14:41:29 +01:00
  • 0aa7e83d62 Add main menu music Felix 2024-11-15 14:40:59 +01:00
  • 289c285adf Add lobby music Felix 2024-11-15 14:40:34 +01:00
  • a4ac52b591 Add ceremony music Felix 2024-11-15 14:40:09 +01:00
  • 0bb4706fda Add GameMusic Felix 2024-11-15 14:39:10 +01:00
  • a3c5af58d7 Remove grid extend limits Felix 2024-11-14 23:24:12 +01:00
  • 28960e8961 Activate assertions Felix 2024-11-14 23:10:36 +01:00
  • bb7baf44bd Add circle_map.mdga Felix 2024-11-14 22:47:22 +01:00
  • 206c0d543e Merge commit Felix 2024-11-14 22:14:19 +01:00
  • a68ad80402 Remove state classes Felix 2024-11-14 22:13:57 +01:00
  • 1cca5a9c6b added MapLoader and map for map view Cedric Beck 2024-11-14 21:21:01 +01:00
  • ee59807395 Replaced in the notifications Card with BonusCard Hanno Fleischer 2024-11-14 19:58:26 +01:00
  • 37511d6334 Merge branch 'dev/client_koppe' into 'development' Hanno Fleischer 2024-11-14 18:45:24 +00:00
  • c83baac763 Fix error Felix 2024-11-14 19:36:53 +01:00
  • 6c7b58b415 Add notification constructors Felix 2024-11-14 19:33:03 +01:00
  • 33dbbdbe5c initial test commit, added all testclasses except Playertest, Viewtest, Cameratest, SettingsTest, SoundTest, ReactionTest and ClientStateTest. And filled all created testclasses with empty testmethods, except ServerStateTest. Benjamin Feyer 2024-11-14 18:07:36 +01:00
  • 5693817f9b Add notifications Felix Koppe 2024-11-14 17:56:43 +01:00
  • 94ee786dc8 Minor work Felix Koppe 2024-11-14 17:13:56 +01:00
  • 92941f903c Merge commit Felix Koppe 2024-11-14 16:51:22 +01:00
  • def68f30be added constants to Asset view_assets Cedric Beck 2024-11-14 16:35:00 +01:00
  • 499da6a7ad added new jmonkey version Cedric Beck 2024-11-14 16:25:14 +01:00
  • 9bafd749b6 removed card and fixed codes style removed card because it was unnecessary and reworked all classes containing it to implement the change Hanno Fleischer 2024-11-14 15:49:22 +01:00
  • b71449b7b4 Merge branch 'view_assets' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into view_assets Cedric Beck 2024-11-14 15:44:31 +01:00
  • dfcfe3351e asset Cedric Beck 2024-11-14 15:37:25 +01:00
  • c7b65d949a added java docs to model/game and wrote the remaining getter and setter Hanno Fleischer 2024-11-14 15:32:27 +01:00
  • 921933722a Minor work Felix 2024-11-14 15:23:59 +01:00
  • 7fa45f39c6 Merge remote-tracking branch 'origin/dev_client' into dev_client Felix 2024-11-14 15:04:41 +01:00
  • 6849a0a023 Minor work on animation Felix 2024-11-14 14:58:54 +01:00
  • e96cd40302 improved code style Daniel Grigencha 2024-11-14 14:51:29 +01:00
  • d9a827697d First steps Felix 2024-11-13 19:52:29 +01:00
  • 0f39ea0dcc Add files Felix 2024-11-13 17:57:14 +01:00
  • 6e844287dd Delete garbarge Felix 2024-11-13 17:23:07 +01:00
  • 3465cdaa19 Merge branch 'view_assets' into dev_client Felix 2024-11-13 17:21:24 +01:00
  • 60adc39c8b Add run config Felix 2024-11-13 17:12:02 +01:00
  • 8502b97a95 Merge main Felix 2024-11-13 17:10:14 +01:00
  • 0e90041209 Add .gitattributes and move .gitignore Felix 2024-11-13 17:09:05 +01:00
  • f3f63a3e2c Merge main Felix 2024-11-13 17:02:38 +01:00
  • 8d02a144eb added screenshot and resources Cedric Beck 2024-11-13 14:55:05 +01:00
  • af4caad6be Add .editorconfig Felix Koppe 2024-11-13 11:58:07 +01:00
  • d1a343aaa9 Add MdgaApp.java and run config Felix Koppe 2024-11-13 11:55:09 +01:00
  • 80d70e9a45 added structure for client View Cedric Beck 2024-11-12 17:52:39 +01:00
  • 516c7ca303 fixed gradle build Cedric Beck 2024-11-12 17:41:20 +01:00
  • a684405891 added init for mdga with all states and messages Cedric Beck 2024-11-12 17:26:10 +01:00
  • 5035aa5a96 fixed sinking-rotation, volumeslider; deleted TODO comments b_Beck_Cedric Cedric Beck 2024-10-14 11:29:22 +02:00
  • 5174b84a1b fixed client-hosted server don't thorw an exception - added serialization to the client-hosted server b_Grigencha_Daniel Daniel Grigencha 2024-10-14 11:15:27 +02:00
  • a38366600c fixed a bug where the SHIPDESTROYED Sound was played everytime b_Brennfoerder_Timo Timo Brennförder 2024-10-14 11:12:07 +02:00
  • c907967126 adjusted the clientprperties, so it is not started in singleplayer b_Feyer_Benjamin Benjamin Feyer 2024-10-13 14:19:31 +02:00
  • fe6ad576eb edited the fire, adjusted the rocket_size,added the models in j3o files, adjusted the Gamesound, added the artefacts Benjamin Feyer 2024-10-13 14:18:03 +02:00
  • f8e97266d5 fixed bug when playing rocket audio to not produce an AudioRender error b_Fleischer_Hanno Fleischer Hanno hanno.fleischer@unibw.de 2024-10-13 11:53:24 +02:00
  • 9e591e37c3 Added sound to rocket firing Fleischer Hanno hanno.fleischer@unibw.de 2024-10-13 08:58:48 +02:00
  • 487305dccc added the rocket sound wav and fixed code and check style also includes minor fixes Hanno Fleischer 2024-10-13 08:09:19 +02:00
  • 5cb0843819 Add missle sound b_koppe_felix Felix Koppe 2024-10-13 08:02:24 +02:00
  • 42b995a4e7 added animation of a shell to the game - in BattleShipServer class added serialization of the AnimationMessage classs - added to VoidVisitor and Visitor the Shell class - edited the ServerGameLogic class to implement a new Animation state (see new Server-State-Chart) - added a new client state AnimationState (see new Client-State-Chart) Daniel Grigencha 2024-10-13 03:19:44 +02:00
  • 8c45784246 Code cleanup added JavaDocs removed unnecessary lines Timo Brennförder 2024-10-13 01:59:46 +02:00
  • febdd63422 solution for number 13 added an AnimationState in Client and Server added 2D and 3D representation of a missile added missile launch sound updated Singlemode to continue functionality Timo Brennförder 2024-10-12 18:24:33 +02:00
  • 34929b40f1 Add Shell Felix Koppe 2024-10-12 18:19:57 +02:00
  • 67b99317d2 added TODOÃ's for presentation Cedric Beck 2024-10-12 17:45:30 +02:00
  • bb1e3858bb fixed not working single mode, added read port from textline when client host server Cedric Beck 2024-10-12 16:17:46 +02:00
  • 9b85030050 finished ex. 13 + cleanup Cedric Beck 2024-10-12 15:34:45 +02:00
  • 3755cca62e Solution for exercise 13: edited another state in the server and client, added the rocket, added the 'Shell.java' and 'ShellControl.java' edited the logic for the states and 3 messages for the server client comunication, edited the 'SeaSynchronizer' and ShipMapSynchronizer', so that the animations will be displayed, added the sound for the rocket Benjamin Feyer 2024-10-12 00:41:24 +02:00
  • 66798eb3e4 Improved code documentation b_Bauer_Lukas Lukas Bauer 2024-10-11 15:22:20 +02:00
  • edff9e1ad9 Improved code documentation and clarify comments for better readability and understanding Lukas Bauer 2024-10-11 14:53:59 +02:00
  • bf16a18b71 Aufgabe 13 edited class BattleState in order to implement the 2D map feature edited class GameSound to add the Missile launch sound edited class MapViewSynchronizer in order to implement the 2D map feature edited class ImpactEffectManager removed unused import edited class SeaSynchronizer removed unused code edited class Shell in order to implement the 2D map feature edited class ShellControl in order to implement the 2D map feature edited Sound added Missile launch enum edited FloatMath to improve the animation for the 2D projectile added missileLaunch.wav Lukas Bauer 2024-10-11 14:23:49 +02:00
  • 22d827b074 adjusted positioning of the modern battle ship and set fullscreen mode to false Hanno Fleischer 2024-10-11 11:53:13 +02:00
  • 074b38540d Merge branch 'b_Fleischer_Hanno' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into b_Fleischer_Hanno Hanno Fleischer 2024-10-11 11:47:05 +02:00
  • 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. Hanno Fleischer 2024-10-11 11:46:37 +02:00
  • 54e5719edf added README.txt for the rocket model to credit its source Fleischer Hanno hanno.fleischer@unibw.de 2024-10-11 10:49:04 +02:00
  • 9df809ded5 adjusted the ModernBattleShip to be a j30 object and load withc its corresponding texture Hanno Fleischer 2024-10-11 09:54:12 +02:00