374 Commits

Dieser Branch

Dieser Branch

Alle Branches

Autor	SHA1	Nachricht	Datum
Lixfel	20c22c47f9	Merge pull request 'Kleiner Fehler' (#68) from chaoscaot-patch-1 into master ... Reviewed-on: #68 Reviewed-by: Lixfel <lixfel@steamwar.de>	2024-03-16 00:45:27 +01:00
Chaoscaot	0c35be1fec	Kleiner Fehler	2024-03-15 22:40:53 +01:00
Chaoscaot	0bc349fc64	Kleiner Fehler	2024-03-15 22:39:41 +01:00
Lixfel	a473e59048	Merge pull request 'Configurable Spectate port to allow multiple concurrent Spectate servers' (#66) from spectate into master ... Reviewed-on: #66 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2024-03-13 13:11:38 +01:00
Lixfel	3c889efe9e	Configurable Spectate port to allow multiple concurrent Spectate servers	2024-03-09 21:22:24 +01:00
Lixfel	98c804a15c	Merge pull request '"UNION with CTE" Workaround' (#65) from fix-union into master ... Reviewed-on: #65 Reviewed-by: Lixfel <lixfel@steamwar.de>	2024-03-09 19:36:22 +01:00
Chaoscaot	d5dbe05e29	"UNION with CTE" Workaround	2024-03-09 18:28:49 +01:00
Lixfel	647012ac40	Merge pull request 'Add referee table for multiple referees per event(fight)' (#64) from referee into master ... Reviewed-on: #64 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2024-03-08 10:16:46 +01:00
Lixfel	7ccabe8dcc	Add referee table for multiple referees per event(fight)	2024-03-08 09:52:53 +01:00
Lixfel	bfc72ddcb7	Merge pull request 'Fix SchematicSelector' (#63) from fix-schem-select into master ... Reviewed-on: #63 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2024-02-17 08:29:08 +01:00
Chaoscaot	fe471aa803	Fix SchematicSelector	2024-02-03 10:29:34 +01:00
Chaoscaot	41fc368214	Revert "Fix Invalid Show" ... This reverts commit 38939b36bd.	2024-02-03 10:28:32 +01:00
Chaoscaot	38939b36bd	Fix Invalid Show	2024-02-03 10:28:07 +01:00
Lixfel	e7952685d2	Merge pull request 'Add PWs' (#61) from passwords into master ... Reviewed-on: #61 Reviewed-by: Lixfel <lixfel@steamwar.de>	2024-01-06 16:32:44 +01:00
Chaoscaot	9a3630b07c	Code Review Stuff	2023-12-19 20:49:37 +01:00
Lixfel	61ffbc2349	Merge pull request 'Add BauweltMember.isBuild and BauweltMember.isSupervisor' (#62) from BauweltMemberUpdate into master ... Reviewed-on: #62 Reviewed-by: Lixfel <lixfel@steamwar.de>	2023-12-19 20:49:24 +01:00
Chaoscaot	efd7f27c60	Unused Imports and Random	2023-12-19 20:39:09 +01:00
yoyosource	abb6af2d7d	Add BauweltMember.isBuild and BauweltMember.isSupervisor	2023-12-19 20:10:28 +01:00
yoyosource	f672b8557b	Add BauweltMember.isBuild and BauweltMember.isSupervisor	2023-12-19 20:08:39 +01:00
Chaoscaot	c20a426bff	Merge remote-tracking branch 'origin/passwords' into passwords ... # Conflicts: # src/de/steamwar/sql/SteamwarUser.java	2023-12-17 18:29:20 +01:00
Chaoscaot	e83ab4762d	WepPW Command	2023-12-17 18:28:52 +01:00
Chaoscaot	6ac6643162	src/de/steamwar/sql/SteamwarUser.java aktualisiert	2023-12-17 17:22:47 +01:00
Chaoscaot	ea52162ffe	Updates	2023-12-17 16:34:08 +01:00
Lixfel	b66c18b8b3	Merge pull request 'Add Token SQL-Class' (#60) from token into master ... Reviewed-on: #60 Reviewed-by: Lixfel <lixfel@steamwar.de>	2023-12-11 18:18:00 +01:00
Chaoscaot	0723c87814	Add Token	2023-11-30 18:11:39 +01:00
Lixfel	e664c6cf4e	Merge pull request 'Fix QuickGear' (#59) from fix-quickgear into master ... Reviewed-on: #59 Reviewed-by: Lixfel <lixfel@steamwar.de>	2023-11-29 16:31:46 +01:00
Chaoscaot	ac7c3acbb8	Fix QuickGear	2023-11-29 16:27:20 +01:00
Lixfel	e4b3539d28	Merge pull request 'Remove UserGroup' (#58) from removeUserGroups into master ... Reviewed-on: #58 Reviewed-by: Chaoscaot <chaoscaot@zohomail.eu>	2023-10-10 18:00:58 +02:00
Lixfel	e0c1d1c2e2	Change Colors ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-09-01 11:25:00 +02:00
Lixfel	eaad69240a	Remove UserGroup ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-08-30 12:27:26 +02:00
Lixfel	72ebfec1a5	Fix UserPerm	2023-08-29 21:40:52 +02:00
Lixfel	4c008bc282	Merge pull request 'UserPerm model, lazy punishment loading' (#57) from user-perm into master ... Reviewed-on: #57 Reviewed-by: Chaoscaot <chaoscaot@zohomail.eu>	2023-08-29 21:24:48 +02:00
Lixfel	4eadcb4b09	Update ColorChat Perm ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-08-29 18:05:26 +02:00
Lixfel	fc1e7c60d7	Updated UserPerms ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-08-29 17:46:46 +02:00
Lixfel	96d55a7ac6	Changed UserPerms ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-08-29 16:01:13 +02:00
Lixfel	469a504e48	UserPerm model ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-08-29 15:03:39 +02:00
Lixfel	0fef6c0f8f	Fix script insert	2023-07-17 16:52:51 +02:00
Chaoscaot	5d5adb9828	Fix SQL	2023-07-17 16:47:42 +02:00
Lixfel	6c7c073320	Merge pull request 'Fix infinite recursion' (#56) from improve_sql into master ... Reviewed-on: #56 Reviewed-by: Lixfel <lixfel@steamwar.de>	2023-06-13 23:15:20 +02:00
Chaoscaot	7f1cf130a8	Fix infinite recursion	2023-06-13 22:59:56 +02:00
Lixfel	e903c139a7	Merge pull request 'Add Script SQL-Type' (#54) from script_sql into master ... Reviewed-on: #54 Reviewed-by: Lixfel <lixfel@steamwar.de>	2023-06-13 22:07:53 +02:00
Lixfel	6f5ac96c65	Merge pull request 'Improve Fightsystem SchematicSelector Performance' (#55) from improve_sql into master ... Reviewed-on: #55 Reviewed-by: Lixfel <lixfel@steamwar.de>	2023-06-10 17:54:31 +02:00
Chaoscaot	18e3f9baae	Fix Query	2023-06-10 11:04:45 +02:00
Chaoscaot	9eef3c9353	Improve Fightsystem SchematicSelector Performance	2023-06-08 11:11:05 +02:00
Lixfel	d6ef17cbe7	Fix Script class	2023-06-05 16:01:34 +02:00
Chaoscaot	f07ad1cbf5	Add List	2023-05-18 14:23:44 +02:00
Chaoscaot	eedc949672	Add List	2023-05-18 14:23:23 +02:00
Chaoscaot	b4ce9493d1	Add Script SQL-Type	2023-05-18 08:43:33 +02:00
yoyosource	a2bb52ab26	Fix another thing	2023-05-13 16:00:54 +02:00
yoyosource	5ca6d9f4a4	Update to use Collections.emptyMap()	2023-05-12 23:40:05 +02:00