Commit graph

1145 commits

Author SHA1 Message Date
RElesgoe
bc74c5b602 Merge pull request #211 from RElesgoe/master
Fix exception when attempting to select an invalid ad id
2016-07-01 02:00:11 -07:00
xboi209
2639fa9578 - Fixed exception when attempting to select an invalid ad id 2016-07-01 01:58:32 -07:00
RElesgoe
295f9d481a Merge pull request #204 from RElesgoe/master
Modify bnetd.conf.win32 to use ad.json instead of ad.conf
2016-05-24 17:54:14 -07:00
xboi209
23b7a5de56 Modified bnetd.conf.win32 to use ad.json instead of ad.conf 2016-05-24 17:53:02 -07:00
RElesgoe
c99de23626 Merge pull request #203 from RElesgoe/master
Use JSON configuration file for Ad Banners
2016-05-24 13:28:17 -07:00
xboi209
a42ec6f6ab Corrected format specifier for std::size_t 2016-05-24 04:14:11 -07:00
xboi209
d906975dfc Remove unused includes in adbanner.cpp and adbanner.h 2016-05-24 04:01:48 -07:00
xboi209
505633aba0 PvPGN now loads ads configuration in JSON format 2016-05-24 03:58:39 -07:00
xboi209
8102febfd3 Updated json.hpp to correct file 2016-05-23 21:06:30 -07:00
xboi209
c036a43bd3 Update to JSON for Modern C++ 2.0.0 commit a3f432b3dde1d71c8940961947db5938ed11ee91 2016-05-23 21:02:22 -07:00
xboi209
214861038b Update to JSON for Modern C++ 2.0.0 commit a3f432b3dde1d71c8940961947db5938ed11ee91 2016-05-23 20:59:25 -07:00
xboi209
cc393bb543 Add JSON for Modern C++ 1.1.0 2016-05-23 14:24:13 -07:00
RElesgoe
315f45ce4f Merge pull request #202 from RElesgoe/master
Sync
2016-05-23 13:46:03 -07:00
RElesgoe
94dc3e627f Merge pull request #13 from pvpgn/master
Sync
2016-05-23 13:45:37 -07:00
xboi209
2461e895e7 Merge pull request #198 from cen1/wc3_127a
Support for W3 patch 1.27a
2016-04-14 18:20:22 -07:00
cen1
3f1b18ed7f Support for W3 patch 1.27a 2016-04-02 15:19:54 +02:00
xboi209
cbca36ac7d Merge pull request #193 from cen1/bsdfix
FreeBSD compilation error fixes
2015-11-16 19:38:30 -08:00
xboi209
0b98e4fafa Update .travis.yml
Add --no-check-certificate to wget parameter
2015-11-16 13:24:53 -08:00
xboi209
c0b126379c Update .travis.yml
Force Travis to use CMake 3.4.0
2015-11-16 13:02:58 -08:00
cen1
9b6f38028f Merge branch 'master' of https://github.com/pvpgn/pvpgn-server into bsdfix 2015-11-16 20:03:21 +01:00
cen1
4d20b91580 Merge branch 'master' of https://github.com/pvpgn/pvpgn-server into bsdfix 2015-11-16 19:47:55 +01:00
cen1
7fa9f0430a Changed string to reference 2015-11-16 19:31:18 +01:00
cen1
3914288b05 Corrected fix for clang 2015-11-16 12:07:53 +01:00
cen1
a8901d9edc Fix event.h cmake find on freebsd 2015-11-16 11:59:23 +01:00
cen1
788b167ddd FIx compile with clang 2015-11-16 11:57:54 +01:00
xboi209
9385d027a2 Use std::string()'s 2015-11-03 17:41:00 -08:00
xboi209
1303e41913 Fix compile error on FreeBSD 10.2 with Clang 3.4.1 2015-10-31 01:21:01 -07:00
xboi209
72a3d92e5c Use std::string's 2015-10-31 01:13:24 -07:00
xboi209
b2ceee18e7 Merge pull request #180 from xboi209/master
Remove unused/unneeded defines
2015-10-17 16:05:18 -07:00
xboi209
c0f2c3968e - Removed HAVE_STRTOUL 2015-10-17 13:45:41 -07:00
xboi209
ddb665a543 - Removed HAVE_GETENV 2015-10-17 13:37:21 -07:00
xboi209
ebfb1b97fe - Removed HAVE_UNAME duplicate 2015-10-17 13:33:00 -07:00
xboi209
597f394d46 - Removed HAVE_VSNPRINTF 2015-10-17 13:30:18 -07:00
xboi209
a1f80f108f - Removed HAVE_DIFFTIME
- Removed HAVE_INDEX
- Removed HAVE_RINDEX
- Removed HAVE_STRCHR
- Removed HAVE_STRRCHR
2015-10-17 13:26:49 -07:00
xboi209
6f9294d198 Undo tmp change 2015-10-17 13:16:06 -07:00
xboi209
d1ac041bf5 - Removed check for HAVE_MKTIME 2015-10-17 13:15:41 -07:00
xboi209
534da8445a - Removed HAVE_SNPRINTF defines 2015-10-17 13:11:46 -07:00
xboi209
4908e192dd - Removed src/win32/configwin.h 2015-10-17 13:10:28 -07:00
xboi209
3ce35b1a83 Additional tested configurations 2015-10-17 12:40:49 -07:00
xboi209
92b8f9fea6 Merge pull request #178 from xboi209/master
Various Changes
2015-10-16 19:17:09 -07:00
xboi209
9cd2ef2b4b Updated docs files to use markdown 2015-10-16 17:13:24 -07:00
xboi209
ce56cf1619 Uncomment max_accounts in bnetd.conf 2015-10-12 16:03:39 -07:00
xboi209
9e3ba4e31a Use trace instead of error in friendlist_close() 2015-10-12 15:35:36 -07:00
xboi209
a5c1a8ed1e Revert account_set_rawattr() which caused a crash when creating a new account in WC3 2015-10-12 15:33:05 -07:00
xboi209
fc3080f447 Merge branch 'master' of https://github.com/xboi209/pvpgn.git 2015-10-10 13:54:34 -07:00
xboi209
33b4b61c95 Pass compiler flags for Clang 2015-10-10 13:54:31 -07:00
xboi209
0cb70c3264 Merge pull request #12 from pvpgn/master
Sync with HarpyWar
2015-10-09 20:44:53 -07:00
xboi209
5a455db8e2 Remove the -ansi flag 2015-10-09 20:41:08 -07:00
xboi209
664923370d Forgot to remove snprintf.cpp from compat/CMakeLists.txt 2015-10-09 20:23:21 -07:00
xboi209
7ba2bfab8b Rewrite account_wrap.cpp to use std::string()'s 2015-10-09 20:17:28 -07:00