1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 14:37:44 +00:00
Commit graph

645 commits

Author SHA1 Message Date
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
09dc925a06 Fixed beast tribe string index 2017-11-19 00:18:30 +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
4934ea82d2 Merge remote-tracking branch 'upstream/master' 2017-11-19 00:39:33 +11:00
Ay'yaruq Dotharl
26917aa904 Fix CMake MySQL module to be more nix-friendly 2017-11-18 22:50:00 +11: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
189ff33913 Static cast class (consider ClassJob type for m_class); 2017-11-18 01:22:49 -02:00
Maru
564ee05b54 Remove Mono dependency off README; 2017-11-18 00:59:01 -02:00
Maru
e5dd280338 Close generated enum blocks; 2017-11-18 00:55:07 -02:00
Maru
1ea2f86f3c Include int type alias for uint8_t; 2017-11-18 00:45:08 -02:00
GokuWeedLord
a59c57e4e0 lets try again... 2017-11-18 12:31:52 +11:00
GokuWeedLord
3a9db72d6e Merge remote-tracking branch 'upstream/master' 2017-11-18 12:31:12 +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
0dda737bc5 remove unused charadetail table, fix titlelist being incorrect size in charainfo 2017-11-18 12:26:13 +11: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
ff3b083844 Updated sql files 2017-11-18 00:09:26 +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
708c2f324a fix server_zone headers appearing as external deps in visual studio 2017-11-17 18:12:35 +00:00
Mordred
d130f00d53 Merge https://github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN 2017-11-16 23:20:59 +01:00
Mordred
1d4655f750 Players wont be able to connect anymore if a session is already present 2017-11-16 23:06:33 +01:00
Mordred
b58acb90af Logout will now remove a playersession almost instantly 2017-11-14 23:55:38 +01:00
Mordred
8d3065ba51
Merge pull request #166 from takhlaq/pcb_standalone
added -DSTANDALONE compile option for pcb_reader for compiling without xivdat/boost deps
2017-11-13 11:03:04 +01:00
Mordred
974a682b8a
Merge pull request #167 from perize/master
Add a struct def of job gauge
2017-11-07 07:56:23 +01:00
Perize
8988ae3cc0 Add a struct def of job gauge 2017-11-06 23:41:04 +09:00
Tahir Akhlaq
396fce8aeb clean up some style issues 2017-11-04 10:04:30 +00:00
Tahir Akhlaq
350f904be2 fix pcb_reader linux build, changed line endings 2017-11-04 08:13:35 +00:00
Tahir Akhlaq
eadec08a97 added STANDALONE compile flag for pcb_reader which doesnt require boost or sapphire dependencies 2017-11-03 20:26:53 +00:00
Mordred
9113e6a19d
Merge pull request #164 from ShelbyZ/gcc_warnings
Gcc warnings
2017-11-02 21:13:16 +01:00
Mordred
eb8d67b7c9
Merge pull request #165 from itsMaru/SQL_REWRITE_OWN
Style; Load titlelist from fetch; Contributing;
2017-11-02 21:13:05 +01:00
Maru
2855623c58 Contributing.md 2017-11-02 18:07:49 -02:00
Maru
a1a6cc59f8 Small stuff (organizing, adding titlelist loading) 2017-11-02 17:54:10 -02:00
ShelbyZ
ca5d1d3982 gcc warnings
- uint64_t format errors using <cinttypes> define SCNu64
- sprintf without format string replacing with strcpy (might be better
to move to strncpy or something else)
- use return value of fread(...)
- use return value of system(...)
2017-11-01 22:24:50 -07:00
ShelbyZ
1592afd664 Merge remote-tracking branch 'refs/remotes/SapphireMordred/master' into gcc_warnings 2017-11-01 21:45:34 -07:00
Mordred
54031902ee fixed a sql but when grabbing a new 64 bit uid 2017-11-01 23:28:32 +01:00
Mordred
4710eacb76
Merge pull request #163 from goaaats/master
Set debug working path for generated solutions
2017-10-31 14:12:19 +01:00
goaaats
fe278843c7 Set debug working path for generated solutions 2017-10-31 13:36:03 +01:00
Mordred
c05d665358
Merge pull request #162 from ShelbyZ/last_warnings
Silence unchecked iterators for server_rest
2017-10-31 07:58:04 +01:00
ShelbyZ
e8b25f1562 Silence unchecked iterators for server_rest
- couldnt't find a better way to find the subpath or a root
- can't pass other iter length or it fails to view them as main and
subdir
2017-10-30 19:11:54 -07:00
ShelbyZ
6134b7006c Merge remote-tracking branch 'refs/remotes/SapphireMordred/master' into last_warnings 2017-10-30 16:31:55 -07:00
Mordred
04c7b9d78d
Merge pull request #161 from itsMaru/SQL_REWRITE_OWN
Small acc creation fixes;
2017-10-30 22:06:51 +01:00
Maru
42c3becd8f Small acc creation fixes; 2017-10-30 01:17:49 -02:00
Mordred
42df7b7d13 Removed old database class entirely, some minor cleanups 2017-10-28 22:47:25 +02:00
Mordred
dbdf3c0016 libraries updated 2017-10-28 01:34:34 +02:00
Mordred Admin
19decb8e39 Simplified usage of new database class 2017-10-27 14:01:50 +02:00
Mordred Admin
50c68c4468 Removed unnused includes 2017-10-27 09:06:16 +02:00
Mordred Admin
d85b172799 updated submodules once again 2017-10-27 08:45:23 +02:00
Mordred Admin
95960fa509 Updated submodules 2017-10-27 08:43:45 +02:00
Mordred
db5cf9c45c Almost done porting... 2017-10-27 00:10:13 +02:00
Mordred Admin
dff1a5a28e Ported DebugCommandHandler naively 2017-10-26 15:22:58 +02:00
Mordred Admin
7e3c03ca32 Removed reference to database where unused 2017-10-26 14:40:58 +02:00