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

2722 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
aea0bf333a Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2019-01-06 00:27:37 +01:00
Mordred
df412bba66 Updated sendNotice and sendUrgent calls 2019-01-06 00:26:26 +01:00
JeidoUran
808adc9f1c GM Call is now closer to retail behavior 2019-01-05 18:50:27 +01:00
Mordred
f7fa30101a Added fmt for sendNotice and sendUrgent, have not ported appearances yet 2019-01-05 14:53:42 +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
7ac1299507
Merge pull request #6 from SapphireServer/develop 
Develop
 2019-01-05 13:39:12 +01:00
Mordred
7f00c34f90 Changed sendDebug to use fmt aswell 2019-01-05 12:32:10 +01:00
mordred
fd1341a887 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2019-01-04 14:29:43 +01:00
mordred
00f8fe97b0 Fix for double mysql find 2019-01-04 14:29:31 +01: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
c87955374e Formatting... 2019-01-04 13:57:29 +01:00
JeidoUran
a3b738d724 Formatting² 2019-01-04 13:50:57 +01:00
JeidoUran
4dabec79d4 Formatting 2019-01-04 13:47:03 +01:00
JeidoUran
b99ad78223
Update DebugCommandMgr.cpp 2019-01-04 13:30:14 +01:00
mordred
409c8a25b5 Merge remote-tracking branch 'origin/develop' 2019-01-04 13:11:02 +01:00
NotAdam
d5e466267e fix blasphemous indentation 2019-01-04 22:59:20 +11:00
NotAdam
ba803288a3 fix log calls not outputting hex as it used to 2019-01-04 22:48:09 +11:00
NotAdam
c97ba162a4 convert more log calls to format string 2019-01-04 22:37:01 +11:00
mordred
d6ec45b048 Converting logging calls 2019-01-04 12:34:19 +01:00
NotAdam
a140eeac4c add logger message formatting 2019-01-04 21:47:19 +11:00
NotAdam
dfc43dfae6 ignore clion cmake build directories 2019-01-04 20:50:04 +11:00
mordred
0383e5591e Potential fix for VS build dir 2019-01-04 10:17:21 +01:00
mordred
f795aca9a6 Moved spawngroup query to prepared stmt 2019-01-04 08:54:39 +01:00
mordred
31d5aaf457 Fixed a spawngroup related linux crash 2019-01-04 08:32:47 +01:00
JeidoUran
3486c5d3ad "!add bnpc" no longer crashes world.exe if a non-existing bnpctemplate is inputted 2019-01-04 05:12:06 +01:00
JeidoUran
17361f9146
Merge pull request #3 from SapphireServer/develop 
Develop
 2019-01-04 02:38:08 +01:00
Mordred
8eee79b240
Merge pull request #467 from NotAdam/develop 
drop x86 support on windows
 2019-01-03 23:06:17 +01:00
Mordred
ba779a276c Automatically create log folder in cmake stage 2019-01-03 22:40:26 +01:00
Mordred
a022a37aab Automatically copy libmysql.dll to bin folder 2019-01-03 21:32:44 +01:00
mordred
47fb47112a Added cmake comment 2019-01-03 10:01:00 +01:00
mordred
df16f1e292 More cmake cleanup 2019-01-03 09:53:37 +01:00
mordred
346bb3e30e Also copy cand call sql_import for CI 2019-01-03 09:22:03 +01:00
mordred
abd98f82b5 Generate libs oos 2019-01-03 09:13:56 +01:00
Mordred
51ee602e43 Moved tools to oos build aswell 2019-01-02 23:40:34 +01:00
JeidoUran
025883803e
Merge pull request #1 from SapphireServer/develop 
Develop
 2019-01-02 17:06:25 +01:00
mordred
f1c4db5f43 Take windows build path out of compiler.cmake 2019-01-02 15:28:24 +01:00
mordred
8e405856de Updated gitignore for moved config 2019-01-02 15:22:06 +01:00
mordred
3e6bf7614b True out of source build now possible. 2019-01-02 15:09:59 +01:00
mordred
e7507515b6 Further cmake cleanup 2019-01-02 11:23:39 +01:00
mordred
38d6f73951 Slight cmake cleanup 2019-01-02 10:28:41 +01:00
Mordred
789127691a Merge remote-tracking branch 'origin/housing' into develop 2019-01-01 15:06:42 +01:00
Mordred
43e02b33e2
Merge pull request #468 from NotAdam/housing 
fix a few housing related inventory issues
 2019-01-01 14:47:44 +01:00
NotAdam
f0202a2094 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
a37525d002 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
Mordred
2761a9029a Simplified some cmake logic 2018-12-31 17:30:45 +01:00
Mordred
02dca45cfe Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-12-31 13:54:48 +01:00
Mordred
ade2dece10 Moved cmake logic to root cmakelists 2018-12-31 13:54:31 +01:00
NotAdam
6ce9d9557e start of marketboard implementation 2018-12-31 23:27:21 +11:00