mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-02 08:57:44 +00:00
Code Activity
6045 commits 10 branches 14 tags 26 MiB
Commit graph

6045 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
JeidoUran
808adc9f1c 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
Mordred
f7fa30101a 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
d2a8e5dc16 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
JeidoUran
7ac1299507
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
7f00c34f90 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
fd1341a887 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
mordred
00f8fe97b0 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
Adam
d9e73e1f51
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
c87955374e Formatting... 2019-01-04 13:57:29 +01:00
JeidoUran
a027784247 Formatting² 2019-01-04 13:50:57 +01:00
JeidoUran
a3b738d724 Formatting² 2019-01-04 13:50:57 +01:00
JeidoUran
329ee05156 Formatting 2019-01-04 13:47:03 +01:00
JeidoUran
4dabec79d4 Formatting 2019-01-04 13:47:03 +01:00
JeidoUran
bc783993f3 Update DebugCommandMgr.cpp 2019-01-04 13:30:14 +01:00
JeidoUran
b99ad78223
Update DebugCommandMgr.cpp 2019-01-04 13:30:14 +01:00
mordred
d22047793e Merge remote-tracking branch 'origin/develop' 2019-01-04 13:11:02 +01:00
mordred
409c8a25b5 Merge remote-tracking branch 'origin/develop' 2019-01-04 13:11:02 +01:00
NotAdam
646cf701cb fix blasphemous indentation 2019-01-04 22:59:20 +11:00
NotAdam
d5e466267e 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
ba803288a3 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
NotAdam
c97ba162a4 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
mordred
d6ec45b048 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
a140eeac4c 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