SteamWar/FightSystem
SteamWar/FightSystem
Archiviert
13
1
Fork 0
Code Issues 6 Pull-Requests Releases Wiki Aktivität
489 Commits 8 Branches 0 Tags 7,6 MiB
f04a9edb41
Commit graph

223 Commits

Autor SHA1 Nachricht Datum
Lixfel
b13362176c Fix multiple times techko 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-25 09:58:09 +02:00
Lixfel
10c9cf3ae5 More RecordSystem 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-25 09:55:05 +02:00
Lixfel
b73bc9ad5e Merge branch 'master' into recordSystem 2020-07-22 16:48:35 +02:00
Lixfel
2cb8c5e8b3 Fix ELO Calculation 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-19 19:37:48 +02:00
Lixfel
b2a9a4ed64 Fix NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-19 19:16:54 +02:00
Lixfel
caa8b4aa6a Fix join listener 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-19 15:55:16 +02:00
Lixfel
7858a87b60 Fix join listener 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-19 15:53:10 +02:00
Lixfel
a95800e815 Hotfix countdown 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-11 10:31:18 +02:00
Lixfel
5879ca5e18 Hotfix piston listener 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-11 08:50:39 +02:00
Lixfel
620677d593 Fix entern countdown timer 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-11 08:48:17 +02:00
Lixfel
72d3d0314b Fixing fire arrow bug and kit gui bug 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-11 07:53:04 +02:00
Lixfel
0d33e8c508 Merge branch 'multi-stage-entern' 
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/utils/WaterRemover.java
 2020-07-11 07:22:36 +02:00
Lixfel
7af46a1f13 More WIP RecordSystem 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-11 07:17:10 +02:00
Lixfel
7e66c9895c Only one spectate state init 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-07 19:36:56 +02:00
Lixfel
b5bcea06b7 Send ELO to players + fix potential crash issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-07 19:35:37 +02:00
Lixfel
8ebf509b4e Implementing ranked computation and setting 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-07 19:07:11 +02:00
Lixfel
c1261a4fa2 First ranked (ranked saving still missing) 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-07 17:56:35 +02:00
Lixfel
727129fe8e Faster Waterremover 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-06 17:39:45 +02:00
Lixfel
2aabded41e Faster Waterremover 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-05 16:29:21 +02:00
Lixfel
1261459b79 Fix fightstatistics 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-04 11:04:38 +02:00
Lixfel
c13b024f93 First sections of a record system 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-04 10:49:49 +02:00
Lixfel
228cb9e768 Fix non TNT-Kits only no tnt 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-04 09:33:31 +02:00
Lixfel
a9907b9ad1 Disable TNT explosions in testarenas in Pre running state 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-03 21:10:07 +02:00
Lixfel
d04d8f65b3 Fix GM3 in your head issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-03 20:41:08 +02:00
Lixfel
87f13942b1 Hotfix WaterRemover loop 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-22 17:16:54 +02:00
Lixfel
669a822bd6 Hotfix WaterRemover loop 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-22 17:14:45 +02:00
Lixfel
e4fe75693a Finish enter handler 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-22 09:40:29 +02:00
Lixfel
3b46d45bc0 Merge branch 'master' into multi-stage-entern 2020-06-22 08:58:58 +02:00
Lixfel
51fe8cfbe5 Hotfix flying in arena issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-04 16:56:14 +02:00
Lixfel
cf8f36630e Hotfix flying in arena issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-04 13:27:28 +02:00
Lixfel
eb6f45a485 Hotfix flying in arena issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-04 13:18:46 +02:00
Lixfel
d462d7d008 Hotfix flying in arena issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-04 13:16:54 +02:00
Lixfel
77133bf72a Revert "Sync WaterTechKO-Detector?" 
This reverts commit ff965cca

Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-03 11:22:53 +02:00
Lixfel
ff965cca75 Sync WaterTechKO-Detector? 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-03 11:21:50 +02:00
Lixfel
2ee2d74432 Hotfix watertechko + simplify and speedup 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-03 10:38:14 +02:00
Lixfel
aed86fc97b Some refactoring 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-03 10:19:57 +02:00
Lixfel
10c461f317 Merge pull request 'Add GamemodeCommand' (#162) from Gamemode into master 
Reviewed-by: Jan9103 <jan9103@steamwar.de>
 2020-06-03 08:45:36 +02:00
jojo
4e8152d282 Add GamemodeCommand 2020-05-31 18:56:50 +02:00
Lixfel
c27f8bbd82 Merge pull request 'Rank-System für die neuen WS und WG' (#155) from ranks into master 
Reviewed-by: Jan9103 <jan9103@steamwar.de>
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2020-05-31 17:15:34 +02:00
Lixfel
b5dcedb645 Hotfix inventory size failure 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-26 14:17:52 +02:00
Lixfel
858e1b52ca Hotfix backport. 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-24 18:15:10 +02:00
Lixfel
7dc7fa1f41 Removing all crafting possibilitys 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-22 17:02:25 +02:00
jojo
f8a2585621 Add BlockBreakEvent Add item not in Inventory 2020-05-22 16:40:27 +02:00
jojo
ad077e8eb2 Add BlockBreakEvent Debug Messages 2020-05-22 16:18:40 +02:00
jojo
4e844070ca Add BlockBreakEvent 2020-05-22 14:38:32 +02:00
Lixfel
4d192ab35d Implementing Rank-System 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-22 10:09:34 +02:00
Lixfel
aed114cda2 Merge pull request 'Simplified 1.12-Techhider' (#150) from simplified-techhider12-nonViaCompatible into master 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2020-05-22 07:54:24 +02:00
Lixfel
c1bb646579 Merge branch 'master' into ranks 2020-05-22 07:03:59 +02:00
Lixfel
aeda617a55 Make it possible to walk on the floor in prefight stage 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-21 08:42:39 +02:00
Lixfel
c7a48f36f2 Simplified 1.12-Techhider 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-19 09:42:49 +02:00
Lixfel
ab4852c717 Merge pull request 'Improving size of spectator space' (#148) from biggerSpectatorSpace into master 
Reviewed-by: Jan9103 <maxjanssen67@gmail.com>
 2020-05-19 08:45:59 +02:00
Lixfel
1608f895a8 Improving size of spectator space 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-16 16:59:35 +02:00
Lixfel
9f3e658636 First rank prototype 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-16 16:39:16 +02:00
Lixfel
13219dc352 Adding option for F3+N 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-11 13:25:45 +02:00
Lixfel
ac6b441815 Merge branch 'implementing-check-capability' 2020-05-10 19:18:30 +02:00
Lixfel
2c37646c79 Merge branch 'renameKitSelection' 2020-05-10 19:18:16 +02:00
Lixfel
100868b04d Hotfix percent stopping 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-03 15:42:53 +02:00
Lixfel
219d7acbe2 Preventing copying 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-01 11:05:31 +02:00
Lixfel
04b5fa34f8 Adapting permissions 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-30 16:10:20 +02:00
Lixfel
bf3baed537 Implementing check capability into TestArenas 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-30 16:09:24 +02:00
Lixfel
1367305e26 Force backport 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-28 09:54:10 +02:00
Lixfel
0f9480f69e Replace blocks without blockupdates 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-21 10:08:02 +02:00
Lixfel
8f7d3c74b7 Event hotfix 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-19 20:28:07 +02:00
Lixfel
1c72ac9251 Fix freezer to more seconds 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-17 14:49:50 +02:00
Lixfel
50a864de1e Rename Kit selection 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-15 17:10:41 +02:00
Lixfel
26d8fe4451 Merge branch 'master' into 1.15TechhiderFullChunk 2020-04-13 11:55:08 +02:00
Lixfel
043810bb14 Hotfix kit creation breakout bugs 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-11 12:26:36 +02:00
Lixfel
ff6182fad4 Techhider 2 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-11 12:06:01 +02:00
Lixfel
c7bc8163ed Merge branch 'kitreset' of SteamWar/FightSystem into master 2020-04-01 12:56:12 +02:00
Lixfel
01f9ffb6de Improve world freezing for MWG 1.15 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-01 12:30:36 +02:00
Lixfel
c3e1e93578 Resetting Kit creator with creative inventory clear, FightTeam nametag fix for 1.15 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-01 11:59:37 +02:00
Lixfel
6ea8001cf5 Hotfix #119 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-03-28 08:53:16 +01:00
Lixfel
0a82dc362f Hotfix Sign update Exception 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-03-01 13:35:10 +01:00
Lixfel
afb3b07b87 Hotfix async exception 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-27 19:10:34 +01:00
Lixfel
443ffb725d Hotfix NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-21 06:36:45 +01:00
Lixfel
9885225466 Merge branch 'autoStart' of SteamWar/FightSystem into master 2020-02-11 17:43:15 +01:00
Lixfel
81fd8329fc Merge branch '1.15' of SteamWar/FightSystem into master 2020-02-11 17:41:50 +01:00
Lixfel
b11fba3280 Hotfix NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-10 21:34:24 +01:00
Lixfel
dba3872a25 Autostarting fight with end of setup countdown (like in events) 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-10 14:31:37 +01:00
Lixfel
c9c6529bdf Give Ready-Button in Eventmode for faster startup 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-10 13:08:11 +01:00
Lixfel
684ed70219 Fixing Waterremover and deadlock 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-10 10:32:21 +01:00
Lixfel
01ec60c4e4 Hotfix event countdown naming 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-08 07:03:40 +01:00
Lixfel
4aee1f4c72 Preventing arrow pickups 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-01 14:28:46 +01:00
Lixfel
11251727bf Dirty hotfix of Points NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-27 17:36:00 +01:00
Lixfel
67ad92bc90 Merge branch 'hide_sign_content' of SteamWar/FightSystem into master 2020-01-27 06:47:13 +01:00
Lixfel
61ff397458 Merge branch 'master' into personalKit 
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java
#	FightSystem_Main/src/de/steamwar/fightsystem/commands/GUI.java
#	FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java
 2020-01-27 06:31:41 +01:00
Lixfel
668f2c948f Useless commit to test building 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-26 08:46:47 +01:00
Lixfel
0ebc7e5616 Fixing bugs occured with testing 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-23 19:57:21 +01:00
Lixfel
0c21251720 Loading personalKits to player 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-23 17:40:48 +01:00
Lixfel
e053ecf286 Adding fight statistics 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-23 17:33:29 +01:00
Lixfel
c5c6e8c32b Implement personal kits (untested) 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-23 08:31:32 +01:00
Lixfel
2ac00294f9 Hotfix NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-21 17:49:04 +01:00
Lixfel
7fe4f09a08 Hotfix NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-20 18:48:40 +01:00
Lixfel
542547fd5b Hotfix NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-20 18:46:52 +01:00
Lixfel
a4f8251680 Merge branch 'master' into hide_sign_content 
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/utils/TechHider.java
 2020-01-20 17:51:58 +01:00
Lixfel
5a9e281c95 Merge branch 'IgnorePublicOnly' of SteamWar/FightSystem into master 2020-01-20 17:47:42 +01:00
Lixfel
ad87077b15 Merge branch 'remove_pair' of SteamWar/FightSystem into master 2020-01-20 06:48:46 +01:00
Lixfel
3c4d5123da Ignore Public Only rule (for historic gamemodes) 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-19 17:32:29 +01:00
Lixfel
00967a2d3e WIP Adding personal kits 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-19 17:25:11 +01:00
Lixfel
03e5cf62a2 Removing pair from fight system 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-19 07:38:54 +01:00