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

1194 commits

This branch
This branch
All branches
Author SHA1 Message Date
Biscuit Boy
44af9c660d Added Aetheryte Teleports to all HW Zones 2017-08-28 22:20:48 +10:00
SapphireMordred
d705a2b159 Merge pull request #74 from AcedArmy/master 
Added Aetheryte Teleports to all SB Zones
 2017-08-28 14:03:05 +02:00
Biscuit Boy
66987e2e08 Added Aetheryte Teleports to all SB Zones 2017-08-28 21:54:04 +10:00
SapphireMordred
ff203e772e Merge pull request #73 from AcedArmy/master 
Added Zonelines for Pillars to Foundation and visa versa
 2017-08-28 12:51:57 +02:00
Biscuit Boy
ae0c01114d Hope I fixed my little Not Create Tables 2017-08-28 20:44:10 +10:00
Biscuit Boy
5115ffa13c 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
7718a406dc Merge pull request #72 from Minoost/build-cmake 
Add Boost_COMPILER flag to CMakeSettings for VS
 2017-08-27 09:21:26 +02:00
Adam
03e61ea832 Add Boost_COMPILER flag to CMakeSettings for VS 2017-08-27 14:13:57 +09: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
SapphireMordred
1d02bfbe69 Merge pull request #71 from Minoost/tcp-handling 
Initial attemp to check packet boundary
 2017-08-26 09:00:28 +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
SapphireMordred
ca2de0b495 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
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
SapphireMordred
33d9aecbd9 Merge pull request #66 from Minoost/cmake-64bit 
Add 64bit lib linkage
 2017-08-21 18:09: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
SapphireMordred
ad3b77f4d8 Merge pull request #65 from itsmaru/master 
Basic battle-related calculation class; Cast interrupt;
 2017-08-21 00:31:52 +02: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
SapphireMordred
bb4a84d51a Merge pull request #64 from Minoost/master 
Reimplement CFPenaltyTime to reflect recent refactoring
 2017-08-19 09:19:25 +02: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
ee53c84ebc Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-19 00:18:51 +02:00
Mordred
90ea65385d more restructuring 2017-08-19 00:18:40 +02:00
SapphireMordred
b702653d9e Merge pull request #63 from Minoost/master 
Add JetBrains cache (CLion) to gitignore
 2017-08-18 19:04:59 +02:00