SteamWar/FightSystem
Archiviert
13
1
Commit graph

454 Commits

Autor SHA1 Nachricht Datum
f228f6225f Full Standalone support
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-02-20 19:24:45 +01:00
516d4420a1 Merge branch 'master' into 1.18 2022-02-19 19:37:44 +01:00
3c4a6decca Merge branch 'master' into Meteor 2022-02-11 21:41:42 +01:00
yoyosource
9614b0d43c Add messages to Meteor 2022-02-10 18:39:26 +01:00
yoyosource
be0fb245a4 Add messages to Meteor 2022-02-10 18:39:06 +01:00
yoyosource
b294457641 Merge remote-tracking branch 'origin/Meteor' into Meteor 2022-02-10 18:37:09 +01:00
yoyosource
37d724f977 Add messages to Meteor 2022-02-10 18:37:04 +01:00
4d51c1ff63 cleanup 2022-02-10 18:34:37 +01:00
yoyosource
e1bdde7d00 Add messages to Meteor 2022-02-10 18:33:41 +01:00
yoyosource
2eef1a8e94 Fix HellsBells
Update Meteor
2022-02-10 18:22:38 +01:00
fa5b20b680 fixed for airship 2022-02-06 19:42:37 +01:00
0924b5acc1 1.18 tested implementation
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-02-05 12:34:22 +01:00
7bfd32a67a Merge branch 'master' into 1.18 2022-02-02 23:59:28 +01:00
9519329505 Full untested 1.18 implementation
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-02-02 23:58:45 +01:00
yoyosource
1e7e94d359 Extract Point from HellsBells and Meteor 2022-01-20 08:19:46 +01:00
yoyosource
0a45959e01 Update stuff 2022-01-20 08:14:15 +01:00
yoyosource
ba9bf22f97 Update stuff 2022-01-19 18:15:36 +01:00
yoyosource
99d3986617 Add better checking for supporter 2022-01-19 17:42:48 +01:00
yoyosource
15a1caf8b3 Update Meteor 2022-01-15 16:41:44 +01:00
yoyosource
545c5a4df0 Update Meteor 2022-01-15 16:36:41 +01:00
yoyosource
3440ca9d7d Fix FightSystem.properties 2022-01-15 16:08:42 +01:00
yoyosource
f2b86c9b1d Fix HellBells and Meteor 2022-01-15 16:06:43 +01:00
yoyosource
abc7e1a4f7 Merge remote-tracking branch 'origin/Meteor' into Meteor 2022-01-15 14:59:58 +01:00
yoyosource
37a1f728f5 Fix HellsBells messages 2022-01-15 14:59:52 +01:00
ea833f979e more meteors 2022-01-15 14:53:00 +01:00
411e1ae539 WIP 1.18 support
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-01-14 21:42:18 +01:00
8a04b76531 Fix replay stop
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-01-14 18:58:25 +01:00
55b4dad1e4 Merge branch 'master' into 1.18 2022-01-14 18:12:12 +01:00
e9e01febd1 Fix some replay bugs
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-01-14 18:08:59 +01:00
fa8d5ce99a less dmg pls 2022-01-14 17:32:24 +01:00
fc934389ea less dmg pls 2022-01-14 17:25:59 +01:00
029f51945e less dmg pls 2022-01-14 17:20:32 +01:00
47665f9613 can we pls do dmg? 2022-01-14 17:11:25 +01:00
Chaos
9fee882663 Fix FightSystem.properties 2022-01-14 17:04:57 +01:00
8d2fe1df85 added explosion 2022-01-14 17:02:51 +01:00
02ac3cd665 First draft 2022-01-13 16:12:50 +01:00
4635772b23 Fix usage of deprecated api
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-01-08 12:20:47 +01:00
247f8e47f3 Merge pull request 'Fix replay rotation' () from fixRotation into master
Reviewed-on: 
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2022-01-06 16:49:38 +01:00
312eff810d Silent replay saving failure
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-01-06 07:13:59 +01:00
e7851b7a89 Fix replay rotation
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-01-06 07:11:20 +01:00
eb824135de test build
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-31 08:59:54 +01:00
98af118dab test build
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-31 08:50:38 +01:00
de2ffa5707 rebuild
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-30 22:43:07 +01:00
55b23cad2c rebuild
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-30 22:29:56 +01:00
7851d560ad Fix rotation
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-30 22:19:13 +01:00
3a95a7bd27 Fix locations
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-30 21:53:52 +01:00
e6dba7118f Hotfix replay
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-30 14:25:40 +01:00
c39972e435 Fix replay server termination
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-27 18:52:42 +01:00
55d3969c03 Fix statistics
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-27 16:46:52 +01:00
bbda8ed071 Merge pull request 'Changing to SchematicNodes' () from fightnodes into master
Reviewed-on: 
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-12-27 16:32:18 +01:00
775b24e6fc Lock replay functionality
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-27 13:10:41 +01:00
5c8a00a25a Merge branch 'master' into Anti_Ice_Melt 2021-12-23 16:59:04 +01:00
zOnlyKroks
2baacdb00f Performance 2021-12-23 16:58:50 +01:00
cd8a3d3eb5 Fix pistons destroying blocks
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-23 16:19:58 +01:00
49c2793297 Merge pull request 'Limit block breaking to team area' () from blockBreakLimiter into master
Reviewed-on: 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-12-23 12:13:58 +01:00
bb3114ba61 Fix direction
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-23 12:09:27 +01:00
bfb394c609 Merge branch 'master' into Anti_Ice_Melt 2021-12-22 19:25:07 +01:00
zOnlyKroks
e060e2e7a6 Better naming 2021-12-22 19:22:13 +01:00
zOnlyKroks
96f1da0aef Config Options 2021-12-22 19:21:17 +01:00
2086366deb Allow stationary moving pistons during preparation
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-22 12:40:41 +01:00
27056e4842 Limit block breaking below ground
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-22 12:17:33 +01:00
fd0a7b4e3d Merge pull request 'Use SpigotCore TinyProtocol instance' () from coreTiny into master
Reviewed-on: 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-12-22 11:11:39 +01:00
acb439e3d9 Limit block breaking to team area
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-21 22:01:59 +01:00
50995bca82 Use SpigotCore TinyProtocol instance
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-21 21:15:36 +01:00
d9d154f4eb Fix piston boundary
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-21 21:08:11 +01:00
f0a9c5c314 Configuration
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-19 16:58:52 +01:00
zOnlyKroks
9beb9f5aad Little Typo 2021-12-19 14:47:17 +01:00
zOnlyKroks
0c6cfba029 Anti Ice and Snow Melt 2021-12-19 14:45:19 +01:00
yoyosource
d544ecbcf5 Fix EnterHandler 2021-12-18 17:26:24 +01:00
766d539728 Fix defaults
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-04 20:35:09 +01:00
Chaoscaot
1125788433 Merge remote-tracking branch 'origin/fightnodes' into fightnodes 2021-12-03 14:15:47 +01:00
Chaoscaot
796c58a3d2 Fix Inventory Location 2021-12-03 14:15:33 +01:00
Chaoscaot
d7a48a56ba Merge branch 'master' into fightnodes 2021-12-03 14:11:47 +01:00
b17fc09d87 Fix typeconfig
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-02 14:30:08 +01:00
641f99ff2f Merge pull request 'Single file gamemode, arena, schematic config' () from configRefactoring into master
Reviewed-on: 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-12-02 14:26:19 +01:00
fd74b8fe59 Current default config
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-11-28 16:38:36 +01:00
Chaoscaot
a8a15c6828 Update from Depricated Methods 2021-11-27 10:19:52 +01:00
Chaoscaot
ab7602879c Yeeeeeeeeeeeeeeeeeet 2021-11-21 10:58:47 +01:00
Chaoscaot
85d8675b4c Changing to SchematicNodes (Requires SchematicSystem) 2021-11-21 10:37:44 +01:00
cf9ebcd093 Update config
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-11-12 17:15:29 +01:00
faab60aad2 Fix PersonalKitCreator
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-11-11 06:58:36 +01:00
3b5a282789 Improve behaviour during check session
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-11-10 20:01:21 +01:00
c44bda9266 Hotfix spectator above team area
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-11-10 13:32:10 +01:00
cc22902ff5 Hotfix Kampfleiterentscheidung
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-11-10 13:26:50 +01:00
84c0e72713 Hotfix Bar header
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-11-10 13:17:32 +01:00
cdbde09d2e WIP new config
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-11-10 13:16:10 +01:00
95a7b4fd39 Hotfix inventory
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-11-09 11:05:32 +01:00
2413970b32 Merge pull request 'Neues Inventarhandling' () from newInventory into master
Reviewed-on: 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-11-09 10:58:09 +01:00
673658fab0 WIP config refactoring
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-11-09 10:28:07 +01:00
2744eebb26 Remove fighter movement height restriction, adding block placement restriction
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-11-05 11:14:49 +01:00
e79bce8d6d Refactoring config to enable defaulting
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-11-05 11:07:16 +01:00
cf666a4cb3 Prevent ConcurrentModificatonException
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-11-01 16:23:46 +01:00
c995e148b2 Close TinyProtocol on shutdown
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-11-01 08:26:20 +01:00
fe0d522c85 Fix checking
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-30 14:53:46 +02:00
6400c960a9 Only allow TNT transfers to inventories
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-30 14:32:02 +02:00
1483bba0ff Show deprecation and use new apis
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-30 14:31:32 +02:00
3bc87bf555 Merge pull request 'Use SpigotCore VersionDependent' () from useSpigotVersion into master
Reviewed-on: 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-10-29 11:59:26 +02:00
5d504741ae Merge pull request 'Refactoring percent winconditions + WhitelistWincondition' () from percentRefactor into master
Reviewed-on: 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-10-29 11:59:15 +02:00
ead43fdbea Merge pull request 'Initialisation refactoring' () from initRefactor into master
Reviewed-on: 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-10-29 11:58:54 +02:00
594816bb7d Initialisation refactoring
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-28 22:07:43 +02:00
3922588096 Fix skip entern
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-28 22:04:55 +02:00
a9d4785a42 Use SpigotCore VersionDependent
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-28 22:02:26 +02:00
bb2ef0e06d Refactoring percent winconditions + WhitelistWincondition
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-28 16:03:16 +02:00
4f2d1cb41d Various quality of life improvements
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-26 07:20:44 +02:00
1e756abc18 Fix timing
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-24 16:01:25 +02:00
a5f06e6f7c Fix countdown replay
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-24 15:53:57 +02:00
15e425ac65 Fix mapdisplay
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-24 15:51:15 +02:00
d4590b5ca8 Merge branch 'master' into multiling 2021-10-24 15:14:41 +02:00
9eefaf9e6b Full multiling
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-24 15:04:12 +02:00
46a97e779c More Multiling
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-23 08:43:58 +02:00
9cdeae4328 Hotfix paste aligned
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-13 09:01:19 +02:00
97c71ddbac Hotfix paste aligned
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-13 08:58:43 +02:00
e2956123d9 Hotfix paste aligned
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-13 08:56:03 +02:00
fc4b2fa321 Hotfix paste aligned
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-13 08:52:45 +02:00
4bf27107c6 WIP multiling
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-13 08:50:49 +02:00
4fc9a6cd8e Merge branch 'master' into multiling
# Conflicts:
#	FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java
#	FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
2021-10-10 14:40:50 +02:00
34f75bfeb7 Fix 345° Bossbar
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-10 08:26:31 +02:00
d064cb8f8f Waterremover adjustment for Underwater
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-08 07:48:56 +02:00
3208ee9ab9 Merge pull request 'Move to FightInfoPacket' () from fightInfo into master
Reviewed-on: 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-10-08 07:10:34 +02:00
a9766d0265 Fix start listening on Spectateserver
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-07 09:56:34 +02:00
6ee276ca82 WIP multiling part 2
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-07 09:54:53 +02:00
c00dd470f1 Move to FightInfoPacket
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-03 20:35:37 +02:00
1cc57539e4 WIP first half multiling
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-02 11:44:12 +02:00
c983b40d9f Faster subtitles
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-01 17:36:54 +02:00
65e1315cca Add TPS watcher, fix tie
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-01 14:51:00 +02:00
e8e6b5fcfd New Fight UI
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-01 11:53:41 +02:00
da68b5672f Current state, 1.8 support
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-30 17:32:32 +02:00
7551481881 Merge branch 'master' into newFightUI 2021-09-30 17:30:45 +02:00
431fd3697f Fix chunkhider
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-30 13:20:40 +02:00
efc601e090 Fix rotational and additional issues
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-30 13:20:28 +02:00
a37ae72b6a Merge branch 'tinyProtocol' into newFightUI 2021-09-30 12:34:26 +02:00
b68508eec8 Full TinyProtocol implementation (some tests on 1.15, further untested)
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-28 22:21:30 +02:00
b0cbf622df Full TinyProtocol implementation (it initializes on 1.15, further untested)
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-28 18:25:45 +02:00
0e91cbdb06 Full TinyProtocol implementation (untested)
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-28 13:08:10 +02:00
bc82b18fc6 Fight + partial REntity -> TinyProtocol
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-27 21:14:34 +02:00
8ce5e7f7f8 Merge branch 'master' into tinyProtocol 2021-09-27 19:41:28 +02:00
6f79713f73 Merge branch 'master' into newFightUI 2021-09-27 17:02:14 +02:00
84ebd02311 Merge pull request 'Real spectator mode in own teamarea' () from realGM3 into master
Reviewed-on: 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-09-27 08:01:55 +02:00
56096d5070 TinyProtocol Recording
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-18 14:30:32 +02:00
194adf8970 Fix laggy schemselect
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-16 17:58:31 +02:00
a4148c8e6d TinyProtocol TechHider
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-13 21:38:26 +02:00
05d121fe63 Fix rotation
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-11 22:27:28 +02:00
79658bf3aa Real spectator mode in own teamarea
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-11 18:31:58 +02:00
e01828a731 Merge branch 'master' into newFightUI 2021-09-11 18:26:17 +02:00
d3cff066f5 Correct rotating?
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-04 23:09:50 +02:00
5264bb0256 WIP new fight ui
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-03 17:32:00 +02:00
0556b9de9a Fix one off offsets with doubles + aligned pasting
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-02 11:23:10 +02:00
5826f7e8b1 Fix dimensions
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-01 17:27:00 +02:00
453dea774e Unify WE offset calculation
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-01 16:50:41 +02:00
eae23123c8 Worldedit refactoring
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-08-31 17:01:45 +02:00
1c428cdacc Remove ITechHider
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-08-31 12:12:54 +02:00
f61c6cbf6d Full 1.8 compilation support
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-08-31 12:09:34 +02:00
765a9e4f6c Reduce overhead and add a World of Colors!
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-08-31 11:19:56 +02:00
96bd358d29 New VersionDependent system
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-08-31 10:42:42 +02:00