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

1238 Commits

Dieser Branch
Dieser Branch
Alle Branches
Autor SHA1 Nachricht Datum
Lixfel
6a4c080b5d Merge branch 'master' into 1.15TechhiderFullChunk 2020-04-15 15:03:09 +02:00
Lixfel
9fdcb52157 Fix MWG positioning 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-15 14:58:26 +02:00
Lixfel
4f846a4831 Revert "Fix 1 Block Offset" 
This reverts commit a416f511

Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-15 14:57:54 +02:00
Lixfel
a416f5117e Fix 1 Block Offset 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-15 13:07:46 +02:00
Lixfel
67ce7aef48 Adding debug output 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-15 12:55:06 +02:00
Lixfel
087843f963 Revised Techhiderversion 14.04. 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-14 08:03:12 +02:00
Lixfel
26d8fe4451 Merge branch 'master' into 1.15TechhiderFullChunk 2020-04-13 11:55:08 +02:00
Lixfel
043810bb14 Hotfix kit creation breakout bugs 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-11 12:26:36 +02:00
Lixfel
ff6182fad4 Techhider 2 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-11 12:06:01 +02:00
Lixfel
d86376c22b (Untested) Implementation of a full chunk tech hider 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-08 15:39:26 +02:00
Lixfel
c7bc8163ed Merge branch 'kitreset' of SteamWar/FightSystem into master 2020-04-01 12:56:12 +02:00
Lixfel
01f9ffb6de Improve world freezing for MWG 1.15 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-01 12:30:36 +02:00
Lixfel
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
Lixfel
0a8e6c7923 Merge branch 'techhider2' of SteamWar/FightSystem into master 2020-03-28 15:05:19 +01:00
Lixfel
6ea8001cf5 Hotfix #119 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-03-28 08:53:16 +01:00
Lixfel
04f4edbf30 First tests (bugged for 1.15) 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-03-10 17:50:09 +01:00
Lixfel
0a82dc362f Hotfix Sign update Exception 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-03-01 13:35:10 +01:00
Lixfel
afb3b07b87 Hotfix async exception 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-27 19:10:34 +01:00
Lixfel
443ffb725d Hotfix NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-21 06:36:45 +01:00
Lixfel
9885225466 Merge branch 'autoStart' of SteamWar/FightSystem into master 2020-02-11 17:43:15 +01:00
Lixfel
81fd8329fc Merge branch '1.15' of SteamWar/FightSystem into master 2020-02-11 17:41:50 +01:00
Lixfel
b11fba3280 Hotfix NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-10 21:34:24 +01:00
Lixfel
dba3872a25 Autostarting fight with end of setup countdown (like in events) 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-10 14:31:37 +01:00
Lixfel
0971c7d58d Reworking mysterious error message 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-10 13:41:42 +01:00
Lixfel
48b33337ac Merge branch 'eventstartSpeedup' of SteamWar/FightSystem into master 2020-02-10 13:38:30 +01:00
Lixfel
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
Lixfel
684ed70219 Fixing Waterremover and deadlock 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-10 10:32:21 +01:00
Lixfel
abd3246d85 Revert last changes and duplicating code 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-09 11:50:43 +01:00
Lixfel
952e83dc29 Fix chunk instanciation 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-08 08:05:50 +01:00
Lixfel
01ec60c4e4 Hotfix event countdown naming 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-08 07:03:40 +01:00
Lixfel
8e4a67197f Merge branch 'preventArrowPickup' of SteamWar/FightSystem into master 2020-02-01 17:06:26 +01:00
Lixfel
4aee1f4c72 Preventing arrow pickups 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-01 14:28:46 +01:00
Lixfel
11251727bf Dirty hotfix of Points NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-27 17:36:00 +01:00
Lixfel
67ad92bc90 Merge branch 'hide_sign_content' of SteamWar/FightSystem into master 2020-01-27 06:47:13 +01:00
Lixfel
86c3855cd5 Merge branch 'personalKit' of SteamWar/FightSystem into master 2020-01-27 06:33:03 +01:00
Lixfel
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
Lixfel
668f2c948f Useless commit to test building 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-26 08:46:47 +01:00
Lixfel
8de54869a2 Merge branch 'statistics' of SteamWar/FightSystem into master 2020-01-26 08:39:37 +01:00
Lixfel
0ebc7e5616 Fixing bugs occured with testing 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-23 19:57:21 +01:00
Lixfel
0c21251720 Loading personalKits to player 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-23 17:40:48 +01:00
Lixfel
e053ecf286 Adding fight statistics 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-23 17:33:29 +01:00
Lixfel
c5c6e8c32b Implement personal kits (untested) 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-23 08:31:32 +01:00
Lixfel
2ac00294f9 Hotfix NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-21 17:49:04 +01:00
Lixfel
7fe4f09a08 Hotfix NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-20 18:48:40 +01:00
Lixfel
542547fd5b Hotfix NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-20 18:46:52 +01:00
Lixfel
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
Lixfel
5a9e281c95 Merge branch 'IgnorePublicOnly' of SteamWar/FightSystem into master 2020-01-20 17:47:42 +01:00
Lixfel
ad87077b15 Merge branch 'remove_pair' of SteamWar/FightSystem into master 2020-01-20 06:48:46 +01:00
Lixfel
3c4d5123da Ignore Public Only rule (for historic gamemodes) 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-19 17:32:29 +01:00
Lixfel
00967a2d3e WIP Adding personal kits 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-19 17:25:11 +01:00