SteamWar/FightSystem
Archiviert
13
1
Commit graph

126 Commits

Autor SHA1 Nachricht Datum
4d192ab35d Implementing Rank-System
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-05-22 10:09:34 +02:00
c1bb646579 Merge branch 'master' into ranks 2020-05-22 07:03:59 +02:00
aeda617a55 Make it possible to walk on the floor in prefight stage
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-05-21 08:42:39 +02:00
ab4852c717 Merge pull request 'Improving size of spectator space' (#148) from biggerSpectatorSpace into master
Reviewed-by: Jan9103 <maxjanssen67@gmail.com>
2020-05-19 08:45:59 +02:00
1608f895a8 Improving size of spectator space
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-05-16 16:59:35 +02:00
9f3e658636 First rank prototype
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-05-16 16:39:16 +02:00
13219dc352 Adding option for F3+N
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-05-11 13:25:45 +02:00
ac6b441815 Merge branch 'implementing-check-capability' 2020-05-10 19:18:30 +02:00
2c37646c79 Merge branch 'renameKitSelection' 2020-05-10 19:18:16 +02:00
100868b04d Hotfix percent stopping
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-05-03 15:42:53 +02:00
219d7acbe2 Preventing copying
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-05-01 11:05:31 +02:00
04b5fa34f8 Adapting permissions
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-04-30 16:10:20 +02:00
bf3baed537 Implementing check capability into TestArenas
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-04-30 16:09:24 +02:00
1367305e26 Force backport
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-04-28 09:54:10 +02:00
0f9480f69e Replace blocks without blockupdates
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-04-21 10:08:02 +02:00
8f7d3c74b7 Event hotfix
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-04-19 20:28:07 +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
26d8fe4451 Merge branch 'master' into 1.15TechhiderFullChunk 2020-04-13 11:55:08 +02:00
043810bb14 Hotfix kit creation breakout bugs
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-04-11 12:26:36 +02:00
ff6182fad4 Techhider 2
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-04-11 12:06:01 +02:00
c7bc8163ed Merge branch 'kitreset' of SteamWar/FightSystem into master 2020-04-01 12:56:12 +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
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
6ea8001cf5 Hotfix #119
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-03-28 08:53:16 +01:00
0a82dc362f Hotfix Sign update Exception
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-03-01 13:35:10 +01:00
afb3b07b87 Hotfix async exception
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-02-27 19:10:34 +01:00
443ffb725d Hotfix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-02-21 06:36:45 +01:00
9885225466 Merge branch 'autoStart' of SteamWar/FightSystem into master 2020-02-11 17:43:15 +01:00
81fd8329fc Merge branch '1.15' of SteamWar/FightSystem into master 2020-02-11 17:41:50 +01:00
b11fba3280 Hotfix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-02-10 21:34:24 +01:00
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
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
684ed70219 Fixing Waterremover and deadlock
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-02-10 10:32:21 +01:00
01ec60c4e4 Hotfix event countdown naming
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-02-08 07:03:40 +01:00
4aee1f4c72 Preventing arrow pickups
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-02-01 14:28:46 +01:00
11251727bf Dirty hotfix of Points NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-01-27 17:36:00 +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
668f2c948f Useless commit to test building
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-01-26 08:46:47 +01:00
0ebc7e5616 Fixing bugs occured with testing
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-01-23 19:57:21 +01:00
0c21251720 Loading personalKits to player
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-01-23 17:40:48 +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
2ac00294f9 Hotfix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-01-21 17:49:04 +01:00
7fe4f09a08 Hotfix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-01-20 18:48:40 +01:00
542547fd5b Hotfix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-01-20 18:46:52 +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
5a9e281c95 Merge branch 'IgnorePublicOnly' of SteamWar/FightSystem into master 2020-01-20 17:47:42 +01:00
ad87077b15 Merge branch 'remove_pair' of SteamWar/FightSystem into master 2020-01-20 06:48:46 +01:00