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

463 commits

Author SHA1 Message Date
Maru
6f91ce1d91 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
Tahir Akhlaq
83660598b1 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
6bf2fc2016 Merge branch 'SQL_REWRITE_OWN' of https://github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN 2017-11-16 20:35:09 -02:00
Mordred
692f5fbf2f Merge https://github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN 2017-11-16 23:20:59 +01:00
Maru
ae6c44d8a5 Merge branch 'SQL_REWRITE_OWN' of https://github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN 2017-11-16 20:20:35 -02:00
Mordred
9f67af1473 Players wont be able to connect anymore if a session is already present 2017-11-16 23:06:33 +01:00
Maru
8fc03cd2a0 Packet definitions; Item level (WIP); 
Packetdef for PlayerStats and PlayerClassInfo. ItemLvl currently broken and not optimized (constantly calling to calc due to equipitem).
 2017-11-16 00:03:36 -02:00
Mordred
b3f3c317b5 Logout will now remove a playersession almost instantly 2017-11-14 23:55:38 +01:00
Mordred
558be56490 Merge pull request #167 from perize/master 
Add a struct def of job gauge
 2017-11-07 07:56:23 +01:00
Perize
ddbdf5a409 Add a struct def of job gauge 2017-11-06 23:41:04 +09:00
Maru
fe48f33aaf Small stuff (organizing, adding titlelist loading) 2017-11-02 17:54:10 -02:00
ShelbyZ
33da12a8d3 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
Mordred
4b9fe8e1a8 fixed a sql but when grabbing a new 64 bit uid 2017-11-01 23:28:32 +01:00
Mordred
b8441c009f Merge pull request #163 from goaaats/master 
Set debug working path for generated solutions
 2017-10-31 14:12:19 +01:00
goaaats
c23860a61d Set debug working path for generated solutions 2017-10-31 13:36:03 +01:00
ShelbyZ
9aeda0dadc 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
Maru
83353086be Small acc creation fixes; 2017-10-30 01:17:49 -02:00
Mordred
9d7e071b1c Removed old database class entirely, some minor cleanups 2017-10-28 22:47:25 +02:00
Mordred Admin
4d167ad22f Simplified usage of new database class 2017-10-27 14:01:50 +02:00
Mordred Admin
55dcdc2b87 Removed unnused includes 2017-10-27 09:06:16 +02:00
Mordred
55d10a16ea Almost done porting... 2017-10-27 00:10:13 +02:00
Mordred Admin
c8207c8537 Ported DebugCommandHandler naively 2017-10-26 15:22:58 +02:00
Mordred Admin
491cdcd59a Removed reference to database where unused 2017-10-26 14:40:58 +02:00
Mordred Admin
8f935492f4 Old db class removed entirely from REST server. Also some cleanups 2017-10-26 12:16:34 +02:00
Mordred Admin
48f2069072 Fixed a overflow warning and return type error 2017-10-26 08:33:05 +02:00
Mordred
d7b54b5b6d PlayerMinimal almost completely ported 2017-10-26 00:13:41 +02:00
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
Mordred
e27b348971 Merge pull request #159 from ShelbyZ/unbork_rest 
Path comparison is causing issues
 2017-10-24 22:59:49 +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
d5e24c97e5 Merge pull request #157 from ShelbyZ/static_cast_round_2 
More static_cast
 2017-10-24 07:52:43 +02:00
Mordred
73286e24ca fixed an issue with binary fields bit read incorrectly 2017-10-23 23:55:25 +02:00
ShelbyZ
3ae890cc78 Fixing linkshellid to uint64_t 
updating methods, internal collection, and sql representation
 2017-10-23 08:33:47 -07:00
Mordred
ca2691d45c Merge pull request #155 from ShelbyZ/unchecked_iters 
Addressing unchecked iterator issues with core project
 2017-10-23 08:08:28 +02:00
ShelbyZ
05e5221f2e More static_cast 
- expand some types
- gnarly std::pair issue with short to int8_t
- getLinkshellById now uses uint32_t
 2017-10-22 20:51:25 -07:00
ShelbyZ
6ed2a850c7 Quantity treated as uint32_t at packet level 
- move tryAddItem/AddItem to uint32_t from uint16_t
 2017-10-22 18:53:58 -07: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
GokuWeedLord
7db9ea07d6 !unlock and !help debug commands 2017-10-21 23:41:09 +11:00
GokuWeedLord
bebde300f1 compiler warning fix 2017-10-21 23:40:51 +11:00
GokuWeedLord
a36282a7fa fix aetheryte_index being incorrect and causing a server crash 2017-10-21 23:40:36 +11:00
GokuWeedLord
471b5d7220 expose isincombat to scripts - isInCombat doesn't work though 2017-10-21 22:24:04 +11:00
GokuWeedLord
bb42a771eb fix a compile warning 2017-10-21 22:23:28 +11:00
GokuWeedLord
cd1b51f23f gm command fix, quest debug output change 2017-10-21 19:21:43 +11: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