Skip to content

Commit

Permalink
Merge branch 'master' into cell_noskill
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kenpachi2k13
Kenpachi2k13 authored May 3, 2020
2 parents f70a887 + f40cc83 commit cd593de
Show file tree
Hide file tree
Showing 1,550 changed files with 213,377 additions and 128,191 deletions.
3 changes: 2 additions & 1 deletion .appveyor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ image: Visual Studio 2015
clone_depth: 5
environment:
matrix:
- HerculesProject: Hercules-12.sln
- HerculesProject: Hercules-14.sln
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
HerculesProject: Hercules-15.sln
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
HerculesProject: Hercules-16.sln
services: mysql56
build_script:
- cmd: MSBuild %HerculesProject% /t:map-server,char-server,login-server
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ Thumbs.db
/3rdparty/libconfig/Makefile
/3rdparty/libconfig/*.o

# /3rdparty/libbacktrace/
/3rdparty/libbacktrace/Makefile
/3rdparty/libbacktrace/*.o
/3rdparty/libbacktrace/backtrace-supported.h

# /3rdparty/mt19937ar/
/3rdparty/mt19937ar/Makefile
/3rdparty/mt19937ar/*.o
Expand Down
Loading

0 comments on commit cd593de

Please sign in to comment.