1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-03 17:27:47 +00:00
Commit graph

580 commits

Author SHA1 Message Date
Mordred
bf51a4d4c9 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-29 17:30:11 +02:00
Mordred Admin
2f20a8254f Build fix 2017-08-29 10:42:19 +02:00
Mordred
91155ea84b Lookup functions for linkshells 2017-08-28 23:43:52 +02:00
Mordred
cd67fe2b52 simplified linkshell loading\n removed old serverId as it is not used anymore 2017-08-28 23:19:35 +02:00
Maru
d7525b2471 Fixed building on newer GCC 2017-08-28 16:13:23 -03:00
Mordred
d1cec57259 Created linkshellMgr class and added basic linkshell caching 2017-08-28 18:36:51 +02:00
Mordred
ee2f651cb5 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-27 02:04:27 +02:00
Mordred
197aecbee6 Added a linkshell representation class 2017-08-27 02:04:04 +02:00
Mordred
3dd37773a1 Added packet for linkshell events 2017-08-27 02:03:27 +02:00
Adam
f54ae1054b Fix string header 2017-08-26 15:42:30 +09:00
Adam
15bd6d485d Include memcpy and realloc header 2017-08-26 15:29:57 +09:00
Adam
b5ec4e93a3 Merge remote-tracking branch 'upstream/master' into tcp-handling 2017-08-26 15:09:01 +09:00
Adam
4ecc5cef54 Tempoary bound check for GamePacket 2017-08-26 15:07:40 +09:00
Adam
5fedd0c1df Replace UtilNetwork with GamePacketParser 2017-08-26 15:06:27 +09:00
Mordred
6403a1ae47 #67 Fixed tell being shown with wrong name 2017-08-25 15:34:26 +02:00
Mordred
669f6a177c Prperational work for linkshells 2017-08-23 23:58:14 +02:00
Mordred
f0213847a3 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-23 17:40:08 +02:00
Mordred
a1fb3bd419 Error message now displayed properly when /tell ing unknown char 2017-08-23 17:39:59 +02:00
Adam
2f0e0b9b07 Drop connection if received packet is incomplete 2017-08-23 20:04:02 +09:00
Maru
11b02d8550 Style; 2017-08-23 00:39:52 -03:00
Maru
f75d17fb4d Fix action interrupt crash; Escaping character names; Adjustments to HP formula; 2017-08-23 00:38:54 -03:00
Mordred
d6711a0119 Added new debug command to inject into chat connection\n Added base code for tell conversations, error messages not working yet 2017-08-22 23:53:20 +02:00
Mordred
329fd37a6e Implemented a switch to chose from zone or chat handlers 2017-08-22 21:36:20 +02:00
Mordred
331e1bca58 Moved IPC enums to own file for readability 2017-08-22 17:29:03 +02: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
Maru
bd338a3daf Style, commenting; 2017-08-20 19:27:06 -03:00
Maru
7185d16b61 Merge sapphire-master; 2017-08-20 19:21:09 -03:00
Maru
1b6b7abfd2 CalcBattle stuff; 2017-08-20 19:20:37 -03:00
Mordred
7f35b81638 More restructuring for new packet logic 2017-08-21 00:02:41 +02:00
Maru
dcb0578d03 Merge sapphire-master 2017-08-20 17:43:07 -03:00
Mordred
cbe00da5f8 Overhaul of packet system to allow for an arbitrary amount of packet definition sets 2017-08-20 22:31:23 +02:00
Mordred
5293e50614 Chat connection is actually reaching the handler now 2017-08-20 20:48:55 +02:00
Maru
3b77d239cf Merge sapphire-master 2017-08-20 13:02:22 -03:00
Maru
02320755bf Merge sapphire-master 2017-08-20 12:54:54 -03:00
Mordred
f2918c378f Removed firstlogin flag, still in database though 2017-08-20 17:52:22 +02:00
Maru
13d784caff Cast interrupting; Skeleton of battle calculation stuff; 2017-08-20 02:46:06 -03:00
Mordred
6561cf566e #34 - Implemented tracking of opnening sequence, firstlogin may be obsolete now 2017-08-20 02:24:19 +02:00
Maru
f87261b1bb Weapon Damage property; Auto-attack for magical weapons; 2017-08-19 16:50:50 -03:00
Adam
98748a4100 Reimplement of CFPenaltyTime
Reimplement a730ef3 to reflect recent refactoring.
2017-08-19 11:28:04 +09:00
Adam
4d2a8ee36c Fix getTimeMs not returning correct unix epoch
Turned out high_resolution_clock did not return current UTC time. Use system_clock to fix it.
2017-08-19 11:26:16 +09:00
Mordred
90ea65385d more restructuring 2017-08-19 00:18:40 +02:00
Mordred
9ab055aa6e Forgot script folder 2017-08-18 17:29:36 +02:00
Mordred
8f08ddb45b Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-18 17:16:19 +02:00
Mordred
5439e42062 Massivly modified project structure in server_zone 2017-08-18 17:16:15 +02:00
SapphireMordred
7487acb98d Merge pull request #60 from Minoost/cmake
Initial attempt to fix 64bit build
2017-08-18 14:33:13 +02:00
Adam
c460f8d1b4 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
Adam
9e4519440f Add /bigobj switch for MSVC
This fix an some error when building for x64
2017-08-18 11:52:59 +09:00
Mordred
5c8055a587 Removal of outdated Globals.h 2017-08-17 18:12:29 +02:00
Mordred
990a984312 Removal of redundant namespace qualifiers 2017-08-17 17:45:45 +02:00
Mordred
f0d83cadce Fixed compiler warning in eventhandlers 2017-08-17 17:39:08 +02:00