|
|
8dbcc3c2e2
|
Fix rotateted schematics
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-04-09 11:55:10 +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 |
|
|
|
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 |
|
|
|
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 |
|
Chaoscaot
|
2c033cdce8
|
Final Föx...
|
2021-04-01 00:25:04 +02:00 |
|
Chaoscaot
|
ed5081d323
|
Final Föx
|
2021-04-01 00:19:47 +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 |
|
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 |
|
|
|
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 |
|
|
|
d1e6e87129
|
Add testcommand
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-03-31 20:15:51 +02:00 |
|
|
|
947afe7e1f
|
Fixes
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-03-30 18:59:12 +02:00 |
|
|
|
f69e864541
|
Bugfixes
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-03-27 17:57:51 +01:00 |
|
|
|
68a2067b88
|
Fix Techhider 1.8 - 1.10
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-03-24 13:49:21 +01:00 |
|
|
|
687ef93adf
|
Fix Schempreparation
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-03-24 11:45:18 +01:00 |
|
|
|
3e646f3b00
|
Fix headers
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-03-24 11:32:41 +01:00 |
|
|
|
5d71169690
|
Fix multiversioning
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-03-24 11:21:17 +01:00 |
|
|
|
e998707905
|
Bugfixes noch und nöcher!
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-03-24 10:18:00 +01:00 |
|
|
|
aeaced502a
|
Update default config
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-03-23 19:54:05 +01:00 |
|
|
|
ce5cbf9969
|
Adding skip, techhider improvements...
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-03-23 16:42:45 +01:00 |
|
|
|
9b65277c66
|
Full resettable + config simplification
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-03-20 17:25:13 +01:00 |
|
|
|
9098a26aa9
|
Refactoring + Arena reset
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-03-20 14:49:43 +01:00 |
|
|
|
7b085d8ee6
|
Refactor StateDependent
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-03-12 15:43:32 +01:00 |
|
|
|
7268be7de9
|
Refactor winconditions
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-03-10 22:45:17 +01:00 |
|
|
|
93b5fd8a03
|
Some big refactoring
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-03-10 17:12:24 +01:00 |
|
yoyosource
|
e979398a87
|
Remove commented out code from FileRecorder
|
2021-02-27 21:03:02 +01:00 |
|
yoyosource
|
5d49eaa0fd
|
Fixing arguments for GZIPOutputStream
|
2021-02-27 20:42:07 +01:00 |
|
yoyosource
|
c8e796b2d6
|
Optimize FileRecorder
|
2021-02-27 20:36:29 +01:00 |
|
yoyosource
|
f0b181bad5
|
Add always Event recording
Add live playback with option
|
2021-02-27 19:42:10 +01:00 |
|
|
|
8fb9aefbaa
|
Make config and kits path configurable
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-02-04 08:51:12 +01:00 |
|
|
|
fadf22bb97
|
Fix relative percent system
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-02-04 08:35:21 +01:00 |
|
|
|
3bafa816d8
|
Merge pull request 'Fix names' (#231) from nameFix into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-01-30 17:24:27 +01:00 |
|
|
|
7ae0d85543
|
Hotfix rebuild
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-01-30 16:44:34 +01:00 |
|
|
|
10eeedb878
|
Merge pull request 'Add Multi Personal Kits' (#228) from multi-kits into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2021-01-30 16:41:53 +01:00 |
|
|
|
9d0f30dc93
|
Fix names
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-01-30 16:36:41 +01:00 |
|
Chaoscaot
|
c41faca8e8
|
Fixing Minor Stuff
|
2021-01-30 12:00:08 +01:00 |
|
Chaoscaot
|
a51f03826c
|
Remove Code Duplication
|
2021-01-29 21:27:17 +01:00 |
|
Chaoscaot
|
8ab93315ce
|
Fix not existing Method
|
2021-01-27 12:58:18 +01:00 |
|
Chaoscaot
|
6cc140ff99
|
Fix Many Typos and use less Inventories
|
2021-01-27 12:18:10 +01:00 |
|
Chaoscaot
|
07f3cdc4cf
|
Use New Methods
|
2021-01-24 15:09:48 +01:00 |
|
|
|
ffde805bb0
|
Fix entern befor fight start
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-01-14 21:20:52 +01:00 |
|
Chaoscaot
|
dd8dddb3a8
|
Fixed Entern befor Entern
|
2021-01-11 19:43:06 +01:00 |
|
Chaoscaot
|
78b55e7e6c
|
Fixing
|
2021-01-10 17:07:01 +01:00 |
|
Chaoscaot
|
bd08c9d890
|
Remove of MultipleKits with same name
|
2021-01-10 17:06:15 +01:00 |
|
Chaoscaot
|
42b4109698
|
Add Multi Personal Kits
|
2021-01-09 17:35:32 +01:00 |
|
|
|
5035cde575
|
Cancel PKC on move
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-01-08 19:23:32 +01:00 |
|
|
|
7bfa891b11
|
Improve KitCreatorClosement
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-01-08 18:02:57 +01:00 |
|
|
|
f8769d83a9
|
Improve KitCreatorClosement
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-01-08 17:42:35 +01:00 |
|
jojo
|
00e9e34877
|
Optimize some VersionedRunnables
|
2021-01-04 22:31:48 +01:00 |
|
jojo
|
042449e591
|
Fix try/catch in FightTeam.pasteSchematic
|
2021-01-04 22:26:29 +01:00 |
|
jojo
|
623ee6c75a
|
Refactor version dependant calls to new System
|
2021-01-04 22:21:36 +01:00 |
|
|
|
61668b7292
|
Merge pull request 'Waterremover improvements' (#225) from improveWaterremover into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-01-02 13:16:38 +01:00 |
|
|
|
1112b86742
|
Waterremover improvements
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-01-02 12:36:16 +01:00 |
|
|
|
17f32f9f14
|
Merge pull request 'Use TeamColor' (#222) from team-color into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2021-01-02 09:37:44 +01:00 |
|
|
|
ea596d724a
|
Merge pull request 'Arrows Stopping in Techhider Blocks' (#208) from arrow-in-techhider into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2021-01-02 09:20:41 +01:00 |
|
|
|
47e256d31c
|
Improvements
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-01-02 09:20:19 +01:00 |
|
Chaoscaot
|
7b055a37be
|
Improve Tracking
|
2020-12-30 17:11:02 +01:00 |
|
Chaoscaot
|
6d9a8683db
|
Removing Imports
|
2020-12-30 16:45:14 +01:00 |
|
Chaoscaot
|
36d27f52c6
|
Improving Performance
|
2020-12-30 16:44:57 +01:00 |
|
jojo
|
0ed423b596
|
Fix Water duping with ice
|
2020-12-30 15:51:31 +01:00 |
|
jojo
|
532268eaf7
|
Fix Water duping with ice
|
2020-12-30 15:49:33 +01:00 |
|
Chaoscaot
|
dea991d7d7
|
Fixing
|
2020-12-30 13:41:17 +01:00 |
|
Chaoscaot
|
bcd6ed8a90
|
Use TeamColor
|
2020-12-28 18:02:04 +01:00 |
|
|
|
b8b8b1b0f5
|
Optimize TechKO detection
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-12-24 14:53:29 +01:00 |
|
Chaoscaot
|
250c429a51
|
Performance Changes
|
2020-12-21 12:59:09 +01:00 |
|
|
|
fd3d6d9911
|
Prevent false positives
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-12-19 12:00:46 +01:00 |
|
|
|
bbc18de42e
|
Fix 1.8 arena
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-12-19 11:36:06 +01:00 |
|
|
|
9e4e4ee4f8
|
Hotfix teamleave
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-12-11 17:53:37 +01:00 |
|
|
|
4e65017b50
|
Performance, Full block techhider, bugfixes
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-12-09 18:43:50 +01:00 |
|
Chaoscaot
|
94b248d875
|
Fixing
|
2020-12-08 16:01:42 +01:00 |
|
Chaoscaot
|
e431b1323c
|
Fixing
|
2020-12-07 23:38:14 +01:00 |
|
Chaoscaot
|
030bfbc6a1
|
Improving
|
2020-11-30 20:05:07 +01:00 |
|
Chaoscaot
|
fff0380228
|
Merge remote-tracking branch 'origin/master' into arrow-in-techhider
|
2020-11-30 19:26:00 +01:00 |
|
|
|
08b483deb4
|
Detect and block prefilled inventories in PersonalKitCreator
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-30 17:10:38 +01:00 |
|
Chaoscaot
|
5eedf7bf50
|
Improving Array
|
2020-11-28 13:11:43 +01:00 |
|
Chaoscaot
|
9984fc0179
|
Remove Debug Message
|
2020-11-28 12:07:41 +01:00 |
|
Chaoscaot
|
5366011bd7
|
Rework Arrow Tracking
|
2020-11-28 12:05:27 +01:00 |
|
Chaoscaot
|
8c93f446df
|
Adding Better Tracking
|
2020-11-27 21:31:39 +01:00 |
|
Chaoscaot
|
afa2217ce3
|
Adding Better Tracking
|
2020-11-27 21:07:51 +01:00 |
|
Chaoscaot
|
81ac127bbf
|
Adding Better Tracking
|
2020-11-27 19:55:26 +01:00 |
|
Chaoscaot
|
664350d286
|
Add Arrows Stopping in Techhider Blocks
|
2020-11-27 16:22:15 +01:00 |
|
|
|
9525873e8c
|
Merge remote-tracking branch 'origin/master'
|
2020-11-18 14:52:53 +01:00 |
|
|
|
aac110bad8
|
Hotfix schempasting
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-18 14:52:43 +01:00 |
|
Chaoscaot
|
0dec2b8946
|
Fixing...
|
2020-11-17 09:31:28 +01:00 |
|
Chaoscaot
|
e460b04a67
|
Fixing...
|
2020-11-17 08:58:50 +01:00 |
|
Chaoscaot
|
26e71da87a
|
Add Record System
|
2020-11-16 21:36:28 +01:00 |
|
Chaoscaot
|
7dbd3ab5cb
|
Fixing Scoreboard
|
2020-11-16 21:31:03 +01:00 |
|
Chaoscaot
|
57d5d0fadc
|
Merge branch 'master' into scoreboard-reimplement
# Conflicts:
# FightSystem_Main/src/de/steamwar/fightsystem/utils/FightScoreboard.java
|
2020-11-16 20:54:25 +01:00 |
|
|
|
59a000d3f2
|
Fix closed channel packets
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-15 11:24:57 +01:00 |
|
|
|
aa3d9f4a8a
|
Fix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-12 14:25:38 +01:00 |
|
|
|
680994aed9
|
Fix small fightstate bug
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-10 09:59:19 +01:00 |
|
|
|
c423d8ea22
|
Hothotfix
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-09 19:25:21 +01:00 |
|
|
|
1848622a50
|
Implementing tps scoreboard parameter
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-07 11:40:01 +01:00 |
|
|
|
2317505494
|
Double disconnect fix
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-02 18:32:33 +01:00 |
|
|
|
fc1400a73a
|
Hotfix player join not recognized
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-02 18:07:09 +01:00 |
|
|
|
3147783ef8
|
Hotfix player join not recognized
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-02 17:53:57 +01:00 |
|
|
|
247396bffd
|
Hotfix player join not recognized
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-02 17:37:28 +01:00 |
|
|
|
c0887a87d0
|
Start recording all event fights
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-02 17:23:15 +01:00 |
|
|
|
ea63704c38
|
Kick non players and record more blocks (to prevent ghost blocks)
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-02 17:11:18 +01:00 |
|
|
|
5b12e10b98
|
Fix player despawn
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-02 12:13:57 +01:00 |
|
|
|
d9dede725b
|
Fix fightscoreboard recording
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-02 10:41:45 +01:00 |
|
|
|
014cee20a8
|
Temporary only record if recording
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-01 16:17:00 +01:00 |
|
|
|
06960ffda7
|
Merge branch 'master' into recordSystem
# Conflicts:
# FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java
# FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java
|
2020-11-01 16:11:00 +01:00 |
|
|
|
6189b7278a
|
Hotfix gm 31 in testarena & tablist
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-10-30 22:04:04 +01:00 |
|
|
|
55b27082cb
|
Kick all nonparticipants if Event with SpectateSystem
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-10-30 14:06:38 +01:00 |
|
|
|
acb83e7fbb
|
Hotfix
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-10-30 07:52:08 +01:00 |
|
|
|
81224b9495
|
Merge pull request 'tablistName' (#197) from tablistName into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
|
2020-10-30 07:31:36 +01:00 |
|
|
|
924ed3b30a
|
Disable TablistPacket on test arenas
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-10-30 07:31:21 +01:00 |
|
|
|
3281469772
|
Adjust explosion size
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-10-29 21:40:28 +01:00 |
|
|
|
886e624bac
|
Impl. tablist name capability
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-10-29 20:51:45 +01:00 |
|
|
|
a5c19e04c0
|
Merge pull request 'GameMode 1 Spectator' (#190) from gm1Spectator into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
|
2020-10-29 19:57:47 +01:00 |
|
|
|
f04a9edb41
|
Fix sound strength
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-10-29 12:24:43 +01:00 |
|
|
|
259ca31f2b
|
Tablist name impl. as comments.
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-10-29 12:19:23 +01:00 |
|
|
|
9b4744ae05
|
Don't autoban
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-10-28 11:18:06 +01:00 |
|
|
|
97dd9794ef
|
Merge branch 'master' into gm1Spectator
|
2020-10-28 11:16:32 +01:00 |
|
|
|
192602625b
|
Blocked spectator mode
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-10-28 11:16:25 +01:00 |
|
|
|
84fa4e8dd0
|
Might fix #192
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-10-28 10:21:13 +01:00 |
|
|
|
70b90b467b
|
This should fix the waterlogged waterremover problem
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-10-27 15:50:24 +01:00 |
|
|
|
bef28a99b2
|
Commit recent changes
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-10-27 15:33:44 +01:00 |
|
jojo
|
6db5d46af3
|
Add fileSuffix .recording
|
2020-10-21 18:32:20 +02:00 |
|
|
|
8d33e25bec
|
Fix exceptions
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-10-16 09:11:10 +02:00 |
|
|
|
da26ddf179
|
Merge remote-tracking branch 'origin/recordSystem' into recordSystem
|
2020-10-15 22:10:15 +02:00 |
|
|
|
20f14670df
|
Despawn all tnt at end of fight
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-10-15 22:10:08 +02:00 |
|
jojo
|
c04029fb92
|
Add clearity into RecordSystem comment
|
2020-10-15 18:55:43 +02:00 |
|
|
|
cc8b7bd96e
|
Reduce block change packets
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-10-15 18:42:31 +02:00 |
|
|
|
0d1a0390fd
|
Merge branch 'master' into recordSystem
# Conflicts:
# FightSystem_Main/src/de/steamwar/fightsystem/utils/FightScoreboard.java
|
2020-10-15 18:03:05 +02:00 |
|
Chaoscaot
|
2bc9bded5c
|
Fixing Scoreboard
|
2020-10-15 13:14:34 +02:00 |
|
