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

2163 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
JeidoUran
39da2d2bc9 GM Call is now closer to retail behavior 2019-01-05 18:50:27 +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
Mordred
303fc8c236 Moved tools to oos build aswell 2019-01-02 23:40:34 +01:00
JeidoUran
8a7ab5aeb6 Merge pull request #1 from SapphireServer/develop 
Develop
 2019-01-02 17:06:25 +01:00
mordred
266aefaa62 Take windows build path out of compiler.cmake 2019-01-02 15:28:24 +01:00
mordred
4c7ddf1beb Updated gitignore for moved config 2019-01-02 15:22:06 +01:00
mordred
2ed9d84bd0 True out of source build now possible. 2019-01-02 15:09:59 +01:00
mordred
3ffcf4e1fa Further cmake cleanup 2019-01-02 11:23:39 +01:00
mordred
551efcfe9a Slight cmake cleanup 2019-01-02 10:28:41 +01:00
Mordred
a25cfcd9d1 Merge remote-tracking branch 'origin/housing' into develop 2019-01-01 15:06:42 +01:00
Mordred
8bf71e90d5 Merge pull request #468 from NotAdam/housing 
fix a few housing related inventory issues
 2019-01-01 14:47:44 +01:00
NotAdam
4673a8122e fix structs, disable market cache gen 2019-01-01 23:37:32 +11:00
NotAdam
cd19435876 somewhat working marketboard implementation 2019-01-01 17:29:06 +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
50d1d9d492 correctly send marketboard item list 2019-01-01 11:51:48 +11:00
Mordred
959c2d4319 Simplified some cmake logic 2018-12-31 17:30:45 +01:00
Mordred
941cbde510 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-12-31 13:54:48 +01:00
Mordred
589205d41e Moved cmake logic to root cmakelists 2018-12-31 13:54:31 +01:00
NotAdam
af7a769433 start of marketboard implementation 2018-12-31 23:27:21 +11:00
NotAdam
d421888a07 fix storing items in the housing storerooms for real this time 2018-12-31 22:45:39 +11:00