|
|
647f9d3bb5
|
Merge branch 'kitPreview' of SteamWar/FightSystem into master
|
2020-01-11 12:50:40 +01:00 |
|
|
|
5734ada17b
|
Adding a kit preview during kit selection
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-10 22:38:14 +01:00 |
|
|
|
37955438ba
|
Merge branch 'ReplaceCarpetWithTeamcolor' of SteamWar/FightSystem into master
|
2020-01-10 21:35:44 +01:00 |
|
|
|
860a91ba1f
|
Iml Dateien löschen (2)
|
2020-01-10 21:32:38 +01:00 |
|
|
|
843ba2ecae
|
iml löschen (1)
|
2020-01-10 21:32:15 +01:00 |
|
|
|
97c9022d75
|
Fixing freeze world
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-10 20:30:31 +01:00 |
|
|
|
9b2efa029b
|
Merge branch 'techhiderConfigReworkFor1.14/1.15' of SteamWar/FightSystem into master
|
2020-01-09 17:31:49 +01:00 |
|
BuildTools
|
c03d4709fc
|
Pinker Teppich im Fightsystem zu Teamfarbe replacen hinzugefügt (1.8 + 1.14)
|
2020-01-08 20:05:54 +01:00 |
|
|
|
c5e35e9580
|
Merge branch 'freezeWorld' of SteamWar/FightSystem into master
|
2020-01-07 20:30:01 +01:00 |
|
|
|
d8f9c7a00c
|
Freeze World during pasting
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-07 19:27:35 +01:00 |
|
BuildTools
|
88f9f8608a
|
Pinker Teppich im Fightsystem zu Teamfarbe replacen hinzugefügt (1.8 + 1.14)
|
2020-01-06 21:14:51 +01:00 |
|
|
|
45abf6a5c0
|
Reworking Techhider HiddenBlock configuration for usage in 1.14 and 1.15
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-06 20:37:41 +01:00 |
|
|
|
e352862c5e
|
Fixing missing time information
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-05 14:31:59 +01:00 |
|
|
|
318a88bd51
|
Fixing NBTTagList #2
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-01 20:46:58 +01:00 |
|
|
|
0de2dd0d41
|
Fixing NBTTagList
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-01 20:46:58 +01:00 |
|
|
|
ebefab135a
|
Merge branch 'techhider1.14+compatibility' of SteamWar/FightSystem into master
|
2020-01-01 19:51:16 +01:00 |
|
|
|
8a0141c709
|
Fixing NBTTagList
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-01 19:39:41 +01:00 |
|
|
|
995ef3472c
|
Merge branch 'techhider1.14+compatibility' of SteamWar/FightSystem into master
|
2020-01-01 18:28:42 +01:00 |
|
|
|
d45f0892a7
|
TechHider 1.14+ actualisation
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-31 17:04:00 +01:00 |
|
|
|
0797c44984
|
Fixing flushQueue/flushSession discrepance
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-31 16:47:34 +01:00 |
|
|
|
93da83cec7
|
Fixing Colorsetting for 1.14+
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-31 16:39:43 +01:00 |
|
|
|
9a248969d4
|
Merge branch 'winconditionPumpkinTechKO' of SteamWar/FightSystem into master
|
2019-12-28 11:23:52 +01:00 |
|
|
|
f40dad05e3
|
Merge remote-tracking branch 'origin/winconditionPumpkinTechKO' into winconditionPumpkinTechKO
|
2019-12-28 11:22:39 +01:00 |
|
|
|
d555589615
|
Adding pumpkin tech ko
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-28 11:22:18 +01:00 |
|
|
|
4e328c8cc1
|
Merge branch 'winconditionHeartRatioTimeout' of SteamWar/FightSystem into master
|
2019-12-28 11:21:28 +01:00 |
|
|
|
30d54d7d88
|
Merge remote-tracking branch 'origin/winconditionHeartRatioTimeout' into winconditionHeartRatioTimeout
# Conflicts:
# FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java
|
2019-12-28 11:21:02 +01:00 |
|
|
|
f9485da0e3
|
Adding new HeartRatioTimeoutWincondition
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-28 11:20:01 +01:00 |
|
|
|
b8d1893f0f
|
Merge branch 'newVersions' of SteamWar/FightSystem into master
|
2019-12-28 11:09:42 +01:00 |
|
|
|
5bfee9f3d9
|
Adding pumpkin tech ko
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-27 12:32:15 +01:00 |
|
|
|
00f22fe513
|
Adding 1.15 support
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-27 12:02:27 +01:00 |
|
|
|
27808e35e0
|
Refactoring 1.14 support to vanilla WorldEdit compatibility
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-27 11:06:09 +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 |
|
|
|
6582b9a5c4
|
Adding SWSound for better Sound handling
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-27 10:09:03 +01:00 |
|
|
|
80005a73b6
|
Adding new HeartRatioTimeoutWincondition
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-24 14:38:42 +01:00 |
|
|
|
9901c4edb8
|
Merge branch 'RelativePercentFix' of SteamWar/FightSystem into master
|
2019-12-24 12:52:01 +01:00 |
|
|
|
156df367f2
|
Fixing wincondition
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-23 22:46:36 +01:00 |
|
|
|
afab77418f
|
Fixing some issues regarding PointSystem
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-22 21:58:18 +01:00 |
|
|
|
ad2e8d9e92
|
Merge branch 'newWinconditions' of SteamWar/FightSystem into master
|
2019-12-22 18:18:49 +01:00 |
|
|
|
66d527cdca
|
Merge branch 'dev' of SteamWar/FightSystem into master
|
2019-12-22 17:17:16 +01:00 |
|
|
|
9a4a36aeb9
|
Refactoring error (useless commit for starting dev server)
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-22 16:56:18 +01:00 |
|
|
|
9b1622c1e4
|
Adding missing if condition to effects
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-22 16:52:06 +01:00 |
|
|
|
be6693e85a
|
Refactoring of KitSystem and adding of potion effects
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-22 16:38:51 +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 |
|
BuildTools
|
988a424868
|
#68 Spawn Bug fixed;
|
2019-12-13 15:51:52 +01:00 |
|
|
|
c534a6b27b
|
Fixing 1.14 sound
|
2019-12-11 18:37:41 +01:00 |
|
|
|
b83de5706b
|
fixing lowercase blockstate naming in 1.14+
|
2019-12-11 18:10:49 +01:00 |
|
|
|
3bfd13a36e
|
Renaming finalName for continouus deployment
|
2019-12-10 18:11:34 +01:00 |
|
|
|
5f3663de0e
|
Hotfix Wateralignment
|
2019-12-10 18:10:44 +01:00 |
|
|
|
dfa0e846e9
|
Merge branch '1_14-support'
# Conflicts:
# FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java
|
2019-12-09 20:52:18 +01:00 |
|
