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

6210 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
c6acf51957 Merge pull request #162 from ShelbyZ/last_warnings 
Silence unchecked iterators for server_rest
 2017-10-31 07:58:04 +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
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
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
9c13feb9c5 Merge remote-tracking branch 'refs/remotes/SapphireMordred/master' into last_warnings 2017-10-30 16:31:55 -07:00
ShelbyZ
6134b7006c Merge remote-tracking branch 'refs/remotes/SapphireMordred/master' into last_warnings 2017-10-30 16:31:55 -07:00
Mordred
c41353cf4f Merge pull request #161 from itsMaru/SQL_REWRITE_OWN 
Small acc creation fixes;
 2017-10-30 22:06:51 +01: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
83353086be Small acc creation fixes; 2017-10-30 01:17:49 -02:00
Maru
42c3becd8f 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
42df7b7d13 Removed old database class entirely, some minor cleanups 2017-10-28 22:47:25 +02:00
Mordred
a73e9850e0 libraries updated 2017-10-28 01:34:34 +02:00
Mordred
dbdf3c0016 libraries updated 2017-10-28 01:34:34 +02:00
Mordred Admin
4d167ad22f Simplified usage of new database class 2017-10-27 14:01:50 +02:00
Mordred Admin
19decb8e39 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 Admin
50c68c4468 Removed unnused includes 2017-10-27 09:06:16 +02:00
Mordred Admin
186c6792a9 updated submodules once again 2017-10-27 08:45:23 +02:00
Mordred Admin
d85b172799 updated submodules once again 2017-10-27 08:45:23 +02:00
Mordred Admin
ee919e4e2c Updated submodules 2017-10-27 08:43:45 +02:00
Mordred Admin
95960fa509 Updated submodules 2017-10-27 08:43:45 +02:00
Mordred
55d10a16ea Almost done porting... 2017-10-27 00:10:13 +02:00
Mordred
db5cf9c45c 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
dff1a5a28e 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
7e3c03ca32 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
ff859cebfb 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 Admin
f6354736da 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
a8c1741964 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
00e717491b 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 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
Mordred
e27b348971 Merge pull request #159 from ShelbyZ/unbork_rest 
Path comparison is causing issues
 2017-10-24 22:59:49 +02:00
Mordred
5c69e98c46 Merge pull request #159 from ShelbyZ/unbork_rest 
Path comparison is causing issues
 2017-10-24 22:59:49 +02:00
Maru
a837bd1db7 Merge 2017-10-24 16:01:04 -02:00
Maru
7b7038bac2 Merge 2017-10-24 16:01:04 -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
ShelbyZ
b202703afb 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
64eac677a5 Merge pull request #157 from ShelbyZ/static_cast_round_2 
More static_cast
 2017-10-24 07:52:43 +02:00
Mordred
419df1ea88 new layout for charaquest table 2017-10-24 00:00:22 +02:00
Mordred
6bdcc79ede new layout for charaquest table 2017-10-24 00:00:22 +02:00
Mordred
73286e24ca fixed an issue with binary fields bit read incorrectly 2017-10-23 23:55:25 +02:00
Mordred
3564964a8a fixed an issue with binary fields bit read incorrectly 2017-10-23 23:55:25 +02:00