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

6451 commits

Author SHA1 Message Date
Mordred
cd433904de Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-29 17:30:11 +02:00
SapphireMordred
0b1ad75f55 Removed serverId from config 2017-08-29 12:06:13 +02:00
SapphireMordred
582cc4ce52 Removed serverId from config 2017-08-29 12:06:13 +02:00
Mordred Admin
2f20a8254f Build fix 2017-08-29 10:42:19 +02:00
Mordred Admin
93c5348e09 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
b62e0bee51 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
Mordred
fbf6a84a61 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
Maru
1237e34e2e Fixed building on newer GCC 2017-08-28 16:13:23 -03:00
Mordred
9049784b1a Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-28 18:36:55 +02:00
Mordred
758635f87c Merge branch 'master' of https://github.com/SapphireMordred/Sapphire 2017-08-28 18:36:55 +02:00
Mordred
d1cec57259 Created linkshellMgr class and added basic linkshell caching 2017-08-28 18:36:51 +02:00
Mordred
613c85e841 Created linkshellMgr class and added basic linkshell caching 2017-08-28 18:36:51 +02:00
SapphireMordred
d3b5ef15b2 Merge pull request #76 from Minoost/build-cmake
Exclude script directory from ignoring
2017-08-28 18:30:12 +02:00
SapphireMordred
dba6d0cae2 Merge pull request #76 from Minoost/build-cmake
Exclude script directory from ignoring
2017-08-28 18:30:12 +02:00
Adam
992708449b Exclude script directory from ignoring 2017-08-29 00:34:20 +09:00
Minho Kang
0baa41fa4f Exclude script directory from ignoring 2017-08-29 00:34:20 +09:00
SapphireMordred
85bc837d2e Merge pull request #75 from AcedArmy/master
Added Aetheryte Teleports to all HW Zones
2017-08-28 14:29:14 +02:00
SapphireMordred
7ae09e287e Merge pull request #75 from AcedArmy/master
Added Aetheryte Teleports to all HW Zones
2017-08-28 14:29:14 +02:00
Biscuit Boy
44af9c660d Added Aetheryte Teleports to all HW Zones 2017-08-28 22:20:48 +10:00
Biscuit Boy
442ac8d968 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
SapphireMordred
55c6682e9b 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
Biscuit Boy
a975b8ce98 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
SapphireMordred
070c42cc95 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
3a87d9a396 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
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
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
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
Adam
03e61ea832 Add Boost_COMPILER flag to CMakeSettings for VS 2017-08-27 14:13:57 +09:00
Minho Kang
e577a7c385 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
d3652436fa 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
c9c86dacef 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
Mordred
ebd11f1a7c 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
SapphireMordred
ee219ba628 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
Minho Kang
bd76111a69 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
Minho Kang
39e4b9e093 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