+12 −3

.gitignore

.gitignore

+1 −0

CMakeLists.txt

3rdparty/CMakeLists.txt

+1 −0

README.txt

3rdparty/README.txt

+34 −0

CMakeLists.txt

3rdparty/httplib/CMakeLists.txt

+43 −0

Makefile.in

3rdparty/httplib/Makefile.in

+6,193 −0

httplib.cc

3rdparty/httplib/httplib.cc

+1,443 −0

httplib.h

3rdparty/httplib/httplib.h

+160 −0

httplib.vcxproj

3rdparty/httplib/httplib.vcxproj

+21 −0

httplib.vcxproj.filters

3rdparty/httplib/httplib.vcxproj.filters

+4 −0

CMakeLists.txt

CMakeLists.txt

+14 −1

Makefile.in

Makefile.in

+8 −8

athena-start

athena-start

+0 −6

client.conf

conf/battle/client.conf

0

web_conf.txt

conf/import-tmpl/web_conf.txt

+21 −0

inter_athena.conf

conf/inter_athena.conf

+5 −0

login_athena.conf

conf/login_athena.conf

+3 −0

web_msg.conf

conf/msg_conf/web_msg.conf

+56 −0

web_athena.conf

conf/web_athena.conf

+83 −46

configure

configure

+19 −7

configure.in → configure.ac

configure.in → configure.ac

+2 −1

function.sh

function.sh

+26 −0

rAthena.sln

rAthena.sln

+5 −0

README.md

sql-files/README.md

+50 −0

web.sql

sql-files/web.sql

+1 −0

CMakeLists.txt

src/CMakeLists.txt

+2 −0

cbasetypes.hpp

src/common/cbasetypes.hpp

+5 −1

core.cpp

src/common/core.cpp

+1 −0

core.hpp

src/common/core.hpp

+11 −0

socket.cpp

src/common/socket.cpp

+1 −0

socket.hpp

src/common/socket.hpp

+7 −0

sql.cpp

src/common/sql.cpp

+3 −0

packets.hpp

src/config/packets.hpp

+35 −11

account.cpp

src/login/account.cpp

+3 −1

account.hpp

src/login/account.hpp

+4 −1

login.cpp

src/login/login.cpp

+1 −0

login.hpp

src/login/login.hpp

+7 −7

loginchrif.cpp

src/login/loginchrif.cpp

+0 −2

battle.cpp

src/map/battle.cpp

+0 −2

battle.hpp

src/map/battle.hpp

+6 −6

clif.cpp

src/map/clif.cpp

+16 −2

map.cpp

src/map/map.cpp

+8 −2

map.hpp

src/map/map.hpp

+5 −5

pc.cpp

src/map/pc.cpp

+41 −0

CMakeLists.txt

src/web/CMakeLists.txt

+93 −0

Makefile.in

src/web/Makefile.in

+91 −0

auth.cpp

src/web/auth.cpp

+11 −0

auth.hpp

src/web/auth.hpp

+162 −0

charconfig_controller.cpp

src/web/charconfig_controller.cpp

+12 −0

charconfig_controller.hpp

src/web/charconfig_controller.hpp

+287 −0

emblem_controller.cpp

src/web/emblem_controller.cpp

+12 −0

emblem_controller.hpp

src/web/emblem_controller.hpp

+21 −0

http.hpp

src/web/http.hpp

+169 −0

merchantstore_controller.cpp

src/web/merchantstore_controller.cpp

+12 −0

merchantstore_controller.hpp

src/web/merchantstore_controller.hpp

+71 −0

sqllock.cpp

src/web/sqllock.cpp

+32 −0

sqllock.hpp

src/web/sqllock.hpp

+156 −0

userconfig_controller.cpp

src/web/userconfig_controller.cpp

+12 −0

userconfig_controller.hpp

src/web/userconfig_controller.hpp

+204 −0

web-server.vcxproj

src/web/web-server.vcxproj

+75 −0

web-server.vcxproj.filters

src/web/web-server.vcxproj.filters

+459 −0

web.cpp

src/web/web.cpp

+59 −0

web.hpp

src/web/web.hpp

+3 −0

webcnslif.hpp

src/web/webcnslif.hpp

+43 −0

webutils.cpp

src/web/webutils.cpp

+11 −0

webutils.hpp

src/web/webutils.hpp

+2 −0

webserv.bat

tools/webserv.bat