|
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 |
|
|
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 |
|
|
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 |
|
|
3c4d5123da
|
Ignore Public Only rule (for historic gamemodes)
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-19 17:32:29 +01:00 |
|
|
03e5cf62a2
|
Removing pair from fight system
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-19 07:38:54 +01:00 |
|
|
8353139d2c
|
Fixing exceptions occuring in test and event arena
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-19 07:23:02 +01:00 |
|
|
1dd3b79ee9
|
Allowing only public schematics if one leader has no private
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-18 08:31:13 +01:00 |
|
Yaruma3341
|
23a8f9ba84
|
code cleanup; semi version independent
|
2020-01-15 18:44:34 +01:00 |
|
Yaruma3341
|
c463823c05
|
implemented version independence
|
2020-01-14 22:16:12 +01:00 |
|
Yaruma3341
|
eabd9ab50b
|
added spec hider
|
2020-01-13 21:37:36 +01:00 |
|
|
36925fad13
|
Hotfix choose schematic in testmode
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-12 17:15:01 +01:00 |
|
|
5e85488d80
|
Adding PreSchemPaste countdown
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-11 15:56:31 +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 |
|
|
97c9022d75
|
Fixing freeze world
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-10 20:30:31 +01:00 |
|
|
d8f9c7a00c
|
Freeze World during pasting
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-07 19:27:35 +01:00 |
|
|
0797c44984
|
Fixing flushQueue/flushSession discrepance
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-31 16:47:34 +01:00 |
|
|
f9485da0e3
|
Adding new HeartRatioTimeoutWincondition
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-28 11:20:01 +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 |
|