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

639 commits

This branch
This branch
All branches
Author SHA1 Message Date
Biscuit Boy
f110f021ff Added Zonelines for Pillars to Foundation and visa versa 
Added Zonelines for Pillars and Foundation, Teleporting to foundation now works, Net only needs to be done
 2017-08-28 20:32:08 +10:00
SapphireMordred
3ffcf491a9 Merge pull request #72 from Minoost/build-cmake 
Add Boost_COMPILER flag to CMakeSettings for VS
 2017-08-27 09:21:26 +02:00
Minho Kang
e577a7c385 Add Boost_COMPILER flag to CMakeSettings for VS 2017-08-27 14:13:57 +09:00
Mordred
d3652436fa Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-27 02:04:27 +02:00
Mordred
c9c86dacef Added a linkshell representation class 2017-08-27 02:04:04 +02:00
Mordred
ebd11f1a7c Added packet for linkshell events 2017-08-27 02:03:27 +02:00
SapphireMordred
ee219ba628 Merge pull request #71 from Minoost/tcp-handling 
Initial attemp to check packet boundary
 2017-08-26 09:00:28 +02:00
Minho Kang
bd76111a69 Fix string header 2017-08-26 15:42:30 +09:00
Minho Kang
39e4b9e093 Include memcpy and realloc header 2017-08-26 15:29:57 +09:00
Minho Kang
19e321e18c Merge remote-tracking branch 'upstream/master' into tcp-handling 2017-08-26 15:09:01 +09:00
Minho Kang
989c1b0854 Tempoary bound check for GamePacket 2017-08-26 15:07:40 +09:00
Minho Kang
35c42c1f23 Replace UtilNetwork with GamePacketParser 2017-08-26 15:06:27 +09:00
Mordred
b8fc46d7cb #67 Fixed tell being shown with wrong name 2017-08-25 15:34:26 +02:00
Mordred
148ba5d09f Prperational work for linkshells 2017-08-23 23:58:14 +02:00
Mordred
b83ddf9f89 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-23 17:40:08 +02:00
Mordred
77fef5c3a9 Error message now displayed properly when /tell ing unknown char 2017-08-23 17:39:59 +02:00
Minho Kang
ef0a248444 Drop connection if received packet is incomplete 2017-08-23 20:04:02 +09:00
SapphireMordred
5ae7feabbc Merge pull request #69 from itsmaru/master 
Fix action interrupt crash; Escaping character names; Adjustments to HP formula
 2017-08-23 07:08:12 +02:00
Maru
b9b8e3a0e4 Style; 2017-08-23 00:39:52 -03:00
Maru
5a0d95f4ca Fix action interrupt crash; Escaping character names; Adjustments to HP formula; 2017-08-23 00:38:54 -03:00
Mordred
1eaa3be773 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
08ff069ee1 Implemented a switch to chose from zone or chat handlers 2017-08-22 21:36:20 +02:00
Mordred
f4df52f3d9 Moved IPC enums to own file for readability 2017-08-22 17:29:03 +02:00
SapphireMordred
49e34b2fdc Merge pull request #66 from Minoost/cmake-64bit 
Add 64bit lib linkage
 2017-08-21 18:09:03 +02:00
Minho Kang
50b868c323 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
SapphireMordred
488070a53f Merge pull request #65 from itsmaru/master 
Basic battle-related calculation class; Cast interrupt;
 2017-08-21 00:31:52 +02:00
Maru
e1f6a13f07 Style, commenting; 2017-08-20 19:27:06 -03:00
Maru
f75aa3767e Merge sapphire-master; 2017-08-20 19:21:09 -03:00
Maru
43917a6273 CalcBattle stuff; 2017-08-20 19:20:37 -03:00
Mordred
87f4c59761 More restructuring for new packet logic 2017-08-21 00:02:41 +02:00
Maru
efa4a39e50 Merge sapphire-master 2017-08-20 17:43:07 -03:00
Mordred
0e8a5c3820 Overhaul of packet system to allow for an arbitrary amount of packet definition sets 2017-08-20 22:31:23 +02:00
Mordred
c5a06f7f21 Chat connection is actually reaching the handler now 2017-08-20 20:48:55 +02:00
Maru
d541bf0366 Merge sapphire-master 2017-08-20 13:02:22 -03:00
Maru
b54b489097 Merge sapphire-master 2017-08-20 12:54:54 -03:00
Mordred
b5d4e6385d Removed firstlogin flag, still in database though 2017-08-20 17:52:22 +02:00
Maru
71309e3be7 Cast interrupting; Skeleton of battle calculation stuff; 2017-08-20 02:46:06 -03:00
Mordred
c6e65b8703 #34 - Implemented tracking of opnening sequence, firstlogin may be obsolete now 2017-08-20 02:24:19 +02:00
Maru
edef711afb Weapon Damage property; Auto-attack for magical weapons; 2017-08-19 16:50:50 -03:00
SapphireMordred
6d74cc3598 Merge pull request #64 from Minoost/master 
Reimplement CFPenaltyTime to reflect recent refactoring
 2017-08-19 09:19:25 +02:00
Minho Kang
f6c40f6f2e Reimplement of CFPenaltyTime 
Reimplement a730ef3 to reflect recent refactoring.
 2017-08-19 11:28:04 +09:00
Minho Kang
c6bd508ec7 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
60d67952e4 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-19 00:18:51 +02:00
Mordred
3ecc1e6f14 more restructuring 2017-08-19 00:18:40 +02:00
SapphireMordred
1602d6b2b0 Merge pull request #63 from Minoost/master 
Add JetBrains cache (CLion) to gitignore
 2017-08-18 19:04:59 +02:00
Minho Kang
50bff73e0a Add JetBrains cache to gitignore 2017-08-19 01:46:23 +09:00
Minho Kang
8979bcdd8f Merge remote-tracking branch 'upstream/master' 2017-08-19 00:49:54 +09:00
SapphireMordred
f49d288182 Merge pull request #62 from Minoost/clean 
Clean .gitignore and .gitmodules
 2017-08-18 17:42:46 +02:00
Mordred
432d979c73 Forgot script folder 2017-08-18 17:29:36 +02:00
Mordred
ff2d46751d Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-18 17:16:19 +02:00