SteamWar/FightSystem
Archiviert
13
1
Commit graph

87 Commits

Autor SHA1 Nachricht Datum
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
Chaoscaot
bcd6ed8a90 Use TeamColor 2020-12-28 18:02:04 +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
59a000d3f2 Fix closed channel packets
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-15 11:24:57 +01:00
c423d8ea22 Hothotfix
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-09 19:25:21 +01:00
2317505494 Double disconnect fix
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-02 18:32:33 +01:00
3147783ef8 Hotfix player join not recognized
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-02 17:53:57 +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
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
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
259ca31f2b Tablist name impl. as comments.
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-29 12:19:23 +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
2b3f08aae2 Set spectators in halfcreative mode
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-25 16:35:16 +02:00
de0d7d7340 Gamemode 1 packet
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-09 20:47:50 +02:00
7028bfbd98 SchemID
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-08 16:25:14 +02:00
4a26a490d7 Merge branch 'master' into recordSystem 2020-09-08 16:01:06 +02:00
a495700f6f Merge branch 'master' into recordSystem 2020-09-08 12:45:33 +02:00
cd1185c464 Simplify multiversioning with removing fall-through code
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-08 09:52:25 +02:00
859e404536 Implementing sound at player
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-06 11:43:09 +02:00
90737ca915 Implementing sound at player
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-06 11:39:16 +02:00
d621042f89 Merge branch 'master' into recordSystem 2020-09-05 22:20:56 +02:00
e4cd7755b2 Schematic now nullable
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-04 17:59:15 +02:00
6ed7ae0180 Implementing scoreboard, schematics, items
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-01 19:41:30 +02:00
3948115254 Preparing open source release
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-08-26 18:24:44 +02:00
0d33e8c508 Merge branch 'multi-stage-entern'
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/utils/WaterRemover.java
2020-07-11 07:22:36 +02:00
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
c1261a4fa2 First ranked (ranked saving still missing)
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-07-07 17:56:35 +02:00
cf8f36630e Hotfix flying in arena issue
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-06-04 13:27:28 +02:00
eb6f45a485 Hotfix flying in arena issue
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-06-04 13:18:46 +02:00
d462d7d008 Hotfix flying in arena issue
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-06-04 13:16:54 +02:00
aed86fc97b Some refactoring
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-06-03 10:19:57 +02:00
4d192ab35d Implementing Rank-System
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-05-22 10:09:34 +02:00
9f3e658636 First rank prototype
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-05-16 16:39:16 +02:00
2c37646c79 Merge branch 'renameKitSelection' 2020-05-10 19:18:16 +02:00
0f9480f69e Replace blocks without blockupdates
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-04-21 10:08:02 +02:00
1c72ac9251 Fix freezer to more seconds
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-04-17 14:49:50 +02:00
50a864de1e Rename Kit selection
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-04-15 17:10:41 +02:00
043810bb14 Hotfix kit creation breakout bugs
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-04-11 12:26:36 +02:00
01f9ffb6de Improve world freezing for MWG 1.15
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-04-01 12:30:36 +02:00
b11fba3280 Hotfix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-02-10 21:34:24 +01:00
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
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