|
be90e4dcdd
|
Fix player join 1.8 to 1.10
|
2023-01-15 16:02:27 +01:00 |
|
|
2baafac189
|
Merge pull request 'CoreEntity' (#220) from coreEntity into master
SteamWarCI Build successful
Reviewed-on: #220
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2023-01-15 11:56:30 +01:00 |
|
|
3c4009977d
|
Merge branch 'master' into coreEntity
SteamWarCI Build successful
|
2023-01-15 11:54:28 +01:00 |
|
|
2cd01038b2
|
Adjust CI config to new CI
SteamWarCI Build successful
|
2023-01-15 11:51:43 +01:00 |
|
|
c340f11666
|
Move tick call responsibility to EntityServer owner
|
2023-01-15 11:07:21 +01:00 |
|
|
81a77fd1de
|
Add FallingBlock
SteamWarCI Build successful
|
2023-01-10 19:08:37 +01:00 |
|
|
8886cc5562
|
Swimming, Small ArmorStand, Initial MapType
SteamWarCI Build successful
|
2023-01-10 18:15:30 +01:00 |
|
|
000f2189f8
|
Deduplicate Reflections
SteamWarCI Build successful
|
2023-01-10 11:35:56 +01:00 |
|
|
fb9c1dc6d0
|
First complete CoreEntity (untested) implementation
SteamWarCI Build successful
|
2023-01-10 11:24:44 +01:00 |
|
|
cea2ffdac6
|
WIP CoreREntity
SteamWarCI Build successful
|
2023-01-09 17:35:00 +01:00 |
|
|
cc65253364
|
Merge branch 'master' into coreEntity
|
2023-01-09 10:59:30 +01:00 |
|
|
36fe101e56
|
Update CommonDB
SteamWarCI Build successful
|
2022-12-14 21:56:23 +01:00 |
|
|
34d841324c
|
WIP REntity
SteamWarCI Build successful
|
2022-12-14 21:56:02 +01:00 |
|
|
e3d9ce513c
|
Merge pull request 'Fix Insecure PopUp (zOnlyKroks made it)' (#219) from FixInsecurePopup into master
SteamWarCI Build successful
Reviewed-on: #219
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2022-12-08 21:19:12 +01:00 |
|
yoyosource
|
53ab403952
|
Fix Insecure PopUp (zOnlyKroks made it)
SteamWarCI Build successful
|
2022-12-08 17:38:05 +01:00 |
|
yoyosource
|
3a16952897
|
Update CommonCore
SteamWarCI Build successful
|
2022-12-07 22:35:06 +01:00 |
|
|
9f6bcd4c14
|
Update CommonCore
SteamWarCI Build successful
|
2022-11-30 14:23:04 +01:00 |
|
|
d890451602
|
WIP Merging of FightSystem and LobbySystem
SteamWarCI Build successful
|
2022-11-29 16:57:25 +01:00 |
|
|
6ce65f026b
|
Fix writing extended schematics
SteamWarCI Build successful
|
2022-11-26 08:53:56 +01:00 |
|
|
dd4473577d
|
Update CommonCore: Fix NodeDownload
SteamWarCI Build successful
|
2022-11-23 21:03:11 +01:00 |
|
|
5956ac5e3a
|
Update CommonCore: Fix NodeDownload
SteamWarCI Build successful
|
2022-11-23 20:33:22 +01:00 |
|
|
79900abe11
|
Update CommonCore (fix userid column)
SteamWarCI Build successful
|
2022-11-22 19:38:24 +01:00 |
|
|
fd9a87c357
|
Merge branch 'commonDB'
SteamWarCI Build successful
|
2022-11-22 16:01:17 +01:00 |
|
|
bcd856dc82
|
Update CommonCore (Fix SchemElo NPE)
SteamWarCI Build successful
|
2022-11-22 15:58:16 +01:00 |
|
|
9f2a3b0359
|
Update CommonCore (Fix SchemElo NPE)
SteamWarCI Build successful
|
2022-11-22 14:52:25 +01:00 |
|
|
64ab415f90
|
Merge pull request 'commonDB' (#211) from commonDB into master
SteamWarCI Build successful
Reviewed-on: #211
|
2022-11-22 11:36:13 +01:00 |
|
|
e8d4dd6319
|
Update to CommonCore master
SteamWarCI Build successful
|
2022-11-22 11:34:57 +01:00 |
|
|
c8992567e3
|
Merge branch 'master' into commonDB
# Conflicts:
# SpigotCore_Main/src/de/steamwar/sql/Replay.java
|
2022-11-22 11:30:48 +01:00 |
|
|
37c01fece7
|
Current state
SteamWarCI Build successful
|
2022-11-15 18:40:48 +01:00 |
|
|
18525814d8
|
Current state
|
2022-11-02 22:38:21 +01:00 |
|
|
b147614f49
|
Fix replay
SteamWarCI Build successful
|
2022-10-29 13:20:57 +02:00 |
|
|
5c05a4a7db
|
Fixes
SteamWarCI Build successful
|
2022-10-29 13:19:36 +02:00 |
|
|
74823ba86f
|
Fix merge issues
|
2022-10-29 12:42:41 +02:00 |
|
|
4548f80843
|
Merge branch 'master' into commonDB
# Conflicts:
# SpigotCore_Main/src/de/steamwar/core/Core.java
# SpigotCore_Main/src/de/steamwar/sql/SWException.java
# SpigotCore_Main/src/de/steamwar/sql/SchematicData.java
# SpigotCore_Main/src/de/steamwar/sql/SchematicNode.java
|
2022-10-29 12:37:36 +02:00 |
|
|
d50398ca25
|
Merge pull request 'Add interfaces added by commondb for seamless transition' (#217) from commonDBBridge into master
SteamWarCI Build successful
Reviewed-on: #217
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2022-10-29 12:21:50 +02:00 |
|
|
10dfc034e3
|
Merge pull request 'Add Custom Callbacks for SWListInv' (#218) from hotfix_custom_callbacks into master
SteamWarCI Build successful
Reviewed-on: #218
Reviewed-by: YoyoNow <jwsteam@nidido.de>
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2022-10-29 12:21:42 +02:00 |
|
Chaoscaot
|
b7e057e775
|
Fix
SteamWarCI Build successful
|
2022-10-28 21:24:38 +02:00 |
|
Chaoscaot
|
7726948a06
|
Add Custom Callbacks for SWListInv
SteamWarCI Build successful
|
2022-10-28 21:16:21 +02:00 |
|
|
45d7f27153
|
Add interfaces added by commondb for seamless transition
SteamWarCI Build successful
|
2022-10-28 11:29:24 +02:00 |
|
|
02d47a3157
|
Merge pull request 'Add SchematicSelector AnvilInv returns' (#215) from schem_selector_reusable into master
SteamWarCI Build successful
Reviewed-on: #215
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2022-10-28 10:08:38 +02:00 |
|
|
82291844c3
|
Merge pull request 'Remove Unused and obsolet SWActionListInv.java' (#216) from remove_legacy_code into master
SteamWarCI Build successful
Reviewed-on: #216
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2022-10-28 10:07:11 +02:00 |
|
Chaoscaot
|
2f668dbf55
|
Remove Unused and obsolet SWActionListInv.java
SteamWarCI Build successful
|
2022-10-27 13:05:04 +02:00 |
|
Chaoscaot
|
7ce6668de4
|
Add AnvilInv LeftClick and SchematicSelector AnvilInv returns
SteamWarCI Build successful
|
2022-10-27 12:58:16 +02:00 |
|
|
3e5347dfef
|
Merge pull request 'Fix Rank 2 in Rank 1 Fight' (#214) from fix_rank_dismatch into master
SteamWarCI Build successful
Reviewed-on: #214
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2022-10-20 21:39:14 +02:00 |
|
Chaoscaot
|
26973bb840
|
Fix Rank 2 in Rank 1 Fight
SteamWarCI Build successful
|
2022-10-20 20:11:12 +02:00 |
|
|
c554d79fec
|
Fix crash logging
SteamWarCI Build successful
|
2022-10-09 14:44:35 +02:00 |
|
|
297791ec60
|
Fix crash logging
SteamWarCI Build successful
|
2022-10-08 13:07:53 +02:00 |
|
|
368195bed2
|
Fix crashdetector on unclean shutdown
SteamWarCI Build successful
|
2022-10-07 20:21:41 +02:00 |
|
|
97ce222ccf
|
Merge branch 'master' into commonDB
SteamWarCI Build successful
# Conflicts:
# CommonCore
|
2022-09-26 10:05:28 +02:00 |
|
yoyosource
|
33268c18f6
|
Update CommonCore
SteamWarCI Build successful
|
2022-09-25 16:54:51 +02:00 |
|