1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-30 16:17:46 +00:00
Commit graph

6451 commits

Author SHA1 Message Date
Mordred
ec3375a5b1 Sql Keepalive in server zone 2017-11-20 23:24:50 +01:00
Maru
600c49cc04 Merge branch 'master' of https://github.com/itsMaru/Sapphire 2017-11-20 18:03:25 -02:00
Maru
5674f6684f Merge branch 'master' of https://github.com/itsMaru/Sapphire 2017-11-20 18:03:25 -02:00
Maru
c7b74d04fa Lib 2017-11-20 18:03:12 -02:00
Maru
44905bed31 Lib 2017-11-20 18:03:12 -02:00
Mordred
ccf51b909e Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-11-19 22:43:36 +01:00
Mordred
249215b501 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-11-19 22:43:36 +01:00
Mordred
bcb07e6b26 using instead of typedef where possible 2017-11-19 22:43:26 +01:00
Mordred
46d0dbfde8 using instead of typedef where possible 2017-11-19 22:43:26 +01:00
Mordred
5223b06d32 Merge pull request #170 from GokuWeedLord/master
remove unused charadetail table, fix titlelist being incorrect size
2017-11-19 00:26:07 +01:00
Mordred
fd14764729
Merge pull request #170 from GokuWeedLord/master
remove unused charadetail table, fix titlelist being incorrect size
2017-11-19 00:26:07 +01:00
Mordred
bf4ba68be4 Fixed beast tribe string index 2017-11-19 00:18:30 +01:00
Mordred
09dc925a06 Fixed beast tribe string index 2017-11-19 00:18:30 +01:00
Mordred
ff46c9e1b0 Merge pull request #172 from ayyaruq/fix/mysql-includes
Fix CMake MySQL module to be more nix-friendly
2017-11-19 00:17:01 +01:00
Mordred
1c397db54d
Merge pull request #172 from ayyaruq/fix/mysql-includes
Fix CMake MySQL module to be more nix-friendly
2017-11-19 00:17:01 +01:00
GokuWeedLord
7161de22ac Merge remote-tracking branch 'upstream/master' 2017-11-19 00:39:33 +11:00
GokuWeedLord
4934ea82d2 Merge remote-tracking branch 'upstream/master' 2017-11-19 00:39:33 +11:00
Ay'yaruq Dotharl
626c784f5a Fix CMake MySQL module to be more nix-friendly 2017-11-18 22:50:00 +11:00
Ay'yaruq Dotharl
26917aa904 Fix CMake MySQL module to be more nix-friendly 2017-11-18 22:50:00 +11:00
Mordred
5e0b7e1731 Merge pull request #171 from itsMaru/sql_fix
Fix generated enum build break; Remove Mono as dependency from README;
2017-11-18 08:27:41 +01:00
Mordred
e75f5da0ab
Merge pull request #171 from itsMaru/sql_fix
Fix generated enum build break; Remove Mono as dependency from README;
2017-11-18 08:27:41 +01:00
Maru
7fcb2180b5 Static cast class (consider ClassJob type for m_class); 2017-11-18 01:22:49 -02:00
Maru
189ff33913 Static cast class (consider ClassJob type for m_class); 2017-11-18 01:22:49 -02:00
Maru
2ce35039db Remove Mono dependency off README; 2017-11-18 00:59:01 -02:00
Maru
564ee05b54 Remove Mono dependency off README; 2017-11-18 00:59:01 -02:00
Maru
a7314f448b Close generated enum blocks; 2017-11-18 00:55:07 -02:00
Maru
e5dd280338 Close generated enum blocks; 2017-11-18 00:55:07 -02:00
Maru
7789ad382d Include int type alias for uint8_t; 2017-11-18 00:45:08 -02:00
Maru
1ea2f86f3c Include int type alias for uint8_t; 2017-11-18 00:45:08 -02:00
GokuWeedLord
847c86665f lets try again... 2017-11-18 12:31:52 +11:00
GokuWeedLord
a59c57e4e0 lets try again... 2017-11-18 12:31:52 +11:00
GokuWeedLord
74d266e8d6 Merge remote-tracking branch 'upstream/master' 2017-11-18 12:31:12 +11:00
GokuWeedLord
3a9db72d6e Merge remote-tracking branch 'upstream/master' 2017-11-18 12:31:12 +11:00
GokuWeedLord
b1822df6d3 Revert "remove unused charadetail table, fix titlelist being incorrect size in charainfo"
This reverts commit 5625272c08.
2017-11-18 12:31:02 +11:00
GokuWeedLord
08dc05ee30 Revert "remove unused charadetail table, fix titlelist being incorrect size in charainfo"
This reverts commit 0dda737bc5.
2017-11-18 12:31:02 +11:00
GokuWeedLord
5625272c08 remove unused charadetail table, fix titlelist being incorrect size in charainfo 2017-11-18 12:26:13 +11:00
GokuWeedLord
0dda737bc5 remove unused charadetail table, fix titlelist being incorrect size in charainfo 2017-11-18 12:26:13 +11:00
Maru
6f91ce1d91 OneHandedWeapon helper; 2017-11-17 22:29:29 -02:00
Maru
1ceb4a95a5 OneHandedWeapon helper; 2017-11-17 22:29:29 -02:00
Mordred
f043049d2b Started using pregenerated common emuns, fixed a mysql field length issue with titlelists 2017-11-18 01:25:55 +01:00
Mordred
3395b21dd6 Started using pregenerated common emuns, fixed a mysql field length issue with titlelists 2017-11-18 01:25:55 +01:00
Mordred
f080a6f9f4 Updated sql files 2017-11-18 00:09:26 +01:00
Mordred
ff3b083844 Updated sql files 2017-11-18 00:09:26 +01:00
Mordred
f67571eb46 Merge pull request #168 from takhlaq/SQL_REWRITE_OWN
fix server_zone headers appearing as external deps in visual studio
2017-11-17 23:40:45 +01:00
Mordred
087b4a17f0
Merge pull request #168 from takhlaq/SQL_REWRITE_OWN
fix server_zone headers appearing as external deps in visual studio
2017-11-17 23:40:45 +01:00
Tahir Akhlaq
83660598b1 fix server_zone headers appearing as external deps in visual studio 2017-11-17 18:12:35 +00:00
Tahir Akhlaq
708c2f324a fix server_zone headers appearing as external deps in visual studio 2017-11-17 18:12:35 +00:00
Maru
31df365a09 Fix and optimize itemlevel; IsWeapon Item Property; 2017-11-16 20:44:37 -02:00
Maru
ed23ff9a60 Fix and optimize itemlevel; IsWeapon Item Property; 2017-11-16 20:44:37 -02:00
Maru
6bf2fc2016 Merge branch 'SQL_REWRITE_OWN' of https://github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN 2017-11-16 20:35:09 -02:00