1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 14:37:44 +00:00
Commit graph

2285 commits

Author SHA1 Message Date
NotAdam
35def4d4f2 refactor parameters to general, fix build error 2019-01-07 23:26:34 +11:00
NotAdam
047d0328e0 remove old shit 2019-01-07 23:20:50 +11:00
NotAdam
eb56f5fda2 cleanup db connection config 2019-01-07 23:16:01 +11:00
NotAdam
bf0324cfea everything should be working again... 2019-01-07 23:08:43 +11:00
NotAdam
03df0b242c lobby works again with new config stuff 2019-01-07 23:00:09 +11:00
NotAdam
3521ae7c8d shift a lot of config around 2019-01-07 22:11:52 +11:00
Mordred
3f313fffd2 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2019-01-06 23:34:32 +01:00
Mordred
c1a3fa5915 Extended schema for spawnpoints 2019-01-06 23:34:19 +01:00
JeidoUran
880ea0a336 Added prepareZoning research + fixed typo 2019-01-06 16:32:06 +01:00
JeidoUran
73f261927b More GM Call/Jump fixes 2019-01-06 16:25:51 +01:00
NotAdam
092b343114 move all the old config calls to the new config object 2019-01-07 00:03:48 +11:00
NotAdam
3349ccce42 initial move of all config items to a object 2019-01-06 23:39:42 +11:00
NotAdam
fc93308939 potential fix for missing cmake command under some configurations 2019-01-06 17:38:34 +11:00
JeidoUran
12c053cdda Changed 'u3b' to 'isGm' and made it a bool 2019-01-06 04:48:54 +01:00
JeidoUran
4678cfde3a Merge branch 'develop' into crashes_fix 2019-01-06 02:22:09 +01:00
JeidoUran
e90bfc8dd2 Merge remote-tracking branch 'SapphireServer/develop' into develop 2019-01-06 02:20:17 +01:00
JeidoUran
dbb93a3d94 Merge branch 'develop' into crashes_fix 2019-01-06 02:14:25 +01:00
JeidoUran
15e206430a Sending a /tell while acting as a GM will send a GM Tell
GM Call was also fixed 3 commits ago, now works on players within instances
2019-01-06 02:07:40 +01:00
JeidoUran
32bfdefbc0 GM Jumping no longer crashes the server if used across instances, and works like GM Call 2019-01-06 01:47:07 +01:00
Mordred
572a6e1257 Updated sendNotice and sendUrgent calls 2019-01-06 00:26:26 +01:00
JeidoUran
39da2d2bc9 GM Call is now closer to retail behavior 2019-01-05 18:50:27 +01:00
Mordred
24cbff7c7e Added fmt for sendNotice and sendUrgent, have not ported appearances yet 2019-01-05 14:53:42 +01:00
JeidoUran
d41ac16eda Several GM Commands no longer crashes world.exe if used while a bnpc or an eobj is in range 2019-01-05 14:50:16 +01:00
JeidoUran
f6e691f65d Merge pull request #6 from SapphireServer/develop
Develop
2019-01-05 13:39:12 +01:00
Mordred
b0ab052bd4 Changed sendDebug to use fmt aswell 2019-01-05 12:32:10 +01:00
mordred
3bbe8f352e Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2019-01-04 14:29:43 +01:00
mordred
284ae1ee41 Fix for double mysql find 2019-01-04 14:29:31 +01:00
Adam
c09333c96a Merge pull request #469 from JeidoUran/crashes_fix
"!add bnpc" no longer crashes world.exe if a non-existing bnpctemplate is inputted
2019-01-05 00:03:52 +11:00
JeidoUran
37417800ac Formatting... 2019-01-04 13:57:29 +01:00
JeidoUran
a027784247 Formatting² 2019-01-04 13:50:57 +01:00
JeidoUran
329ee05156 Formatting 2019-01-04 13:47:03 +01:00
JeidoUran
bc783993f3 Update DebugCommandMgr.cpp 2019-01-04 13:30:14 +01:00
NotAdam
646cf701cb fix blasphemous indentation 2019-01-04 22:59:20 +11:00
NotAdam
4dc80de5f2 fix log calls not outputting hex as it used to 2019-01-04 22:48:09 +11:00
NotAdam
2a205cc2db convert more log calls to format string 2019-01-04 22:37:01 +11:00
mordred
ca837de56f Converting logging calls 2019-01-04 12:34:19 +01:00
NotAdam
6ef140e87d add logger message formatting 2019-01-04 21:47:19 +11:00
NotAdam
ec340e2c3c ignore clion cmake build directories 2019-01-04 20:50:04 +11:00
mordred
c07d7e6f5d Potential fix for VS build dir 2019-01-04 10:17:21 +01:00
mordred
84d6175b20 Moved spawngroup query to prepared stmt 2019-01-04 08:54:39 +01:00
mordred
4e35fd2d91 Fixed a spawngroup related linux crash 2019-01-04 08:32:47 +01:00
JeidoUran
a4f54d2b31 "!add bnpc" no longer crashes world.exe if a non-existing bnpctemplate is inputted 2019-01-04 05:12:06 +01:00
JeidoUran
71f2542c9f Merge pull request #3 from SapphireServer/develop
Develop
2019-01-04 02:38:08 +01:00
Mordred
bfb09268a4 Merge pull request #467 from NotAdam/develop
drop x86 support on windows
2019-01-03 23:06:17 +01:00
Mordred
19de2bf909 Automatically create log folder in cmake stage 2019-01-03 22:40:26 +01:00
Mordred
c9468d8ad2 Automatically copy libmysql.dll to bin folder 2019-01-03 21:32:44 +01:00
mordred
b9b10c4024 Added cmake comment 2019-01-03 10:01:00 +01:00
mordred
a4b6608ce7 More cmake cleanup 2019-01-03 09:53:37 +01:00
mordred
c7993af00a Also copy cand call sql_import for CI 2019-01-03 09:22:03 +01:00
mordred
e32a2ca8f7 Generate libs oos 2019-01-03 09:13:56 +01:00