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

695 Commits

Dieser Branch
Dieser Branch
Alle Branches
Autor SHA1 Nachricht Datum
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
Lixfel
b6ad157e38 Fix techhider on team leave 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-12 18:17:20 +02:00
Lixfel
f4788d8152 Fix teleport 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-12 18:08:43 +02:00
Zeanon
5b2947daea Added paper-compatibility 2021-04-12 16:37:09 +02:00
Lixfel
63d8da1f94 Comment out ResourcePack 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-09 16:54:02 +02:00
Lixfel
aa8c279f9e Merge pull request 'Fix rotateted schematics' (#253) from fix_rotation into master 
Reviewed-on: #253
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-04-09 16:07:27 +02:00
Lixfel
e052032c6a Merge pull request 'Fix piston listener' (#254) from fix_pistons into master 
Reviewed-on: #254
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-04-09 16:07:03 +02:00
Lixfel
1b60fee3b1 Merge pull request 'Reset entities' (#255) from reset_entities into master 
Reviewed-on: #255
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-04-09 16:06:36 +02:00
Lixfel
c5e593b47b Merge pull request 'Fix player death and resource pack' (#257) from fix_event into master 
Reviewed-on: #257
 2021-04-09 15:06:53 +02:00
Lixfel
0d2a0fcbc5 Fix player death and resource pack 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-09 15:06:36 +02:00
Lixfel
762fc3e230 Merge pull request 'Fix event things' (#256) from fix_event into master 
Reviewed-on: #256
 2021-04-09 14:47:10 +02:00
Lixfel
fa21d240fe Optimize imports 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-09 14:45:53 +02:00
Lixfel
a2b02ea234 Fix event things 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-09 14:45:09 +02:00
Lixfel
0384062e60 Reset entities 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-09 14:23:50 +02:00
Lixfel
fb7824b23b Fix piston listener 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-09 14:18:41 +02:00
Lixfel
8dbcc3c2e2 Fix rotateted schematics 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-09 11:55:10 +02:00
Lixfel
a62d9ab48a Merge pull request 'No paper world reset' (#251) from noPaperWorld into master 
Reviewed-on: #251
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-04-05 16:17:23 +02:00
Lixfel
0d9764b5d5 Merge pull request 'Resettable percent' (#252) from resettablePercent into master 
Reviewed-on: #252
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-04-05 16:17:06 +02:00
Lixfel
9086e100da Resettable percent 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-04 21:37:35 +02:00
Lixfel
227e7a7eac Hotfix player 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-04 21:26:21 +02:00
Lixfel
78dc8ecca8 No paper server 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-03 20:59:11 +02:00
Lixfel
2705bda00d Merge pull request 'Fix wincondition messages' (#249) from fixMessages into master 
Reviewed-on: #249
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-04-03 20:29:55 +02:00
Lixfel
83fdf1411c Hotfix scoreboard 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-03 15:25:59 +02:00
Lixfel
d2674e2140 Merge pull request 'Continouus updating scoreboard' (#248) from continouusScoreboard into master 
Reviewed-on: #248
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-04-03 15:24:43 +02:00
Lixfel
b63c51811f Merge pull request 'Remove the april fools joke' (#246) from removeApril into master 
Reviewed-on: #246
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-04-03 15:24:11 +02:00
Lixfel
41c04024a0 Fix wincondition messages 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-03 15:23:38 +02:00
Lixfel
d8aefba51b Continouus updating scoreboard 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-02 21:42:17 +02:00
Lixfel
84734a762f Remove the april fools joke 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-02 12:03:58 +02:00
Lixfel
864304693c Fix inverting bug 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-02 12:01:36 +02:00
Lixfel
01e1dd8a06 Fix schem height 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-01 21:18:35 +02:00
Lixfel
f6df9eecee Fix ready 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-01 20:56:51 +02:00
Lixfel
8fe18e2cf7 Fix schem creation 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-04-01 20:52:33 +02:00
YoyoNow
254b43618e Merge pull request 'Final Föx...' (#244) from adding_billo_april into master 
Reviewed-on: #244
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-04-01 00:25:57 +02:00
Chaoscaot
2c033cdce8 Final Föx... 2021-04-01 00:25:04 +02:00
YoyoNow
234819cfac Merge pull request 'Alle dinge sind Drei' (#243) from adding_billo_april into master 
Reviewed-on: #243
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-04-01 00:22:05 +02:00
Chaoscaot
ed5081d323 Final Föx 2021-04-01 00:19:47 +02:00
YoyoNow
de80cbe40b Merge pull request 'Nmr. 2' (#242) from adding_billo_april into master 
Reviewed-on: #242
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-04-01 00:12:21 +02:00
Chaoscaot
29e9a56f1f Fixing Aprilö 2021-04-01 00:11:31 +02:00
Chaoscaot
30fc66b19e Fixing Aprilö 2021-04-01 00:08:48 +02:00
Chaoscaot
bdac557390 Fixing Aprilö 2021-04-01 00:08:26 +02:00
YoyoNow
f54b7f9e49 Merge pull request 'Make April Great Again' (#241) from adding_billo_april into master 
Reviewed-on: #241
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-03-31 23:56:44 +02:00
Chaoscaot
4856fe2380 Commit April 2021-03-31 23:55:13 +02:00
Chaoscaot
5cadf74163 Make April Great Again 2021-03-31 23:44:05 +02:00
Lixfel
fb5acefeac Fix timeout scoreboard 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-03-31 22:22:55 +02:00
Lixfel
0a0bf3ff11 Various fixes 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-03-31 22:16:12 +02:00
Lixfel
f018ba0afd Fix points 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-03-31 22:09:41 +02:00
Lixfel
05fa057344 Fix leave messages 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-03-31 22:00:37 +02:00
Lixfel
355ea04c9b Enable skip in prefight 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-03-31 22:00:00 +02:00