|
|
84577ccae9
|
Merge branch 'master' into spectate2.0
|
2021-08-21 10:25:53 +02:00 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
ad0c811082
|
Countdown is now private static
|
2021-06-21 19:55:37 +02:00 |
|
|
|
6db428f134
|
Fixed stuff from PR
|
2021-06-16 15:39:37 +02:00 |
|
|
|
7b2d61eac6
|
Merge pull request 'Fix ArrowStopper' (#281) from arrow_fix into master
Reviewed-on: #281
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2021-06-05 13:34:44 +02:00 |
|
Chaoscaot
|
03f815ecfa
|
Fix ArrowStopper.java
|
2021-06-05 13:33:34 +02:00 |
|
|
|
58e8bf9fac
|
Improved error handling
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-05-31 15:10:32 +02:00 |
|
|
|
6e784810a1
|
First full replay implementation
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-05-31 14:53:25 +02:00 |
|
|
|
573c518e33
|
First errorless full spectate solution
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-05-24 20:15:03 +02:00 |
|
|
|
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 |
|
|
|
48426c9a86
|
WIP
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-05-24 17:40:24 +02:00 |
|
|
|
394ccc251e
|
Hotfix hotbargui
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-05-24 15:24:07 +02:00 |
|
|
|
26ccf98d44
|
WIP
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-05-24 15:23:35 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
3b2857d60d
|
Set to preschemstate
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-05-24 09:47:32 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
fa8f6c4265
|
Remove debug output
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-05-24 08:57:34 +02:00 |
|
|
|
9cef84f7b3
|
Fix spectators below (M)WGs
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-05-24 08:54:25 +02:00 |
|
|
|
27d853af19
|
Fix ranked player does not join arena
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-05-24 08:51:08 +02:00 |
|
|
|
5945f3c148
|
Fix prepare recoloring
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-05-24 08:36:25 +02:00 |
|
yoyosource
|
886fbbe535
|
Update HellsBells
|
2021-05-23 17:07:43 +02:00 |
|
|
|
e181c42b12
|
no State.NONE
|
2021-05-19 10:19:31 +02:00 |
|
yoyosource
|
9d21214204
|
Fix HellsBells direction code
|
2021-05-18 20:03:44 +02:00 |
|
|
|
25190098d6
|
code cleanup
|
2021-05-18 19:58:31 +02:00 |
|
|
|
2c981f29ce
|
code cleanup
|
2021-05-14 00:30:49 +02:00 |
|
|
|
cabb09a674
|
State switches are now dependent on amount od bombs dropped, rather than time
|
2021-05-14 00:18:59 +02:00 |
|
yoyosource
|
0ac33d0dd4
|
Fix HellsBells
|
2021-05-14 00:01:51 +02:00 |
|
yoyosource
|
bdbb4c510b
|
Remove code duplication
|
2021-05-13 23:47:10 +02:00 |
|
|
|
5ca3217579
|
Merge remote-tracking branch 'origin/Hells_bells' into Hells_bells
|
2021-05-13 23:46:15 +02:00 |
|
|
|
7b0c106128
|
rework for start-message
|
2021-05-13 23:46:00 +02:00 |
|
yoyosource
|
cfbe4eaf09
|
Merge branch 'master' into Hells_bells
|
2021-05-13 23:41:20 +02:00 |
|
yoyosource
|
a7693ee2f3
|
Remove code duplication
|
2021-05-13 23:37:01 +02:00 |
|
|
|
bd224350a3
|
fixed poms
|
2021-05-13 23:28:01 +02:00 |
|
|
|
bb6dbff20b
|
fixed poms
|
2021-05-13 23:18:44 +02:00 |
|
