1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-29 15:47:46 +00:00
Commit graph

2175 commits

Author SHA1 Message Date
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
Mordred Admin
ff859cebfb Old db class removed entirely from REST server. Also some cleanups 2017-10-26 12:16:34 +02:00
Mordred Admin
f6354736da Fixed a overflow warning and return type error 2017-10-26 08:33:05 +02:00
Mordred
a8c1741964 PlayerMinimal almost completely ported 2017-10-26 00:13:41 +02:00
Mordred
00e717491b Initial inventory container creation ported 2017-10-25 23:24:47 +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
5c69e98c46 Merge pull request #159 from ShelbyZ/unbork_rest
Path comparison is causing issues
2017-10-24 22:59:49 +02:00
Maru
7b7038bac2 Merge 2017-10-24 16:01:04 -02: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
64eac677a5 Merge pull request #157 from ShelbyZ/static_cast_round_2
More static_cast
2017-10-24 07:52:43 +02:00
Mordred
6bdcc79ede new layout for charaquest table 2017-10-24 00:00:22 +02:00
Mordred
3564964a8a fixed an issue with binary fields bit read incorrectly 2017-10-23 23:55:25 +02:00
ShelbyZ
24f937fd61 Fixing linkshellid to uint64_t
updating methods, internal collection, and sql representation
2017-10-23 08:33:47 -07:00
Mordred
86cd16f5c1 Merge pull request #155 from ShelbyZ/unchecked_iters
Addressing unchecked iterator issues with core project
2017-10-23 08:08:28 +02:00
Mordred
792db89718 Merge pull request #156 from ShelbyZ/upgrade_item_quantity_bitness
Quantity treated as uint32_t at packet level
2017-10-23 08:08:07 +02:00
ShelbyZ
c9a53b5d2b 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
818f617661 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
b15fc7164c 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
d37efcef52 Merge pull request #154 from ShelbyZ/compiler_flags
Correctly applying /ZI for debug
2017-10-22 20:08:01 +02:00
ShelbyZ
a162a7caea Need to disable SAFESEH before /ZI 2017-10-22 10:43:33 -07:00
Mordred
f87ac64fec Merge pull request #152 from GokuWeedLord/feature/launcherchanges
add commit history to launcher and fix issue causing blank frames to open
2017-10-22 18:40:33 +02:00