|
0d33e8c508
|
Merge branch 'multi-stage-entern'
# Conflicts:
# FightSystem_Main/src/de/steamwar/fightsystem/utils/WaterRemover.java
|
2020-07-11 07:22:36 +02:00 |
|
|
4de9f5a8e8
|
Merge pull request 'Implementation of ELO-Based 1 vs 1 ranked games' (#172) from firstRanked into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2020-07-11 07:17:45 +02:00 |
|
|
7e66c9895c
|
Only one spectate state init
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-07 19:36:56 +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 |
|
|
8ebf509b4e
|
Implementing ranked computation and setting
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-07 19:07:11 +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 |
|
|
727129fe8e
|
Faster Waterremover
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-06 17:39:45 +02:00 |
|
|
2aabded41e
|
Faster Waterremover
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-05 16:29:21 +02:00 |
|
|
1261459b79
|
Fix fightstatistics
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-04 11:04:38 +02:00 |
|
|
228cb9e768
|
Fix non TNT-Kits only no tnt
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-04 09:33:31 +02:00 |
|
|
a9907b9ad1
|
Disable TNT explosions in testarenas in Pre running state
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-03 21:10:07 +02:00 |
|
|
d04d8f65b3
|
Fix GM3 in your head issue
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-03 20:41:08 +02:00 |
|
|
a9e166e7f4
|
Merge branch 'full-chunk-techhider'
|
2020-06-22 17:44:07 +02:00 |
|
|
1a58849358
|
Merge branch 'staggered-lobby-join'
|
2020-06-22 17:43:57 +02:00 |
|
|
87f13942b1
|
Hotfix WaterRemover loop
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-22 17:16:54 +02:00 |
|
|
669a822bd6
|
Hotfix WaterRemover loop
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-22 17:14:45 +02:00 |
|
|
e4fe75693a
|
Finish enter handler
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-22 09:40:29 +02:00 |
|
|
3b46d45bc0
|
Merge branch 'master' into multi-stage-entern
|
2020-06-22 08:58:58 +02:00 |
|
|
08c19e6a85
|
Staggered kick to prevent a lobby crash
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-22 08:58:37 +02:00 |
|
|
e560c299ed
|
Working full chunk techhider workaround
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-21 19:58:27 +02:00 |
|
|
51fe8cfbe5
|
Hotfix flying in arena issue
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-04 16:56:14 +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 |
|
|
77133bf72a
|
Revert "Sync WaterTechKO-Detector?"
This reverts commit ff965cca
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-03 11:22:53 +02:00 |
|
|
ff965cca75
|
Sync WaterTechKO-Detector?
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-03 11:21:50 +02:00 |
|
|
2ee2d74432
|
Hotfix watertechko + simplify and speedup
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-03 10:38:14 +02:00 |
|
|
aed86fc97b
|
Some refactoring
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-03 10:19:57 +02:00 |
|
|
10c461f317
|
Merge pull request 'Add GamemodeCommand' (#162) from Gamemode into master
Reviewed-by: Jan9103 <jan9103@steamwar.de>
|
2020-06-03 08:45:36 +02:00 |
|
jojo
|
4e8152d282
|
Add GamemodeCommand
|
2020-05-31 18:56:50 +02:00 |
|
|
c27f8bbd82
|
Merge pull request 'Rank-System für die neuen WS und WG' (#155) from ranks into master
Reviewed-by: Jan9103 <jan9103@steamwar.de>
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2020-05-31 17:15:34 +02:00 |
|
|
b5dcedb645
|
Hotfix inventory size failure
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-05-26 14:17:52 +02:00 |
|
|
858e1b52ca
|
Hotfix backport.
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-05-24 18:15:10 +02:00 |
|
|
d3b1dcf8f3
|
Merge pull request 'facingEnemy' (#160) from facingEnemy into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2020-05-23 16:08:25 +02:00 |
|
jojo
|
99fdf1abdb
|
Add Pitch/Yaw Vector Fix
|
2020-05-23 13:07:28 +02:00 |
|
jojo
|
c1d62e5e37
|
Add Pitch/Yaw Vector Fix
|
2020-05-23 12:50:55 +02:00 |
|
jojo
|
c54ddbb60a
|
Add Pitch/Yaw Vector Fix
|
2020-05-23 12:46:36 +02:00 |
|
jojo
|
d1820d9e5b
|
Add Pitch/Yaw Vector Fix
|
2020-05-23 12:42:11 +02:00 |
|
jojo
|
a20503b543
|
Add Pitch/Yaw Math.toDegrees()
|
2020-05-23 12:27:08 +02:00 |
|
jojo
|
be0f3728b5
|
Add Pitch/Yaw calculation with Vector
|
2020-05-22 23:44:58 +02:00 |
|
jojo
|
b800bdad29
|
Add Pitch/Yaw calculation with Vector
|
2020-05-22 23:16:26 +02:00 |
|
jojo
|
582aeea840
|
Fix yaw
|
2020-05-22 17:59:57 +02:00 |
|
jojo
|
54c4bb4e63
|
Add FacingEnemy Blue Red switch
|
2020-05-22 17:52:32 +02:00 |
|
jojo
|
7e4825472f
|
Remove FacingEnemy Math.PI
Add FacingEnemy 180
|
2020-05-22 17:46:03 +02:00 |
|
jojo
|
28823ce382
|
Remove FacingEnemy Math.toDegrees()
|
2020-05-22 17:41:56 +02:00 |
|
jojo
|
3ed914731f
|
Add FacingEnemy Math.toDegrees()
|
2020-05-22 17:40:15 +02:00 |
|
jojo
|
ee8e8113cb
|
Add FacingEnemy Rotation
|
2020-05-22 17:16:19 +02:00 |
|
|
7dc7fa1f41
|
Removing all crafting possibilitys
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-05-22 17:02:25 +02:00 |
|
|
0868a4eca9
|
Merge pull request 'Add BlockBreakEvent' (#156) from blockPickup into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2020-05-22 16:44:40 +02:00 |
|
jojo
|
f8a2585621
|
Add BlockBreakEvent Add item not in Inventory
|
2020-05-22 16:40:27 +02:00 |
|