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

2147 commits

This branch
This branch
All branches
Author SHA1 Message Date
mordred
00f8fe97b0 Fix for double mysql find 2019-01-04 14:29:31 +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
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
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
NotAdam
72261e465b fix storing items in the housing storerooms for real this time 2018-12-31 22:45:39 +11:00
NotAdam
6398ad4fe4 handle fc doors properly 2018-12-31 22:02:34 +11:00
NotAdam
d6da6b5e3a some housing cleanup and refactoring 2018-12-31 21:54:32 +11:00
NotAdam
bda7bc7131 fix issue where items couldn't be removed from interior storeroom 2018-12-31 21:39:43 +11:00
NotAdam
56f9687c28 drop x86 support on windows 2018-12-31 18:39:43 +11:00
Mordred
7b7fe27212
Merge pull request #465 from DantestyleXD/SubFst005_+_SubFst045 
[Quest] SubFst005 + SubFst045
 2018-12-31 00:53:26 +01:00
Dantestyle
15b034162c style 2018-12-30 19:11:30 +01:00
Dantestyle
0fc99edded [Quest] SubFst005 + SubFst045 added 2018-12-30 19:06:21 +01:00
Mordred
30afbf73d1
Merge pull request #464 from NotAdam/housing 
hide fc doors in private houses, fix log issue on windows
 2018-12-30 17:46:08 +01:00
Mordred
46780bf5cd Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-12-30 17:36:48 +01:00
Mordred
3ffa92073d Added a new table for spawnpoints and initial data 2018-12-30 17:36:30 +01:00
NotAdam
fc9f33dd78 hide additional quarters door in private housing 2018-12-30 23:25:52 +11:00
NotAdam
144d8e8f27 standardise log names and potentially fix log folder issue on windows 2018-12-30 22:36:44 +11:00
Mordred
30ef495a0a
Merge pull request #461 from DantestyleXD/develop 
Avoid Cmake that create C++14 build with C++17 installed
 2018-12-30 11:53:59 +01:00
Mordred
0e1f5c176f
Merge pull request #462 from DantestyleXD/launcher 
[Launcher] Press Enter after password and finally instant open client
 2018-12-30 11:53:48 +01:00
Mordred
e81ddd4a50
Merge pull request #463 from NotAdam/housing 
even more housing
 2018-12-30 11:53:04 +01:00
NotAdam
4d501b4eb2 fix issue where items couldn't be placed in storeroom from inv 2018-12-30 21:26:32 +11:00