|
6aefb79e78
|
Add Login
|
2023-12-23 17:04:10 +01:00 |
|
|
bf2af5b45b
|
Merge branch 'passwords' into multitool/public
# Conflicts:
# src/de/steamwar/sql/SteamwarUser.java
|
2023-12-17 17:23:30 +01:00 |
|
Chaoscaot
|
6ac6643162
|
src/de/steamwar/sql/SteamwarUser.java aktualisiert
SteamWarCI Build successful
|
2023-12-17 17:22:47 +01:00 |
|
|
3dbbd70a80
|
Merge branch 'passwords' into multitool/public
|
2023-12-17 16:39:08 +01:00 |
|
|
ea52162ffe
|
Updates
SteamWarCI Build successful
|
2023-12-17 16:34:08 +01:00 |
|
|
1755d5a99a
|
Merge branch 'master' into multitool/public
|
2023-12-11 18:37:17 +01:00 |
|
|
0723c87814
|
Add Token
SteamWarCI Build successful
|
2023-11-30 18:11:39 +01:00 |
|
|
ac7c3acbb8
|
Fix QuickGear
SteamWarCI Build successful
|
2023-11-29 16:27:20 +01:00 |
|
|
61985fb806
|
Updates
|
2023-11-12 22:44:30 +01:00 |
|
|
fa04945595
|
Updates
|
2023-11-03 20:30:29 +01:00 |
|
|
e4b3539d28
|
Merge pull request 'Remove UserGroup' (#58) from removeUserGroups into master
SteamWarCI Build successful
Reviewed-on: #58
Reviewed-by: Chaoscaot <chaoscaot@zohomail.eu>
|
2023-10-10 18:00:58 +02:00 |
|
Chaoscaot
|
9b22e77f9b
|
Open to Public
SteamWarCI Build successful
|
2023-09-06 23:07:32 +02:00 |
|
|
e0c1d1c2e2
|
Change Colors
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-09-01 11:25:00 +02:00 |
|
|
eaad69240a
|
Remove UserGroup
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-08-30 12:27:26 +02:00 |
|
Chaoscaot
|
66fc131803
|
Update to UserPerms
SteamWarCI Build successful
|
2023-08-30 00:56:27 +02:00 |
|
Chaoscaot
|
661b75db00
|
Merge branch 'master' into multitool/main
SteamWarCI Build successful
|
2023-08-30 00:24:51 +02:00 |
|
|
72ebfec1a5
|
Fix UserPerm
SteamWarCI Build successful
|
2023-08-29 21:40:52 +02:00 |
|
Chaoscaot
|
c0bad2eb42
|
Merge remote-tracking branch 'origin/user-perm' into multitool/user-perm
# Conflicts:
# src/de/steamwar/sql/SteamwarUser.java
|
2023-08-29 18:08:24 +02:00 |
|
|
4eadcb4b09
|
Update ColorChat Perm
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-08-29 18:05:26 +02:00 |
|
Chaoscaot
|
e604991cfd
|
Merge branch 'master' into multitool
|
2023-08-29 17:58:50 +02:00 |
|
|
fc1e7c60d7
|
Updated UserPerms
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-08-29 17:46:46 +02:00 |
|
|
96d55a7ac6
|
Changed UserPerms
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-08-29 16:01:13 +02:00 |
|
|
469a504e48
|
UserPerm model
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-08-29 15:03:39 +02:00 |
|
|
0fef6c0f8f
|
Fix script insert
SteamWarCI Build successful
|
2023-07-17 16:52:51 +02:00 |
|
Chaoscaot
|
5d5adb9828
|
Fix SQL
SteamWarCI Build successful
|
2023-07-17 16:47:42 +02:00 |
|
|
6c7c073320
|
Merge pull request 'Fix infinite recursion' (#56) from improve_sql into master
SteamWarCI Build successful
Reviewed-on: #56
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2023-06-13 23:15:20 +02:00 |
|
Chaoscaot
|
7f1cf130a8
|
Fix infinite recursion
SteamWarCI Build successful
|
2023-06-13 22:59:56 +02:00 |
|
|
e903c139a7
|
Merge pull request 'Add Script SQL-Type' (#54) from script_sql into master
SteamWarCI Build successful
Reviewed-on: #54
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2023-06-13 22:07:53 +02:00 |
|
Chaoscaot
|
18e3f9baae
|
Fix Query
SteamWarCI Build successful
|
2023-06-10 11:04:45 +02:00 |
|
Chaoscaot
|
9eef3c9353
|
Improve Fightsystem SchematicSelector Performance
SteamWarCI Build successful
|
2023-06-08 11:11:05 +02:00 |
|
|
d6ef17cbe7
|
Fix Script class
SteamWarCI Build successful
|
2023-06-05 16:01:34 +02:00 |
|
Chaoscaot
|
02581ec36b
|
Remove Punishments and Update
SteamWarCI Build successful
|
2023-06-04 09:22:02 +02:00 |
|
Chaoscaot
|
f07ad1cbf5
|
Add List
SteamWarCI Build successful
|
2023-05-18 14:23:44 +02:00 |
|
Chaoscaot
|
eedc949672
|
Add List
SteamWarCI Build successful
|
2023-05-18 14:23:23 +02:00 |
|
Chaoscaot
|
b4ce9493d1
|
Add Script SQL-Type
SteamWarCI Build successful
|
2023-05-18 08:43:33 +02:00 |
|
yoyosource
|
a2bb52ab26
|
Fix another thing
SteamWarCI Build successful
|
2023-05-13 16:00:54 +02:00 |
|
yoyosource
|
5ca6d9f4a4
|
Update to use Collections.emptyMap()
SteamWarCI Build successful
|
2023-05-12 23:40:05 +02:00 |
|
yoyosource
|
92f32e410b
|
Update some more stuff
SteamWarCI Build successful
|
2023-05-12 23:36:20 +02:00 |
|
yoyosource
|
a8270a386c
|
Add UserElo.ELO_DEFAULT
SteamWarCI Build successful
|
2023-05-12 17:25:06 +02:00 |
|
yoyosource
|
727a27a9fb
|
Update UserElo for new ranked system
SteamWarCI Build successful
|
2023-05-11 16:05:21 +02:00 |
|
|
9df7ed39a4
|
Merge branch 'master' into DurationFieldInFightEndsPacket
SteamWarCI Build successful
|
2023-05-10 17:07:12 +02:00 |
|
yoyosource
|
0b274f288f
|
Add duration field to FightEndsPacket
SteamWarCI Build successful
|
2023-05-10 17:06:28 +02:00 |
|
|
a26e69e6f2
|
Fix SchemDownload
SteamWarCI Build successful
|
2023-05-08 16:31:11 +02:00 |
|
|
97c38b64b3
|
Fix loading order
SteamWarCI Build successful
|
2023-05-03 17:52:21 +02:00 |
|
|
229f74991e
|
Fix loading order
SteamWarCI Build successful
|
2023-05-03 17:50:27 +02:00 |
|
|
59e397b826
|
Better error handling
SteamWarCI Build successful
|
2023-05-03 17:47:10 +02:00 |
|
yoyosource
|
5aca43b35e
|
Hotfix Season.getSeasonStart
SteamWarCI Build successful
|
2023-05-01 11:33:09 +02:00 |
|
yoyosource
|
4a6465953f
|
Hotfix Season.getSeasonStart
SteamWarCI Build successful
|
2023-05-01 11:19:00 +02:00 |
|
|
e8d964d833
|
Merge pull request 'Add feature disable' (#49) from LinkageFeatureDisable into master
SteamWarCI Build successful
Reviewed-on: #49
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2023-04-11 11:18:53 +02:00 |
|
Chaoscaot
|
3e064f7e4c
|
Merge CommonCore Master
SteamWarCI Build successful
|
2023-04-10 12:58:17 +02:00 |
|