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

40 commits

Author SHA1 Message Date
Mordred
d73246a4c9 Initial inventory container creation ported 2017-10-25 23:24:47 +02:00
Mordred Admin
2113e45a5b 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
5c1015fc2a Path comparison is causing issues 
- don't be too smart without running through some testing
 2017-10-24 10:51:51 -07:00
Mordred
73286e24ca fixed an issue with binary fields bit read incorrectly 2017-10-23 23:55:25 +02:00
ShelbyZ
5f38a17663 Addressing unchecked iterator issues with core project 
- std::equal can take a 2nd iterator end
- use _SCL_SECURE_NO_WARNINGS for std::copy issues in exd_common_gen
 2017-10-22 18:11:00 -07:00
Mordred
876e6045df Merge pull request #151 from ShelbyZ/compiler_flags 
Fix up Flags around Edit and Continue
 2017-10-22 11:02:46 +02:00
ShelbyZ
9065b4ccea 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
35906f3af3 Remove unreferenced parameters 
- exceptions had unused parameters
 2017-10-21 20:47:50 -07:00
ShelbyZ
54548e1928 Fixing spacing issues for casts 2017-10-20 14:12:24 -07:00
ShelbyZ
3b42b1df9b Fixing some type alignments via casting 
- static_cast for reasonable values
- at least one stray float
 2017-10-19 16:18:16 -07:00
ShelbyZ
32a9d976f7 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
e246c0a880 More sql updates and conversions 2017-10-18 20:49:37 +02:00
Mordred
de90cea796 removed unneeded insert 2017-10-16 00:11:23 +02:00
Mordred
e26e2334a7 Added basic player updates 2017-10-10 00:03:24 +02:00
amibu
e39258939b Orchestrion support 2017-10-09 20:09:49 +02:00
Maru
13ecfe9906 Player title SQL; Handle set player title; 2017-10-09 01:56:47 -03:00
Mordred
4e0e79418d Rest server queries updated 2017-10-07 23:12:20 +02:00
Mordred
5a92b0251c Updated a number of queries to use new system 2017-10-07 23:10:13 +02:00
Mordred
1a749d820b Merge https://github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN 2017-09-25 17:14:01 +02:00
Mordred Admin
2cd801c7cf Moved mysqlConnector to libraries 2017-09-25 14:44:15 +02:00
Mordred
d12db28951 Build fix 2017-09-15 14:05:45 +02:00
Mordred
c3b5d30322 getGmRank now actually returns the gm rank. Also const correctness 2017-09-15 12:29:47 +02:00
Biscuit Boy
4989f37eca Fixed ContentID 
Fixed the ContentID problem, This is a fix until the new db stuff
 2017-09-15 18:43:08 +10:00
Mordred Admin
924a4b3973 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
348ca42f0e GM Ranks, some fixes 2017-09-11 18:59:50 +02:00
Tahir Akhlaq
c7a6edc811 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
Maru
f75d17fb4d Fix action interrupt crash; Escaping character names; Adjustments to HP formula; 2017-08-23 00:38:54 -03:00
Adam
07fa3a2af2 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
90ea65385d more restructuring 2017-08-19 00:18:40 +02:00
Adam
9e4519440f Add /bigobj switch for MSVC 
This fix an some error when building for x64
 2017-08-18 11:52:59 +09:00
Tahir Akhlaq
70d17607c7 mass replace data types to fixed width ones 2017-08-11 22:58:45 +01:00
Tahir Akhlaq
b041db85ec fix exception crap from previous commit 2017-08-10 23:59:31 +01:00
Tahir Akhlaq
695e6a9157 added launch args to server_rest (needs testing) 2017-08-10 22:13:00 +01:00
Tahir Akhlaq
d04be92bea fix 64bit build 2017-08-10 17:57:11 +01:00
SapphireMordred
b00aadf19e Merge pull request #9 from zynjec/master 
Standardize log location
 2017-08-09 00:38:30 +02:00
Mordred
1f10c555f8 Fixed level 0 and no weapon bug 2017-08-09 00:36:26 +02:00
Zynjec
7bc9873ed4 Standardize log location 
Updated REST and Zone server to use log folder.
 2017-08-08 18:35:31 -04:00
amibu
c1d287b15b Added hacky PS4 support back 2017-08-08 22:55:02 +02:00
amibu
7fcffb7f0b Default port for REST to 80(frontier) and restoring frontier additions to REST 2017-08-08 13:05:33 +02:00
Mordred Admin
e691d0504a Initial commit of the sapphire server 2017-08-08 13:53:47 +02:00