Commit Graph
96 Commits
Author SHA1 Message Date
Pupsi 758c51a2e1 Merge remote-tracking branch 'origin/develop' into develop-turtleGame
# Conflicts:
#	src/main/resources/lang/locales.map.csv
2025-10-15 22:19:39 +02:00
Pupsi 9f71523a07 lowered snack count 2025-10-15 21:56:48 +02:00
Pupsi 6d8c5ed917 solved pr comments 2025-10-15 21:33:17 +02:00
Pupsi 35dc924104 added null ckeck for boostTask and boostRefillTask 2025-10-15 21:30:11 +02:00
Pupsi eff5e36987 solved some pr comments 2025-10-15 21:26:02 +02:00
Pupsi 9e2125cba3 Merge remote-tracking branch 'origin/develop' into develop-turtleGame
# Conflicts:
#	src/main/resources/lang/locales.map.csv
2025-10-15 21:06:04 +02:00
Pupsi c8bf5f9186 added turtle game to pve 2025-10-15 21:04:46 +02:00
Pupsi 1830307f4b increased boost refill when eating flowers, changed speed options 2025-10-15 21:03:12 +02:00
Pupsi 3dfff84c61 changed left player detection to use hasResult of Score 2025-10-15 20:55:30 +02:00
Pupsi c4aaa7acf9 added flowers and grass to HeightTerrainGenerator 2025-10-11 15:17:23 +02:00
Pupsi 097438886c added stickfight start and working length option 2025-10-11 12:22:50 +02:00
Pupsi c3f5170c33 added random height variations for elytra race gates 2025-10-10 22:53:56 +02:00
Pupsi 90832aacd0 added some globalRestrictions 2025-10-10 16:56:26 +02:00
Pupsi dccb57b056 added LowestPointsWinScore and Stickfight win condition 2025-10-10 16:15:02 +02:00
Pupsi 368356c739 fixed unbreakable snow in Spleef 2025-10-10 15:20:43 +02:00
Pupsi 14a7e0c25f removed knockback for finished players in TrafficLightRace 2025-10-10 15:09:43 +02:00
Pupsi 398c3666e4 deathcube spectator mode when done 2025-10-10 12:00:12 +02:00
Pupsi d5910b4b54 renamed methods 2025-10-06 17:40:08 +02:00
Pupsi ec76dd5c85 added boost charge when eating snacks 2025-10-06 17:31:04 +02:00
Pupsi 84de61388e improved speed mechanic and bomb spawning, added countdown for last player 2025-10-05 18:24:46 +02:00
Pupsi dece9c13b7 added translations 2025-10-05 00:19:37 +02:00
Pupsi 39fb7f4956 added boost mechanic 2025-10-05 00:13:56 +02:00
Pupsi 75314748da removed sidebar, added names for items 2025-10-04 18:32:27 +02:00
Pupsi 61aa7543be improved sidebar (ordered and colored) 2025-10-04 16:29:03 +02:00
Pupsi 2fac287e1e added sidebar 2025-10-04 16:11:10 +02:00
Pupsi 2a6f2f2a44 added particle effects and sounds 2025-10-04 15:39:19 +02:00
Pupsi 382d850605 added better speed mechanic 2025-10-04 14:03:44 +02:00
Pupsi a49b3b20cc Merge remote-tracking branch 'origin/develop' into develop-turtleGame 2025-10-04 13:53:17 +02:00
Pupsi 148b5fc634 fixed spectator mode after playing tetris 2025-10-04 13:50:53 +02:00
Pupsi abf907af24 added todos 2025-10-04 13:49:49 +02:00
Pupsi 8bd0ab1974 fixed error after game ends 2025-10-04 13:39:57 +02:00
Pupsi 2c92553a8a added bombs 2025-10-04 13:15:57 +02:00
Pupsi f26c3a9e6d improved entity collision check while generating 2025-10-04 00:36:50 +02:00
Pupsi 81524cfecf added snacks with collision, switched to multiplayer arena 2025-10-04 00:09:19 +02:00
Pupsi f2fc4835c3 started random snack generation 2025-10-03 19:32:52 +02:00
Pupsi abcb23d96a made turtle movement clean 2025-10-03 18:47:11 +02:00
Pupsi eabbb312b9 Merge remote-tracking branch 'refs/remotes/origin/develop' into develop-turtleGame 2025-10-03 17:29:36 +02:00
Pupsi d98cebd86f added turtleGame playfield and movement 2025-09-02 22:29:47 +02:00
Pupsi c87d318421 started turtleGame 2025-09-02 18:22:14 +02:00
Pupsi edf26785a3 removed accidental code change 2025-04-16 23:45:03 +02:00
Pupsi 4d90f5fc28 added missing 'this' qualifier 2025-04-13 12:59:22 +02:00
Pupsi 343decb05a added this qualifier to tetris classes 2025-04-12 23:53:40 +02:00
Pupsi 36c6c93edb started towerdefense path mechanic 2025-04-11 00:51:43 +02:00
Pupsi e0ee1e66c9 added description message on game start 2025-01-02 01:08:53 +01:00
Pupsi 7cd849946b fixed elytra race spectators flying elytra 2024-12-27 12:02:38 +01:00
Pupsi a71aca5d6c added missing translations 2024-12-27 12:01:44 +01:00
Pupsi ea08ac7a81 fixed tnt run falling before start 2024-12-27 11:10:18 +01:00
Pupsi 81dbf16d3f fixed tetris player inputs 2024-12-27 10:53:02 +01:00
Pupsi f03011e4f1 Merge remote-tracking branch 'origin/develop' into develop 2024-12-24 00:26:53 +01:00
Pupsi 9069ead9e9 fixed barrier border for terrain generator 2024-12-24 00:26:41 +01:00
Pupsi 0715771bfc add adventure mode for tournament display 2024-12-23 23:45:16 +01:00
Pupsi c18ac59442 changed tetris button press value 2024-12-23 23:28:53 +01:00
Pupsi 0a1ae69f53 Merge branch 'refs/heads/develop-tetris' into develop
# Conflicts:
#	src/main/java/eu/mhsl/minenet/minigames/instance/game/GameList.java
#	src/main/resources/lang/locales.map.csv
2024-12-16 21:02:50 +01:00
Pupsi 8451463b73 updated minestom version 2024-12-16 21:00:02 +01:00
Pupsi ba260519e0 added new tournament display 2024-12-02 15:52:19 +01:00
Pupsi 378d872283 changed computeIfAbsent back to if statement 2024-11-24 00:47:15 +01:00
Pupsi bc27c35f1a removed debug outputs 2024-11-23 23:58:54 +01:00
Pupsi 18689ac0df fixed score 2024-11-23 23:56:18 +01:00
Pupsi 3fe57d5fe9 continued fixing pr comments 2024-11-23 22:24:08 +01:00
Pupsi 0699206c21 started fixing pr comments 2024-11-23 14:26:19 +01:00
Pupsi e663f3f105 made tetris spectators invisible, added barrier walls to elytra race 2024-11-04 21:53:54 +01:00
Pupsi 55be88b7da removed countdown when no player left 2024-11-04 15:04:09 +01:00
Pupsi f85ebbbb5d made BoolOption show true or false, shortened tetris Timeout after first death 2024-10-24 23:37:41 +02:00
Pupsi 720d3c8d65 changed Player spawn position 2024-10-24 23:10:09 +02:00
Pupsi e397d69d7a added score above playfield 2024-10-23 22:43:14 +02:00
Pupsi bef697e5fc added Tetris options to translation files 2024-10-23 21:15:47 +02:00
Pupsi 6638a48677 added combos 2024-10-23 17:41:05 +02:00
Pupsi 73a374e529 added timeout for tetris and display points at end of PointsWinScore 2024-10-23 17:26:31 +02:00
Pupsi f838317af0 centered hold and next tetrominoes 2024-10-23 14:53:07 +02:00
Pupsi 3c25f5f079 changed player spawn position 2024-10-23 13:55:39 +02:00
Pupsi 179fa2e4d7 added combat system and options for game list 2024-10-23 01:08:52 +02:00
Pupsi 075db7a91b added border around next and hold tetromino 2024-10-22 21:21:00 +02:00
Pupsi c9d00f4f77 added tetris to translation file 2024-10-22 17:16:26 +02:00
Pupsi 4de66d65a2 added anvil run to translation file 2024-10-22 17:13:10 +02:00
Pupsi 8594f8029c fixed score at end of tetris not working 2024-10-22 17:05:24 +02:00
Pupsi e192ae4433 moved tetris from prototype to other 2024-10-22 16:45:32 +02:00
Pupsi bdb7c85ceb added anvil run to PVE 2024-10-22 16:43:58 +02:00
Pupsi 1b448e749e fixed leaderboard with new PointsWinScore class 2024-10-22 16:34:23 +02:00
Pupsi 2799a40c58 made multiplayer possible 2024-10-22 15:51:00 +02:00
Pupsi 710838645f added ghost tetromino 2024-10-22 00:36:57 +02:00
Pupsi f56023004a removed unused import 2024-10-21 19:22:51 +02:00
Pupsi 55a98b6464 changed background, added hold, show score 2024-10-21 19:22:31 +02:00
Pupsi 236d372746 fixed collision detection, added rotation 2024-10-21 15:55:54 +02:00
Pupsi 1332a42bf6 added tetromino controlls 2024-10-21 00:27:58 +02:00
Pupsi 5acfe8f6af added basic tetris classes 2024-10-20 18:24:53 +02:00
Pupsi 9d287f7c2f added control input 2024-10-19 22:57:05 +02:00
Pupsi 7ea39f9aad started tetris 2024-10-19 16:38:43 +02:00
Pupsi 21ab8c4bd3 Merge pull request 'develop-anvilRun' (#1) from develop-anvilRun into develop
Reviewed-on: #1
2024-10-19 14:35:16 +00:00
Pupsi 3f247bfc90 privileged commands only for admins 2024-10-19 16:32:51 +02:00
Pupsi 843fa26c08 removed tetris 2024-10-19 16:28:32 +02:00
Pupsi cfbb2688d2 fixed starting platform for elytra race 2024-10-19 15:54:18 +02:00
Pupsi 350cf108dd added game length for anvil run 2024-10-19 15:43:00 +02:00
Pupsi c9ef7197cc added scheduled task for anvil run 2024-10-12 17:54:52 +02:00
Pupsi 40f02449d9 finished basic anvil run 2024-10-10 15:46:32 +02:00
Pupsi e71dccb98d started with tetris 2024-10-09 12:55:50 +02:00
Pupsi a3f2a06f6a added AnvilRun files 2024-10-08 21:47:28 +02:00