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

745 Commits

Dieser Branch
Dieser Branch
Alle Branches
Autor SHA1 Nachricht Datum
Lixfel
aa3229a897 Merge branch 'master' into spectate2.0 
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/listener/FightScoreboard.java
 2021-05-24 17:41:07 +02:00
Lixfel
48426c9a86 WIP 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-24 17:40:24 +02:00
Lixfel
394ccc251e Hotfix hotbargui 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-24 15:24:07 +02:00
Lixfel
26ccf98d44 WIP 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-24 15:23:35 +02:00
Lixfel
ead9568d6a Merge pull request 'Make it harder to accidentialy move/equip items in the HotbarGUI' (#279) from lessHotbarBugs into master 
Reviewed-on: #279
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-05-24 09:59:26 +02:00
Lixfel
9511237b3a Merge pull request 'Fix spectators below (M)WGs' (#278) from fixBelowWGs into master 
Reviewed-on: #278
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-05-24 09:57:47 +02:00
Lixfel
7541668739 Merge pull request 'Fix ranked player does not join arena' (#277) from fixRanked into master 
Reviewed-on: #277
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-05-24 09:57:10 +02:00
Lixfel
a017df7caa Merge pull request 'Fix prepare recoloring' (#276) from fixPrepare into master 
Reviewed-on: #276
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-05-24 09:56:41 +02:00
Lixfel
3b2857d60d Set to preschemstate 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-24 09:47:32 +02:00
Lixfel
e408aac608 Make it harder to accidentialy move/equip items in the HotbarGUI 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-24 09:31:58 +02:00
Lixfel
14986aedd8 Dont db-log players moving into team area anymore 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-24 09:06:00 +02:00
Lixfel
fa8f6c4265 Remove debug output 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-24 08:57:34 +02:00
Lixfel
9cef84f7b3 Fix spectators below (M)WGs 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-24 08:54:25 +02:00
Lixfel
27d853af19 Fix ranked player does not join arena 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-24 08:51:08 +02:00
Lixfel
5945f3c148 Fix prepare recoloring 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-24 08:36:25 +02:00
Lixfel
5ed30e9123 Merge pull request 'Fix Dispenser' (#273) from dispenser into master 
Reviewed-on: #273
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-05-08 14:57:56 +02:00
Lixfel
7ddd8052c8 Fix Dispenser 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-08 14:56:29 +02:00
Zeanon
ab24b5bc24 Merge pull request 'Fix Piston retract with Block on Region Floor and Piston above' (#271) from PistonFixArenaFloor into master 
Reviewed-on: #271
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-05-08 01:33:31 +02:00
Zeanon
f62ac6a1ce Now it works 2021-05-08 01:31:30 +02:00
Zeanon
17ec28170a Fixed the fix 2021-05-06 20:33:10 +02:00
yoyosource
fd9ed60c0a Fix Piston retract with Block on Region Floor and Piston above 2021-05-06 17:49:20 +02:00
Lixfel
ed5163d297 Merge pull request 'Improved Countdown start and scoreboard' (#268) from qualityOfLife into master 
Reviewed-on: #268
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-04-29 19:59:14 +02:00
Lixfel
666278fbef Merge pull request 'Speedy recoloring' (#269) from fastRecolor into master 
Reviewed-on: #269
Reviewed-by: Zeanon <thezeanon@gmail.com>
 2021-04-27 20:31:53 +02:00
Lixfel
dd61e67517 Speedy recoloring 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-26 21:14:53 +02:00
Lixfel
9a997371d6 Some more work 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-26 20:08:23 +02:00
Lixfel
8cc92c5ac4 Fix enterskip 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-24 20:18:39 +02:00
Lixfel
ebfdaa783d Adding Spectate ArenaMode + first classes 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-24 20:16:16 +02:00
Lixfel
3bdc61fac8 Fix kitcreator closing 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-24 17:43:13 +02:00
Lixfel
5c95036830 Improved Countdown start and scoreboard 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-24 17:35:17 +02:00
Lixfel
d81259fac9 Merge pull request 'Add Bow Damge and Fire' (#261) from record_extension into master 
Reviewed-on: #261
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-04-23 19:52:26 +02:00
Lixfel
f2dca15953 Merge branch 'master' into record_extension 2021-04-23 18:23:07 +02:00
Lixfel
ad2a197708 Hotfix 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-17 19:32:46 +02:00
Lixfel
becff649a4 Merge pull request 'Kampfleiter /win command' (#267) from event_win into master 
Reviewed-on: #267
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-04-17 19:04:34 +02:00
Lixfel
2aceb8d475 Kampfleiter /win command 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-17 18:00:57 +02:00
Lixfel
766aaa3bcb Fix tablist 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-14 20:46:02 +02:00
Chaoscaot
0fc55d4268 Merge branch 'master' into record_extension 2021-04-14 20:40:37 +02:00
Chaoscaot
573a8e14e4 Fix Bow Recording.java 2021-04-14 20:40:02 +02:00
Chaoscaot
48fe87ffa3 Fix Bow Recording.java 2021-04-14 20:36:49 +02:00
Lixfel
b516e169e8 Merge pull request 'Fix rotation issues' (#259) from fix_rotate into master 
Reviewed-on: #259
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-04-14 20:27:50 +02:00
Chaoscaot
a364f86d1f Fix Bow Recording.java 2021-04-14 12:44:40 +02:00
Chaoscaot
186b896bf6 Fix Bow Recording.java 2021-04-13 21:30:22 +02:00
Chaoscaot
d7a9ce65d4 Quick Fix 2021-04-13 19:58:59 +02:00
Chaoscaot
4cc03892c9 New Method to Register Bow Listener 2021-04-13 19:56:10 +02:00
Chaoscaot
3497e2d1e7 Remove Unused IMoving Checks Around 2021-04-13 19:52:31 +02:00
Lixfel
b1c5106e5f Merge pull request 'Added paper-compatibility' (#258) from WorldResetPaper into master 
Reviewed-on: #258
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-04-13 19:51:03 +02:00
Lixfel
fe36f92def Merge branch 'master' into WorldResetPaper 2021-04-13 19:50:33 +02:00
Lixfel
cd0b7e31f2 Merge pull request 'Fix techhider on team leave' (#260) from fix_techhider into master 
Reviewed-on: #260
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-04-13 12:06:06 +02:00
Chaoscaot
8b6cb30e25 Merge branch 'master' into record_extension 2021-04-13 11:03:20 +02:00
Chaoscaot
9ca2b6482a Remove Unused Import 2021-04-13 10:12:21 +02:00
Chaoscaot
be63925b02 Remove Unused Import 2021-04-12 23:33:50 +02:00