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

485 Commits

Autor SHA1 Nachricht Datum
Lixfel
ce9127cacf Merge branch 'master' into RedstoneWincondition
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
Details 
# Conflicts:
#	FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPercentSystem.java
#	FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionRelativePercent.java
 2021-09-27 17:25:00 +02:00
Lixfel
96bd358d29 New VersionDependent system 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-08-31 10:42:42 +02:00
Lixfel
fa66d32852 Fix forceload 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-08-28 09:55:35 +02:00
Lixfel
f8c96b196d Hotfix more robust schem handling 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-08-27 23:06:26 +02:00
Lixfel
0604d4b725 Hotfix Testarena NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-08-27 22:40:09 +02:00
Lixfel
c164c7ebfe Hotfix BlockPhysicsEvent sub 1.12 recording 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-08-27 22:34:20 +02:00
Lixfel
0357a7a307 Embedded Schem + Arena relative replay 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-08-24 08:16:57 +02:00
Lixfel
7d1c34d31e Fix bugs 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-08-23 07:30:50 +02:00
Lixfel
74565853bb Close Stream 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-08-21 21:14:37 +02:00
Lixfel
20f3b609cb DB-Replayintegration 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-08-21 21:09:57 +02:00
Lixfel
e52885b126 Remove TODO 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-08-21 10:35:41 +02:00
Lixfel
84577ccae9 Merge branch 'master' into spectate2.0 2021-08-21 10:25:53 +02:00
Lixfel
098d5638e3 Fixing missing header 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-08-21 10:25:26 +02:00
yoyosource
97a6e43098 Hotfix Techhider NPE 2021-07-26 21:10:01 +02:00
YoyoNow
775d5aaea8 Merge branch 'master' into RedstoneWincondition 2021-07-12 09:42:15 +02:00
yoyosource
bd5fb0d7c7 Fix HellsBells distribution 2021-06-26 17:21:42 +02:00
yoyosource
3ae18ab0b8 Fix HellsBells distribution 2021-06-26 17:16:29 +02:00
yoyosource
b7520abb1b Fix HellsBells distribution 2021-06-26 16:49:05 +02:00
yoyosource
c82b35f88b Fix HellsBells distribution 2021-06-26 16:24:51 +02:00
yoyosource
de278feab3 Fix HellsBells distribution 2021-06-26 15:52:49 +02:00
yoyosource
5d13591561 Fix HellsBells distribution 2021-06-26 15:42:46 +02:00
yoyosource
f7bf4dd0eb Fix HellsBells distribution 2021-06-26 15:30:36 +02:00
yoyosource
e5d7c5c702 Hotfix HellsBells 2021-06-25 18:45:09 +02:00
yoyosource
a31b69d838 Merge remote-tracking branch 'origin/master' 2021-06-25 18:42:48 +02:00
yoyosource
96076eb893 Force rebuild 2021-06-25 18:42:40 +02:00
Lixfel
cae51875fc Merge pull request 'HellsBells' (#275) from Hells_bells into master 
Reviewed-on: #275
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-06-25 07:17:43 +02:00
Zeanon
ad0c811082 Countdown is now private static 2021-06-21 19:55:37 +02:00
Zeanon
6db428f134 Fixed stuff from PR 2021-06-16 15:39:37 +02:00
YoyoNow
9abd4c9f84 Merge branch 'master' into RedstoneWincondition 2021-06-06 14:57:54 +02:00
Chaoscaot
03f815ecfa Fix ArrowStopper.java 2021-06-05 13:33:34 +02:00
Lixfel
58e8bf9fac Improved error handling 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-31 15:10:32 +02:00
Lixfel
6e784810a1 First full replay implementation 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-31 14:53:25 +02:00
Lixfel
573c518e33 First errorless full spectate solution 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-24 20:15:03 +02:00
Lixfel
aa3229a897 Merge branch 'master' into spectate2.0 
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/listener/FightScoreboard.java
 2021-05-24 17:41:07 +02:00
Lixfel
48426c9a86 WIP 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-24 17:40:24 +02:00
Lixfel
394ccc251e Hotfix hotbargui 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-24 15:24:07 +02:00
Lixfel
26ccf98d44 WIP 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-24 15:23:35 +02:00
Lixfel
ead9568d6a Merge pull request 'Make it harder to accidentialy move/equip items in the HotbarGUI' (#279) from lessHotbarBugs into master 
Reviewed-on: #279
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-05-24 09:59:26 +02:00
Lixfel
9511237b3a Merge pull request 'Fix spectators below (M)WGs' (#278) from fixBelowWGs into master 
Reviewed-on: #278
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-05-24 09:57:47 +02:00
Lixfel
7541668739 Merge pull request 'Fix ranked player does not join arena' (#277) from fixRanked into master 
Reviewed-on: #277
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-05-24 09:57:10 +02:00
Lixfel
a017df7caa Merge pull request 'Fix prepare recoloring' (#276) from fixPrepare into master 
Reviewed-on: #276
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-05-24 09:56:41 +02:00
Lixfel
3b2857d60d Set to preschemstate 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-24 09:47:32 +02:00
Lixfel
e408aac608 Make it harder to accidentialy move/equip items in the HotbarGUI 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-24 09:31:58 +02:00
Lixfel
14986aedd8 Dont db-log players moving into team area anymore 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-24 09:06:00 +02:00
Lixfel
9cef84f7b3 Fix spectators below (M)WGs 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-24 08:54:25 +02:00
Lixfel
27d853af19 Fix ranked player does not join arena 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-24 08:51:08 +02:00
Lixfel
5945f3c148 Fix prepare recoloring 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-24 08:36:25 +02:00
Lixfel
bffa12619c Fix points 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-24 08:30:02 +02:00
Lixfel
504f23f1d9 Fix the Bugfest! And the wrong behaviour. 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-05-24 08:24:33 +02:00
yoyosource
21c6baf40f Update PercentWincondition 
Update WinconditionPoints
 2021-05-23 19:23:55 +02:00