|
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
|
2d06766270
|
Scoreboard Health 0 Fix
|
2020-09-27 18:11:46 +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 |
|
|
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 |
|
|
ce67d0e4f1
|
Improve PersonalKitCreator
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-08-18 17:31:05 +02:00 |
|
|
2cb8c5e8b3
|
Fix ELO Calculation
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-19 19:37:48 +02:00 |
|
|
b2a9a4ed64
|
Fix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-19 19:16:54 +02:00 |
|
|
a95800e815
|
Hotfix countdown
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-11 10:31:18 +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 |
|
|
8ebf509b4e
|
Implementing ranked computation and setting
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-07 19:07:11 +02:00 |
|
|
727129fe8e
|
Faster Waterremover
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-06 17:39:45 +02:00 |
|
|
2aabded41e
|
Faster Waterremover
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-05 16:29:21 +02:00 |
|
|
1261459b79
|
Fix fightstatistics
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-04 11:04:38 +02:00 |
|
|
87f13942b1
|
Hotfix WaterRemover loop
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-22 17:16:54 +02:00 |
|
|
669a822bd6
|
Hotfix WaterRemover loop
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-22 17:14:45 +02:00 |
|
|
e4fe75693a
|
Finish enter handler
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-22 09:40:29 +02:00 |
|
|
aed86fc97b
|
Some refactoring
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-03 10:19:57 +02:00 |
|
|
c7a48f36f2
|
Simplified 1.12-Techhider
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-05-19 09:42:49 +02:00 |
|
|
8f7d3c74b7
|
Event hotfix
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-04-19 20:28:07 +02:00 |
|
|
043810bb14
|
Hotfix kit creation breakout bugs
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-04-11 12:26:36 +02:00 |
|
|
c3e1e93578
|
Resetting Kit creator with creative inventory clear, FightTeam nametag fix for 1.15
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-04-01 11:59:37 +02:00 |
|
|
0a82dc362f
|
Hotfix Sign update Exception
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-03-01 13:35:10 +01:00 |
|
|
684ed70219
|
Fixing Waterremover and deadlock
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-02-10 10:32:21 +01:00 |
|
|
67ad92bc90
|
Merge branch 'hide_sign_content' of SteamWar/FightSystem into master
|
2020-01-27 06:47:13 +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 |
|
|
0ebc7e5616
|
Fixing bugs occured with testing
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-23 19:57:21 +01:00 |
|
|
e053ecf286
|
Adding fight statistics
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-23 17:33:29 +01:00 |
|
|
c5c6e8c32b
|
Implement personal kits (untested)
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-23 08:31:32 +01:00 |
|
|
a4f8251680
|
Merge branch 'master' into hide_sign_content
# Conflicts:
# FightSystem_Main/src/de/steamwar/fightsystem/utils/TechHider.java
|
2020-01-20 17:51:58 +01:00 |
|
|
00967a2d3e
|
WIP Adding personal kits
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-19 17:25:11 +01:00 |
|
|
03e5cf62a2
|
Removing pair from fight system
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-19 07:38:54 +01:00 |
|
|
e6194a7a67
|
Adding only public schems to techhider
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-19 07:13:10 +01:00 |
|
|
7c57b6251c
|
Hide sign contents with packet filter
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-19 07:12:22 +01:00 |
|
|
049c51f2a9
|
Finishing setup split (untested)
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-11 15:45:01 +01:00 |
|
|
72096710b3
|
WIP Splitting Setup and refactoring
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-11 12:53:31 +01:00 |
|
|
e352862c5e
|
Fixing missing time information
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-05 14:31:59 +01:00 |
|
|
d45f0892a7
|
TechHider 1.14+ actualisation
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-31 17:04:00 +01:00 |
|
|
d555589615
|
Adding pumpkin tech ko
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-28 11:22:18 +01:00 |
|
|
00f22fe513
|
Adding 1.15 support
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-27 12:02:27 +01:00 |
|
|
692cd609bc
|
Adding 1.9 and 1.10 support, also refactoring Multiversion Support to current norm
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-27 11:05:12 +01:00 |
|
|
afab77418f
|
Fixing some issues regarding PointSystem
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-22 21:58:18 +01:00 |
|
|
dbae65bf82
|
Finishing SG.eu Points Wincondition implementation
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-22 15:20:50 +01:00 |
|
|
09acb366d3
|
WIP Wincondition points & Wincondition relative
|
2019-12-21 20:46:31 +01:00 |
|
|
2ed8959f5d
|
Merge branch '1_14-support'
|
2019-12-09 12:01:42 +01:00 |
|