MangosArentLiterature
|
65467df4ba
|
Merge branch 'master' into password-requirements
|
2021-06-03 11:56:27 -05:00 |
|
Salanto
|
d52c069df2
|
Merge branch 'master' into discord_content
|
2021-05-15 16:53:05 +02:00 |
|
Cerapter
|
e6b00575d8
|
Merge remote-tracking branch 'refs/remotes/scatter/master'
|
2021-05-13 07:15:18 +02:00 |
|
Cerapter
|
ba3d20186d
|
Merge remote-tracking branch 'refs/remotes/scatter/master'
Conflicts:
akashi.pro
core/src/aoclient.cpp
core/src/commands/authentication.cpp
core/src/packets.cpp
src/aoclient.cpp
src/commands/authentication.cpp
src/packets.cpp
|
2021-05-09 15:11:02 +02:00 |
|
Cerapter
|
68b4174a40
|
Merge remote-tracking branch 'refs/remotes/scatter/master'
Conflicts:
akashi.pro
core/include/logger.h
core/src/commands/area.cpp
core/src/packets.cpp
include/logger.h
src/commands/area.cpp
src/packets.cpp
|
2021-05-01 23:33:00 +02:00 |
|
Cerapter
|
f5cc137b40
|
Rename lib to core.
On Linux, the resulting shared library would have been called `liblib`, which is just dumb.
|
2021-04-26 21:14:25 +02:00 |
|