1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-09 04:07:46 +00:00
Commit graph

36 commits

Author SHA1 Message Date
Mordred Admin
4606e83d15 Another attempt at fixing the build 2017-12-18 14:45:15 +01:00
Mordred Admin
e0f93eaf1c Moved and renamed Server_Common, now just src/common 2017-12-18 12:36:52 +01:00
Mordred
d130f00d53 Merge https://github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN 2017-11-16 23:20:59 +01: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
goaaats
fe278843c7 Set debug working path for generated solutions 2017-10-31 13:36:03 +01:00
Mordred Admin
50c68c4468 Removed unnused includes 2017-10-27 09:06:16 +02:00
Mordred Admin
ec72cf6836 Merge http://www.github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN
Conflicts:
	CMakeLists.txt
	src/servers/Server_Common/Network/PacketDef/Ipcs.h
	src/servers/Server_Zone/Actor/PlayerQuest.cpp
	src/servers/Server_Zone/Actor/PlayerSql.cpp
2017-10-25 14:49:35 +02:00
ShelbyZ
e50fd76062 Fix up Flags around Edit and Continue
- remove /SAFESEH:NO
- apply /INCREMENTAL /ZI (debug only)
- remove sprinkling of /INCREMENTAL /ZI
2017-10-21 22:09:03 -07:00
ShelbyZ
279563b90f Fixing spacing issues for casts 2017-10-20 14:12:24 -07:00
ShelbyZ
a73721764f Fixing some type alignments via casting
- static_cast for reasonable values
- at least one stray float
2017-10-19 16:18:16 -07:00
Mordred
4284072267 Merge pull request #144 from AcedArmy/master
Added Version and Git Hash to Lobby, Zone Startup Info Banners
2017-10-19 18:25:53 +02:00
Biscuit Boy
c54b0e2974 Add Verison and Git Hash to printBanner
Added Version and Git Hash to printBanner in Zone and Lobby Server
2017-10-20 02:23:45 +11:00
ShelbyZ
abb2ccdbe4 signed/unsigned mismatch issues
- Move for...loop int to size_t
- Move int32_t to uint32_t
2017-10-19 07:12:09 -07:00
Mordred Admin
0dd3d4c67c It helps to not misspell library names 2017-09-25 15:03:59 +02:00
Mordred Admin
869f98adc9 Moved mysqlConnector to libraries 2017-09-25 14:44:15 +02:00
Mordred Admin
8682f334bc Majorly simplified and improved the cmake setup.
Going forward it will be alot easier to maintain.

TODO: simplify path definitions

Conflicts:
	src/servers/Server_Lobby/CMakeLists.txt
	src/servers/Server_REST/CMakeLists.txt
	src/servers/Server_Zone/CMakeLists.txt
2017-09-13 11:46:17 +02:00
amibu
cb7c6ab65e GM Ranks, some fixes 2017-09-11 18:59:50 +02:00
amibu
b999639f04 Changeable World name + MotD 2017-09-10 02:24:29 +02:00
Tahir Akhlaq
0ecf2bd962 enabled edit and continue on windows
- usage: tools > options > debugging > general > enable edit and continue (tick all options within its subtree)
 - attach vs to a server, edit its code, alt + f10
2017-09-03 03:25:12 +01:00
Minho Kang
19e321e18c Merge remote-tracking branch 'upstream/master' into tcp-handling 2017-08-26 15:09:01 +09:00
Minho Kang
35c42c1f23 Replace UtilNetwork with GamePacketParser 2017-08-26 15:06:27 +09:00
Mordred
08ff069ee1 Implemented a switch to chose from zone or chat handlers 2017-08-22 21:36:20 +02:00
Minho Kang
50b868c323 Add 64bit lib linkage
This was done to reflect this: https://github.com/SapphireMordred/SapphireLibs/pull/6
2017-08-22 00:05:14 +09:00
Mordred
87f4c59761 More restructuring for new packet logic 2017-08-21 00:02:41 +02:00
Mordred
0e8a5c3820 Overhaul of packet system to allow for an arbitrary amount of packet definition sets 2017-08-20 22:31:23 +02:00
Mordred
3ecc1e6f14 more restructuring 2017-08-19 00:18:40 +02:00
Minho Kang
78b5a13f8a Fix segfault on 64bit
Upper portion of address data got lost when converting to int32_t and segfault when accessing them. This commit contains fix for it.
2017-08-18 21:14:09 +09:00
Minho Kang
d7c5c4f23e Add /bigobj switch for MSVC
This fix an some error when building for x64
2017-08-18 11:52:59 +09:00
amibu
166e61d6f3 World ID parameter for lobby 2017-08-14 13:36:22 +02:00
SapphireMordred
349f929a76 Merge pull request #45 from SapphireMordred/64bit
64bit build crap (merge SapphireLibs first)
2017-08-12 16:47:17 +02:00
Tahir Akhlaq
9d87f23caf fix lobby config, add default values for ip/port, change blowfish back to uintptr_t 2017-08-11 23:13:00 +01:00
Tahir Akhlaq
82af45e561 mass replace data types to fixed width ones 2017-08-11 22:58:45 +01:00
amibu
3682b11478 Fixed a PS4 oversight 2017-08-11 12:56:58 +02:00
Tahir Akhlaq
04105eaad4 apparently i didnt commit this 2017-08-10 18:25:11 +01:00
Tahir Akhlaq
23e2bb4b7b fix 64bit build 2017-08-10 17:57:11 +01:00
Mordred Admin
e691d0504a Initial commit of the sapphire server 2017-08-08 13:53:47 +02:00