Commit Graph

165 Commits

Author SHA1 Message Date
WolverinDEV
7f1254b05e Merge branch 'master' into 1.4.0
# Conflicts:
#	server/CMakeLists.txt
#	server/src/client/voice/VoiceClientConnection.cpp
2019-10-21 21:01:23 +02:00
WolverinDEV
4781e75a11 Version 1.3.25 2019-10-21 20:51:03 +02:00
WolverinDEV
d1ec6e9c05 Improved the channel group copy method 2019-10-21 20:49:20 +02:00
WolverinDEV
04fd9ca978 Fixed server group copy 2019-10-21 20:46:17 +02:00
WolverinDEV
68d07cf7d3 Adjusted some things to the new shared library 2019-10-21 20:03:27 +02:00
WolverinDEV
0bedf6c42a Fixed some bugs 2019-10-20 12:09:28 +02:00
WolverinDEV
0c6fd1f864 Merge remote-tracking branch 'remotes/origin/master' into 1.4.0 2019-10-19 11:53:51 +02:00
WolverinDEV
46753d7a3f Fixed some subscribe issues 2019-10-16 21:11:54 +02:00
WolverinDEV
12df983367 Fixed some links 2019-10-15 18:12:30 +02:00
WolverinDEV
b3347cfa8e SOme small updates 2019-10-15 18:04:34 +02:00
WolverinDEV
08ba917d02 Some minor query leated changes 2019-10-14 16:30:34 +02:00
WolverinDEV
e39f01bde5 Some minor changes 2019-10-13 17:12:50 +02:00
WolverinDEV
7822d20efe Merge branch 'master' into 1.4.0 2019-09-22 14:09:42 +02:00
WolverinDEV
7ec9b98883 Fixed another issue 2019-09-22 14:07:24 +02:00
WolverinDEV
dab4c40209 Fixed permission switch #2 2019-09-22 13:17:33 +02:00
WolverinDEV
2ed0721af3 Fixed permission switch mistake 2019-09-22 12:46:14 +02:00
WolverinDEV
155bfb3185 Fixed permission skip negate switch 2019-09-22 12:45:33 +02:00
WolverinDEV
647248009d Updating the license system 2019-09-22 12:36:30 +02:00
WolverinDEV
244b7dc0cb Merged with master 2019-09-14 17:42:43 +02:00
WolverinDEV
9cb069db5a Added two new commands 2019-09-14 14:22:16 +02:00
WolverinDEV
2ae00f07cd Some fixes 2019-09-14 12:06:48 +02:00
WolverinDEV
c8a6449a45 fixed the default setup 2019-09-09 14:02:47 +02:00
WolverinDEV
8d7b332a9c fixed MySQL for the new shared MySQL impl 2019-09-05 12:35:19 +02:00
WolverinDEV
709d2c0f5d Fixed/improved MySQL 2019-09-05 12:30:07 +02:00
WolverinDEV
de01ee9387 Some changes 2019-09-03 12:34:58 +02:00
WolverinDEV
87fd26301d Added the permission mapping file 2019-08-25 23:55:55 +02:00
WolverinDEV
79f8c91157 Some changes 2019-08-25 22:16:42 +02:00
WolverinDEV
787f911b6f A lot of updates 2019-08-20 13:46:23 +02:00
WolverinDEV
7c490d2180 A lot of updates 2019-08-20 13:42:22 +02:00
WolverinDEV
aa3de59652 Updates 2019-08-16 16:13:52 +02:00
WolverinDEV
bae6a56ed3 Changes 2019-08-16 16:13:14 +02:00
WolverinDEV
bd43c53db2 fixed query select bug 2019-08-13 11:04:00 +02:00
WolverinDEV
f7cb93d768 Merge branch 'master' into 1.4.0 2019-08-01 11:56:50 +02:00
WolverinDEV
942ea44e90 Fixed some stuff 2019-08-01 11:37:30 +02:00
WolverinDEV
b07933ea08 some fixes 2019-07-31 21:58:21 +02:00
WolverinDEV
54c9dbda99 fixed granted permissions 2019-07-31 15:18:13 +02:00
WolverinDEV
356822a0c5 Fixed skip and negate flags 2019-07-31 15:15:34 +02:00
WolverinDEV
e9d4b4c6a2 increased version number 2019-07-29 20:59:52 +02:00
WolverinDEV
2ac8d26687 Added a new property 2019-07-29 20:58:01 +02:00
WolverinDEV
dcd55275b5 Some small changes 2019-07-28 18:30:40 +02:00
WolverinDEV
e38199e6c7 Merge branch 'master' into 1.4.0 2019-07-23 15:54:04 +02:00
WolverinDEV
76dad7e100 fixed grant notify 2019-07-23 15:53:20 +02:00
WolverinDEV
af4106614c Implemented new chat system 2019-07-23 10:37:56 +02:00
WolverinDEV
34b363f4cf fixed typo 2019-07-23 10:23:12 +02:00
WolverinDEV
1211f517d5 Improved channeledit command 2019-07-23 10:21:58 +02:00
WolverinDEV
d549e0c4c5 Fixed missing permission 2019-07-23 10:17:35 +02:00
WolverinDEV
c720a80bc0 Updating the conversation stuff 2019-07-21 17:02:32 +02:00
WolverinDEV
345da8394b Merged with master 2019-07-21 15:10:39 +02:00
WolverinDEV
d465b0a4be Some changes 2019-07-21 15:10:06 +02:00
WolverinDEV
1ac7c112d4 improved stuff 2019-07-21 14:58:16 +02:00
WolverinDEV
c9e257270f Fixed a command packet order issue 2019-07-21 14:56:53 +02:00
WolverinDEV
a5e545afeb fixed poke permissions 2019-07-21 12:32:29 +02:00
WolverinDEV
d3cc5984e5 fixed first instance setup miracle 2019-07-21 10:57:01 +02:00
WolverinDEV
d4d6978d5f Fle server & Query server improvements 2019-07-21 10:43:26 +02:00
WolverinDEV
e507d1f75d First implementation for the conversation system (not 100% finished yet) 2019-07-19 22:55:03 +02:00
WolverinDEV
98929707ae Fixed 2019-07-19 21:32:31 +02:00
WolverinDEV
c710157030 fixed SIGILL in server select 2019-07-19 19:42:57 +02:00
WolverinDEV
dd0eaf33e5 fixed connection issues 2019-07-18 21:36:36 +02:00
WolverinDEV
0a762eef76 fixed channel related crash 2019-07-18 18:05:49 +02:00
WolverinDEV
3885b426e4 Using switch statement to improve performance 2019-07-18 18:01:45 +02:00
WolverinDEV
338ff1c399 Made this more thread safty 2019-07-18 10:45:50 +02:00
WolverinDEV
2177e51380 fixed crash on no permission manager 2019-07-18 10:45:07 +02:00
WolverinDEV
a3baa8e5b4 fixed negate permission calculation 2019-07-18 10:44:54 +02:00
WolverinDEV
23324f2046 Fixed icon id calculation 2019-07-17 22:17:38 +02:00
WolverinDEV
5715acbcb2 Reinitialized project to reduce the git branch size 2019-07-17 19:37:18 +02:00