mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-03 01:07:47 +00:00
Code Activity
6381 commits 10 branches 14 tags 26 MiB
Commit graph

6381 commits

This branch
This branch
All branches
Author SHA1 Message Date
NotAdam
8d183e4193 manually merge in some exd changes and some 4.5 opcodes 2019-01-08 18:08:51 +11: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
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
NotAdam
2776ecd6d4 update ini reading to use 'general' instead of 'parameters' 2019-01-07 23:31:04 +11:00
NotAdam
6fea0a30e1 update ini reading to use 'general' instead of 'parameters' 2019-01-07 23:31:04 +11:00
NotAdam
35def4d4f2 refactor parameters to general, fix build error 2019-01-07 23:26:34 +11:00
NotAdam
4397c86dae 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
3cfc79e842 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
5ec2d23a12 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
aa73b1c668 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
cd1d8f8126 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
NotAdam
7666e84693 shift a lot of config around 2019-01-07 22:11:52 +11:00
mordred
fff5951255 Merge remote-tracking branch 'origin/develop' 2019-01-07 08:12:19 +01:00
mordred
b6a0146d7b Merge remote-tracking branch 'origin/develop' 2019-01-07 08:12:19 +01:00
Mordred
3f313fffd2 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2019-01-06 23:34:32 +01:00
Mordred
d6ec411c3c 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
Mordred
5232909ccb 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
9c90b34c2b 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
JeidoUran
ca3851d7d4 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
c15f9be174 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
d0059f0717 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
NotAdam
3a09cf8732 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
a5e6ca82ab 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
8f1e7323d9 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
bb2600b7f9 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
4aa19d5ec0 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
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
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
JeidoUran
5d9084c279 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
2701872112 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2019-01-06 00:27:37 +01:00
Mordred
aea0bf333a Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2019-01-06 00:27:37 +01:00
Mordred
572a6e1257 Updated sendNotice and sendUrgent calls 2019-01-06 00:26:26 +01:00
Mordred
df412bba66 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