SteamWar/FightSystem
Archiviert
13
1
Commit graph

1336 Commits

Autor SHA1 Nachricht Datum
7ad5a1dc22 Fix TNT Distribution
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-10-12 18:57:03 +02:00
256239c557 Merge pull request 'TPS Warp' () from tpswarp into master
Reviewed-on: 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2023-10-11 13:34:26 +02:00
c87bac641e TPS Warp
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-10-11 10:56:05 +02:00
3f78a595c2 Merge pull request 'Persistent Damage & TNT Distribution' () from persistentDamage into master
Reviewed-on: 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2023-10-10 17:57:19 +02:00
0c762e5624 TNT Distribution
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-10-08 18:21:19 +02:00
4b82ea9426 Persistent Damage Event
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-10-08 18:08:13 +02:00
7dd2cee635 Merge pull request 'Unchecked schematics' () from unchecked into master
Reviewed-on: 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2023-09-20 15:30:47 +02:00
2cb9c12e46 Fix item and item location
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-16 11:09:41 +02:00
230169e163 Unchecked schematics
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-15 20:50:39 +02:00
cbd5fe407f Fix Lockschem in Replays
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-09 18:45:41 +02:00
84be0b3244 Fix TestJoin
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-02 20:24:07 +02:00
5614f000ad Merge pull request 'Pathplanning' () from lixfel-pathplanning into master
Reviewed-on: 
2023-09-02 20:22:52 +02:00
97113b1ae2 Implement planToAnywhere
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-02 20:21:51 +02:00
26f2fb2afd AI and Pathplanning fixes
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-02 20:11:47 +02:00
15e0fbde06 AI and Pathplanning fixes
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-02 19:58:47 +02:00
e7bb1e6669 Pathplanning
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-09-02 18:23:30 +02:00
4655dbe21b Merge pull request 'Add Repeater, Comparator and Lectern to interact method' () from psirobot-ai into master
Reviewed-on: 
Reviewed-by: Lixfel <lixfel@steamwar.de>
2023-09-02 17:31:39 +02:00
PsiRobot
2ed5f5000d Fixed previous commmit 2023-09-02 15:28:34 +00:00
PsiRobot
071b76a4ce Add Repeater, Comparator and Lectern to interact method 2023-09-02 15:20:33 +00:00
891a26cc12 Fix 1.8 and 1.9
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-30 14:49:21 +02:00
f81a1e13b1 Merge pull request 'UserPerm' () from userPerm into master
Reviewed-on: 
Reviewed-by: Chaoscaot <chaoscaot@zohomail.eu>
2023-08-30 12:08:28 +02:00
11a8d0a612 UserPerm
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-29 22:01:54 +02:00
58d1f69e1c Merge pull request 'AI API' () from villager-ai into master
Reviewed-on: 
Reviewed-by: Chaoscaot <chaoscaot@zohomail.eu>
2023-08-29 21:51:45 +02:00
1cc247f6dd AI API
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-29 13:45:46 +02:00
d7b63841a1 AI API prototype
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-29 00:36:28 +02:00
a9453aa859 Rename for better clarity
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-28 23:35:02 +02:00
783474c958 WIP villager AI
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-28 23:31:00 +02:00
a24585e497 Potential posToChunk fix
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-27 15:20:16 +02:00
c7eba24ae6 Fight info command rename to fightinfo
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-25 21:59:46 +02:00
adeb4e1d32 Merge pull request 'Fight info command' () from infoCommand into master
Reviewed-on: 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2023-08-25 21:46:16 +02:00
09bc0d8fbb Fight info command
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-25 21:43:27 +02:00
1a8255e94c Do not replace Obsidian and Bedrock in prepare arenas
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-25 15:52:48 +02:00
19d12df834 Merge pull request 'Move Spawnoffset to GameMode config' () from spawnoffset into master
Reviewed-on: 
Reviewed-by: Chaoscaot <chaoscaot@zohomail.eu>
2023-08-19 11:26:41 +02:00
13e1610f61 Move Spawnoffset to GameMode config
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-19 11:12:22 +02:00
0cad5fa3ae Fix /leader
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-07-01 22:06:21 +02:00
9da8e33360 Fix checking
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-25 21:40:06 +02:00
fd5db46700 Fix reset
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-25 21:06:35 +02:00
722a8748d5 Merge pull request 'join anytime' () from joinAnytime into master
Reviewed-on: 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2023-06-25 20:11:51 +02:00
89682fe044 Merge pull request '1.20 support' () from 1.20 into master
Reviewed-on: 
2023-06-25 20:09:39 +02:00
5e4190ea75 Limit JoinAnytime to variable teams
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-25 20:07:41 +02:00
e9e1667de4 1.20 support
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-23 16:24:44 +02:00
cbb0dcf8eb Some of the requested changes
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-13 22:00:43 +02:00
43e63b4201 Bugfixes: Offline players, rejoining
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-06 18:44:17 +02:00
1a13446548 Merge pull request 'Fix item pickup and exploding chests' () from itemFixes into master
Reviewed-on: 
Reviewed-by: Chaoscaot <chaoscaot@zohomail.eu>
2023-06-06 18:10:08 +02:00
72ef2bc486 Fix item pickup and exploding chests
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-06 18:08:18 +02:00
6081c5f565 Prevent players from switching teams
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-06 17:55:55 +02:00
1a2eabaea4 Bugfixes: No multiple player instances, spectator kit after death, confirmation message, allow request command while in team
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-06 11:47:37 +02:00
98a376a62b Bugfixes, Simplify UX to requests-Command
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-05 17:00:45 +02:00
0020b2b152 Fix build
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-05 16:10:41 +02:00
c91f22658b Merge branch 'master' into joinAnytime
# Conflicts:
#	FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.properties
#	FightSystem_Core/src/de/steamwar/fightsystem/FightSystem_de.properties
#	FightSystem_Core/src/de/steamwar/fightsystem/countdown/EnternCountdown.java
#	FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java
#	FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKit.java
2023-06-05 16:08:57 +02:00