SteamWar/FightSystem
Archiviert
13
1
Commit graph

678 Commits

Autor SHA1 Nachricht Datum
0384062e60 Reset entities
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-04-09 14:23:50 +02:00
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
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
9086e100da Resettable percent
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-04-04 21:37:35 +02:00
227e7a7eac Hotfix player
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-04-04 21:26:21 +02:00
78dc8ecca8 No paper server
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-04-03 20:59:11 +02:00
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
83fdf1411c Hotfix scoreboard
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-04-03 15:25:59 +02:00
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
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
41c04024a0 Fix wincondition messages
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-04-03 15:23:38 +02:00
d8aefba51b Continouus updating scoreboard
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-04-02 21:42:17 +02:00
84734a762f Remove the april fools joke
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-04-02 12:03:58 +02:00
864304693c Fix inverting bug
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-04-02 12:01:36 +02:00
01e1dd8a06 Fix schem height
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-04-01 21:18:35 +02:00
f6df9eecee Fix ready
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-04-01 20:56:51 +02:00
8fe18e2cf7 Fix schem creation
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-04-01 20:52:33 +02:00
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
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
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
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
fb5acefeac Fix timeout scoreboard
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-31 22:22:55 +02:00
0a0bf3ff11 Various fixes
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-31 22:16:12 +02:00
f018ba0afd Fix points
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-31 22:09:41 +02:00
05fa057344 Fix leave messages
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-31 22:00:37 +02:00
355ea04c9b Enable skip in prefight
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-31 22:00:00 +02:00
2937d65683 Fix relative wincondition
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-31 21:58:21 +02:00
68f4da0f4f Fix team area
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-31 21:50:45 +02:00
29a2b89a99 Fix message
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-31 21:47:53 +02:00
8634db5d78 Fix respawn on spectate
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-31 21:46:01 +02:00
fe28d387dd Fix techhider
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-31 21:24:46 +02:00
972e5febae Remove entity tick list 1.8
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-31 20:56:29 +02:00
7e731c6c87 Hotfix head rotation
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-31 20:48:31 +02:00
8bfade1604 Hotfix /skip
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-31 20:34:01 +02:00
233766f9d7 Hotfix config
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-31 20:23:46 +02:00
5f864eb95a Fix config
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-31 20:21:55 +02:00
d1e6e87129 Add testcommand
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-31 20:15:51 +02:00
79164acbbf Merge pull request 'The big refactoring' (#238) from refactoring into master
Reviewed-on: #238
2021-03-31 20:08:06 +02:00
f9ab14a2e3 Fix order
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-30 19:38:56 +02:00
947afe7e1f Fixes
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-30 18:59:12 +02:00
d0c0b250e5 Merge branch 'master' into refactoring
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/utils/TechHider.java
2021-03-27 17:58:28 +01:00
f69e864541 Bugfixes
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-27 17:57:51 +01:00
ea35f358e0 Merge pull request 'BlockBreakHider' (#240) from masterBlockBreakHider into master
Reviewed-on: #240
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2021-03-27 17:54:12 +01:00