1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-07 11:17:46 +00:00
Commit graph

1523 commits

Author SHA1 Message Date
NotAdam
47d18182c0 manually merge in some exd changes and some 4.5 opcodes 2019-01-08 18:08:51 +11:00
Mordred
c4a8bfa3f8
Merge pull request #473 from NotAdam/develop
move all configuration items to new config class
2019-01-07 13:43:55 +01:00
Mordred
d2135592d0 Merge pull request #473 from NotAdam/develop
move all configuration items to new config class
2019-01-07 13:43:55 +01:00
NotAdam
6fea0a30e1 update ini reading to use 'general' instead of 'parameters' 2019-01-07 23:31:04 +11:00
NotAdam
2776ecd6d4 update ini reading to use 'general' instead of 'parameters' 2019-01-07 23:31:04 +11:00
NotAdam
4397c86dae refactor parameters to general, fix build error 2019-01-07 23:26:34 +11:00
NotAdam
35def4d4f2 refactor parameters to general, fix build error 2019-01-07 23:26:34 +11:00
NotAdam
3cfc79e842 remove old shit 2019-01-07 23:20:50 +11:00
NotAdam
047d0328e0 remove old shit 2019-01-07 23:20:50 +11:00
NotAdam
5ec2d23a12 cleanup db connection config 2019-01-07 23:16:01 +11:00
NotAdam
eb56f5fda2 cleanup db connection config 2019-01-07 23:16:01 +11:00
NotAdam
aa73b1c668 everything should be working again... 2019-01-07 23:08:43 +11:00
NotAdam
bf0324cfea everything should be working again... 2019-01-07 23:08:43 +11:00
NotAdam
cd1d8f8126 lobby works again with new config stuff 2019-01-07 23:00:09 +11:00
NotAdam
03df0b242c lobby works again with new config stuff 2019-01-07 23:00:09 +11:00
NotAdam
7666e84693 shift a lot of config around 2019-01-07 22:11:52 +11:00
NotAdam
3521ae7c8d shift a lot of config around 2019-01-07 22:11:52 +11:00
Mordred
5232909ccb Extended schema for spawnpoints 2019-01-06 23:34:19 +01:00
Mordred
c1a3fa5915 Extended schema for spawnpoints 2019-01-06 23:34:19 +01:00
JeidoUran
9c90b34c2b Added prepareZoning research + fixed typo 2019-01-06 16:32:06 +01:00
JeidoUran
880ea0a336 Added prepareZoning research + fixed typo 2019-01-06 16:32:06 +01:00
NotAdam
d0059f0717 initial move of all config items to a object 2019-01-06 23:39:42 +11:00
NotAdam
3349ccce42 initial move of all config items to a object 2019-01-06 23:39:42 +11:00
JeidoUran
a5e6ca82ab Changed 'u3b' to 'isGm' and made it a bool 2019-01-06 04:48:54 +01:00
JeidoUran
12c053cdda Changed 'u3b' to 'isGm' and made it a bool 2019-01-06 04:48:54 +01:00
JeidoUran
4aa19d5ec0 Merge branch 'develop' into crashes_fix 2019-01-06 02:14:25 +01:00
JeidoUran
dbb93a3d94 Merge branch 'develop' into crashes_fix 2019-01-06 02:14:25 +01:00
JeidoUran
193288929d 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
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
Mordred
7f00c34f90 Changed sendDebug to use fmt aswell 2019-01-05 12:32:10 +01:00
Mordred
b0ab052bd4 Changed sendDebug to use fmt aswell 2019-01-05 12:32:10 +01:00
NotAdam
a140eeac4c add logger message formatting 2019-01-04 21:47:19 +11:00
NotAdam
6ef140e87d add logger message formatting 2019-01-04 21:47:19 +11:00
mordred
f795aca9a6 Moved spawngroup query to prepared stmt 2019-01-04 08:54:39 +01:00
mordred
84d6175b20 Moved spawngroup query to prepared stmt 2019-01-04 08:54:39 +01:00
Mordred
a022a37aab Automatically copy libmysql.dll to bin folder 2019-01-03 21:32:44 +01:00
Mordred
c9468d8ad2 Automatically copy libmysql.dll to bin folder 2019-01-03 21:32:44 +01:00
mordred
abd98f82b5 Generate libs oos 2019-01-03 09:13:56 +01:00
mordred
e32a2ca8f7 Generate libs oos 2019-01-03 09:13:56 +01:00
mordred
e7507515b6 Further cmake cleanup 2019-01-02 11:23:39 +01:00
mordred
3ffcf4e1fa Further cmake cleanup 2019-01-02 11:23:39 +01:00
Mordred
789127691a Merge remote-tracking branch 'origin/housing' into develop 2019-01-01 15:06:42 +01:00
Mordred
a25cfcd9d1 Merge remote-tracking branch 'origin/housing' into develop 2019-01-01 15:06:42 +01:00
NotAdam
f0202a2094 fix structs, disable market cache gen 2019-01-01 23:37:32 +11:00
NotAdam
4673a8122e fix structs, disable market cache gen 2019-01-01 23:37:32 +11:00
NotAdam
4fcfc6ecf1 somewhat working marketboard implementation 2019-01-01 17:29:06 +11:00
NotAdam
cd19435876 somewhat working marketboard implementation 2019-01-01 17:29:06 +11:00
NotAdam
a37525d002 fix oob error on market board result lists and correctly sort the items 2019-01-01 14:19:44 +11:00
NotAdam
717acba9cb fix oob error on market board result lists and correctly sort the items 2019-01-01 14:19:44 +11:00
NotAdam
0aa1fab9a4 correctly send marketboard item list 2019-01-01 11:51:48 +11:00